From f0542f69bc7b9fa3b086c8b9e73470809ea2bf00 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 1 Sep 2013 21:35:57 -0400 Subject: [PATCH] record bluray playlist file name --- MediaBrowser.Controller/Dto/DtoBuilder.cs | 1 + MediaBrowser.Controller/Entities/Video.cs | 2 ++ MediaBrowser.Model/Dto/BaseItemDto.cs | 2 ++ MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs | 2 ++ MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs | 2 ++ MediaBrowser.Server.Implementations/BdInfo/BdInfoExaminer.cs | 2 ++ Nuget/MediaBrowser.Common.Internal.nuspec | 4 ++-- Nuget/MediaBrowser.Common.nuspec | 2 +- Nuget/MediaBrowser.Server.Core.nuspec | 4 ++-- 9 files changed, 16 insertions(+), 5 deletions(-) diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs index f762c7cc6b..cc14a9e029 100644 --- a/MediaBrowser.Controller/Dto/DtoBuilder.cs +++ b/MediaBrowser.Controller/Dto/DtoBuilder.cs @@ -483,6 +483,7 @@ namespace MediaBrowser.Controller.Dto dto.VideoType = video.VideoType; dto.Video3DFormat = video.Video3DFormat; dto.IsoType = video.IsoType; + dto.MainFeaturePlaylistName = video.MainFeaturePlaylistName; dto.PartCount = video.AdditionalPartIds.Count + 1; diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index e8896db6fe..7ce008c5ee 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -95,6 +95,8 @@ namespace MediaBrowser.Controller.Entities } } + public string MainFeaturePlaylistName { get; set; } + /// /// Gets the playable stream files. /// diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs index b843465dfc..6c69197f60 100644 --- a/MediaBrowser.Model/Dto/BaseItemDto.cs +++ b/MediaBrowser.Model/Dto/BaseItemDto.cs @@ -36,6 +36,8 @@ namespace MediaBrowser.Model.Dto /// The name of the sort. public string SortName { get; set; } + public string MainFeaturePlaylistName { get; set; } + /// /// Gets or sets the video3 D format. /// diff --git a/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs b/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs index 79c63aa6b3..963e8dd95e 100644 --- a/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs +++ b/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs @@ -26,6 +26,8 @@ namespace MediaBrowser.Model.MediaInfo /// The files. public List Files { get; set; } + public string PlaylistName { get; set; } + /// /// Gets or sets the chapters. /// diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs index 2a3cbcd845..ea090c8690 100644 --- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs +++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs @@ -566,6 +566,8 @@ namespace MediaBrowser.Providers.MediaInfo video.MediaStreams = stream.MediaStreams; + video.MainFeaturePlaylistName = stream.PlaylistName; + if (stream.RunTimeTicks.HasValue && stream.RunTimeTicks.Value > 0) { video.RunTimeTicks = stream.RunTimeTicks; diff --git a/MediaBrowser.Server.Implementations/BdInfo/BdInfoExaminer.cs b/MediaBrowser.Server.Implementations/BdInfo/BdInfoExaminer.cs index ae132a33c3..219b76cd53 100644 --- a/MediaBrowser.Server.Implementations/BdInfo/BdInfoExaminer.cs +++ b/MediaBrowser.Server.Implementations/BdInfo/BdInfoExaminer.cs @@ -78,6 +78,8 @@ namespace MediaBrowser.Server.Implementations.BdInfo outputStream.MediaStreams = mediaStreams; + outputStream.PlaylistName = playlist.Name; + if (playlist.StreamClips != null && playlist.StreamClips.Any()) { // Get the files in the playlist diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index 5ea5e85316..4786ccc79b 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common.Internal - 3.0.190 + 3.0.191 MediaBrowser.Common.Internal Luke ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption. Copyright © Media Browser 2013 - + diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index dec19c43a1..1537101f19 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common - 3.0.190 + 3.0.191 MediaBrowser.Common Media Browser Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index e8e6e26321..8d02e26152 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Server.Core - 3.0.190 + 3.0.191 Media Browser.Server.Core Media Browser Team ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains core components required to build plugins for Media Browser Server. Copyright © Media Browser 2013 - +