diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations')
6 files changed, 19 insertions, 144 deletions
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index a43c51282..6a0723c52 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -103,6 +103,22 @@ namespace MediaBrowser.Server.Implementations.Dto AttachUserSpecificInfo(dto, item, user, fields); } + var hasMediaSources = item as IHasMediaSources; + if (hasMediaSources != null) + { + if (fields.Contains(ItemFields.MediaSources)) + { + if (user == null) + { + dto.MediaSources = hasMediaSources.GetMediaSources(true).ToList(); + } + else + { + dto.MediaSources = hasMediaSources.GetMediaSources(true, user).ToList(); + } + } + } + if (fields.Contains(ItemFields.Studios)) { AttachStudios(dto, item); @@ -110,33 +126,6 @@ namespace MediaBrowser.Server.Implementations.Dto AttachBasicFields(dto, item, owner, fields); - if (user != null && dto.MediaSources != null && item is Video) - { - var preferredAudio = string.IsNullOrEmpty(user.Configuration.AudioLanguagePreference) - ? new string[] { } - : new[] { user.Configuration.AudioLanguagePreference }; - - var preferredSubs = string.IsNullOrEmpty(user.Configuration.SubtitleLanguagePreference) - ? new string[] { } - : new[] { user.Configuration.SubtitleLanguagePreference }; - - foreach (var source in dto.MediaSources) - { - source.DefaultAudioStreamIndex = MediaStreamSelector.GetDefaultAudioStreamIndex( - source.MediaStreams, preferredAudio, user.Configuration.PlayDefaultAudioTrack); - - var defaultAudioIndex = source.DefaultAudioStreamIndex; - var audioLangage = defaultAudioIndex == null - ? null - : source.MediaStreams.Where(i => i.Type == MediaStreamType.Audio && i.Index == defaultAudioIndex).Select(i => i.Language).FirstOrDefault(); - - source.DefaultSubtitleStreamIndex = MediaStreamSelector.GetDefaultSubtitleStreamIndex(source.MediaStreams, - preferredSubs, - user.Configuration.SubtitleMode, - audioLangage); - } - } - if (fields.Contains(ItemFields.SoundtrackIds)) { var hasSoundtracks = item as IHasSoundtracks; @@ -926,11 +915,6 @@ namespace MediaBrowser.Server.Implementations.Dto } dto.MediaSourceCount = 1; - - if (fields.Contains(ItemFields.MediaSources)) - { - dto.MediaSources = GetMediaSources(audio); - } } var album = item as MusicAlbum; @@ -963,11 +947,6 @@ namespace MediaBrowser.Server.Implementations.Dto dto.PartCount = video.AdditionalPartIds.Count + 1; dto.MediaSourceCount = video.MediaSourceCount; - if (fields.Contains(ItemFields.MediaSources)) - { - dto.MediaSources = GetMediaSources(video); - } - if (fields.Contains(ItemFields.Chapters)) { List<ChapterInfoDto> chapters; diff --git a/MediaBrowser.Server.Implementations/Dto/MediaStreamSelector.cs b/MediaBrowser.Server.Implementations/Dto/MediaStreamSelector.cs deleted file mode 100644 index c2dc1ef24..000000000 --- a/MediaBrowser.Server.Implementations/Dto/MediaStreamSelector.cs +++ /dev/null @@ -1,103 +0,0 @@ -using MediaBrowser.Model.Configuration; -using MediaBrowser.Model.Entities; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace MediaBrowser.Server.Implementations.Dto -{ - public static class MediaStreamSelector - { - public static int? GetDefaultAudioStreamIndex(List<MediaStream> streams, IEnumerable<string> preferredLanguages, bool preferDefaultTrack) - { - streams = GetSortedStreams(streams, MediaStreamType.Audio, preferredLanguages.ToList()) - .ToList(); - - if (preferDefaultTrack) - { - var defaultStream = streams.FirstOrDefault(i => i.IsDefault); - - if (defaultStream != null) - { - return defaultStream.Index; - } - } - - var stream = streams.FirstOrDefault(); - - if (stream != null) - { - return stream.Index; - } - - return null; - } - - public static int? GetDefaultSubtitleStreamIndex(List<MediaStream> streams, - IEnumerable<string> preferredLanguages, - SubtitlePlaybackMode mode, - string audioTrackLanguage) - { - var languages = preferredLanguages.ToList(); - streams = GetSortedStreams(streams, MediaStreamType.Subtitle, languages).ToList(); - - var full = streams.Where(s => !s.IsForced); - var forced = streams.Where(s => s.IsForced && string.Equals(s.Language, audioTrackLanguage, StringComparison.OrdinalIgnoreCase)); - - MediaStream stream = null; - - if (mode == SubtitlePlaybackMode.None) - { - return null; - } - - if (mode == SubtitlePlaybackMode.Default) - { - // if the audio language is not understood by the user, load their preferred subs, if there are any - if (!ContainsOrdinal(languages, audioTrackLanguage)) - { - stream = full.FirstOrDefault(s => ContainsOrdinal(languages, s.Language)); - } - } - else if (mode == SubtitlePlaybackMode.Always) - { - // always load the most suitable full subtitles - stream = full.FirstOrDefault(); - } - - // load forced subs if we have found no suitable full subtitles - stream = stream ?? forced.FirstOrDefault(); - - if (stream != null) - { - return stream.Index; - } - - return null; - } - - private static bool ContainsOrdinal(IEnumerable<string> list, string item) - { - return list.Any(i => string.Equals(i, item, StringComparison.OrdinalIgnoreCase)); - } - - private static IEnumerable<MediaStream> GetSortedStreams(IEnumerable<MediaStream> streams, MediaStreamType type, List<string> languagePreferences) - { - var orderStreams = streams - .Where(i => i.Type == type); - - // Give some preferance to external text subs for better performance - return orderStreams.OrderBy(i => - { - var index = languagePreferences.FindIndex(l => string.Equals(i.Language, l, StringComparison.OrdinalIgnoreCase)); - - return index == -1 ? 100 : index; - }) - .ThenBy(i => i.IsDefault) - .ThenBy(i => i.IsTextSubtitleStream) - .ThenBy(i => i.IsExternal) - .ThenBy(i => i.Index) - .ToList(); - } - } -} diff --git a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs index 83d8e4b73..564fa1a0b 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs @@ -109,7 +109,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv if (liveTvItem != null) { - return !liveTvItem.HasImage(ImageType.Primary) && (liveTvItem.HasProviderImage ?? true) && (DateTime.UtcNow - date).TotalHours >= 6; + return !liveTvItem.HasImage(ImageType.Primary) && (liveTvItem.HasProviderImage ?? true); } return false; } diff --git a/MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs index 081722bb2..06210e03b 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs @@ -109,7 +109,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv if (liveTvItem != null) { - return !liveTvItem.HasImage(ImageType.Primary) && (liveTvItem.HasProviderImage ?? true) && (DateTime.UtcNow - date).TotalHours >= 6; + return !liveTvItem.HasImage(ImageType.Primary) && (liveTvItem.HasProviderImage ?? true); } return false; } diff --git a/MediaBrowser.Server.Implementations/LiveTv/RecordingImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/RecordingImageProvider.cs index 7aa5dcebd..e615305dc 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/RecordingImageProvider.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/RecordingImageProvider.cs @@ -109,7 +109,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv if (liveTvItem != null) { - return !liveTvItem.HasImage(ImageType.Primary) && (liveTvItem.RecordingInfo.HasImage ?? true) && (DateTime.UtcNow - date).TotalHours >= 6; + return !liveTvItem.HasImage(ImageType.Primary) && (liveTvItem.RecordingInfo.HasImage ?? true); } return false; } diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 563c5d76a..18c2d8582 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -112,7 +112,6 @@ <Compile Include="Drawing\PlayedIndicatorDrawer.cs" /> <Compile Include="Drawing\UnplayedCountIndicator.cs" /> <Compile Include="Dto\DtoService.cs" /> - <Compile Include="Dto\MediaStreamSelector.cs" /> <Compile Include="EntryPoints\AutomaticRestartEntryPoint.cs" /> <Compile Include="EntryPoints\ExternalPortForwarding.cs" /> <Compile Include="EntryPoints\LibraryChangedNotifier.cs" /> |