diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations/Channels')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs | 15 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Channels/ChannelManager.cs | 106 |
2 files changed, 68 insertions, 53 deletions
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs index 21b5ba6da..28f7352c5 100644 --- a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs +++ b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs @@ -134,7 +134,7 @@ namespace MediaBrowser.Server.Implementations.Channels if (cachedVersions.Count > 0) { - await RefreshMediaSourceItems(cachedVersions, item.IsVideo, cancellationToken).ConfigureAwait(false); + await RefreshMediaSourceItems(cachedVersions, cancellationToken).ConfigureAwait(false); return; } @@ -152,7 +152,7 @@ namespace MediaBrowser.Server.Implementations.Channels options.RequestHeaders[header.Key] = header.Value; } - var destination = Path.Combine(path, item.ChannelId, source.Path.GetMD5().ToString("N")); + var destination = Path.Combine(path, item.ChannelId, item.Id); Directory.CreateDirectory(Path.GetDirectoryName(destination)); // Determine output extension @@ -180,23 +180,26 @@ namespace MediaBrowser.Server.Implementations.Channels File.Move(response.TempFilePath, destination); - await RefreshMediaSourceItem(destination, item.IsVideo, cancellationToken).ConfigureAwait(false); + await RefreshMediaSourceItem(destination, cancellationToken).ConfigureAwait(false); } - private async Task RefreshMediaSourceItems(IEnumerable<MediaSourceInfo> items, bool isVideo, CancellationToken cancellationToken) + private async Task RefreshMediaSourceItems(IEnumerable<MediaSourceInfo> items, CancellationToken cancellationToken) { foreach (var item in items) { - await RefreshMediaSourceItem(item.Path, isVideo, cancellationToken).ConfigureAwait(false); + await RefreshMediaSourceItem(item.Path, cancellationToken).ConfigureAwait(false); } } - private async Task RefreshMediaSourceItem(string path, bool isVideo, CancellationToken cancellationToken) + private async Task RefreshMediaSourceItem(string path, CancellationToken cancellationToken) { var item = _libraryManager.ResolvePath(new FileInfo(path)); if (item != null) { + // Get the version from the database + item = _libraryManager.GetItemById(item.Id) ?? item; + await item.RefreshMetadata(cancellationToken).ConfigureAwait(false); } } diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs index b9e4e73b0..9f4db175e 100644 --- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs +++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs @@ -6,6 +6,7 @@ using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Providers; +using MediaBrowser.Controller.Resolvers; using MediaBrowser.Model.Channels; using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; @@ -194,77 +195,88 @@ namespace MediaBrowser.Server.Implementations.Channels var sources = SortMediaInfoResults(results).Select(i => GetMediaSource(item, i)) .ToList(); - var channelIdString = channel.Id.ToString("N"); - var isVideo = string.Equals(item.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase); + var cachedVersions = GetCachedChannelItemMediaSources(item); - var cachedVersionTasks = sources - .Select(i => GetCachedVersion(channelIdString, i, isVideo, cancellationToken)); - - var cachedVersions = await Task.WhenAll(cachedVersionTasks).ConfigureAwait(false); - - sources.InsertRange(0, cachedVersions.Where(i => i != null)); + sources.InsertRange(0, cachedVersions); return sources; } - private MediaSourceInfo GetMediaSource(IChannelMediaItem item, ChannelMediaInfo info) + public IEnumerable<MediaSourceInfo> GetCachedChannelItemMediaSources(string id) { - var id = info.Path.GetMD5().ToString("N"); - - var source = new MediaSourceInfo - { - MediaStreams = GetMediaStreams(info).ToList(), - - Container = info.Container, - LocationType = info.IsRemote ? LocationType.Remote : LocationType.FileSystem, - Path = info.Path, - RequiredHttpHeaders = info.RequiredHttpHeaders, - RunTimeTicks = item.RunTimeTicks, - Name = id, - Id = id - }; + var item = (IChannelMediaItem)_libraryManager.GetItemById(id); - return source; + return GetCachedChannelItemMediaSources(item); } - private async Task<MediaSourceInfo> GetCachedVersion(string channelId, - MediaSourceInfo info, - bool isVideo, - CancellationToken cancellationToken) + public IEnumerable<MediaSourceInfo> GetCachedChannelItemMediaSources(IChannelMediaItem item) { - var filename = info.Path.GetMD5().ToString("N"); - - var path = Path.Combine(ChannelDownloadPath, channelId, filename); + var filenamePrefix = item.Id.ToString("N"); + var parentPath = Path.Combine(ChannelDownloadPath, item.ChannelId); try { - var file = Directory.EnumerateFiles(Path.GetDirectoryName(path), "*", SearchOption.TopDirectoryOnly) - .FirstOrDefault(i => (Path.GetFileName(i) ?? string.Empty).StartsWith(filename, StringComparison.OrdinalIgnoreCase)); + var files = new DirectoryInfo(parentPath).EnumerateFiles("*", SearchOption.TopDirectoryOnly); - if (!string.IsNullOrWhiteSpace(file)) + if (string.Equals(item.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase)) { - var source = new MediaSourceInfo - { - Path = file, - LocationType = LocationType.FileSystem, - Name = "Cached " + info.Name, - Id = file.GetMD5().ToString("N") - }; + files = files.Where(i => EntityResolutionHelper.IsVideoFile(i.FullName)); + } + else + { + files = files.Where(i => EntityResolutionHelper.IsAudioFile(i.FullName)); + } + + var file = files + .FirstOrDefault(i => i.Name.StartsWith(filenamePrefix, StringComparison.OrdinalIgnoreCase)); + + if (file != null) + { + var cachedItem = _libraryManager.ResolvePath(file); - if (isVideo) + if (cachedItem != null) { - source.VideoType = VideoType.VideoFile; - } + var hasMediaSources = _libraryManager.GetItemById(cachedItem.Id) as IHasMediaSources; + + if (hasMediaSources != null) + { + var source = hasMediaSources.GetMediaSources(true).FirstOrDefault(); - return source; + if (source != null) + { + source.Type = MediaSourceType.Cache; + return new[] { source }; + } + } + } } } catch (DirectoryNotFoundException) { - return null; + } - return null; + return new List<MediaSourceInfo>(); + } + + private MediaSourceInfo GetMediaSource(IChannelMediaItem item, ChannelMediaInfo info) + { + var id = info.Path.GetMD5().ToString("N"); + + var source = new MediaSourceInfo + { + MediaStreams = GetMediaStreams(info).ToList(), + + Container = info.Container, + LocationType = info.IsRemote ? LocationType.Remote : LocationType.FileSystem, + Path = info.Path, + RequiredHttpHeaders = info.RequiredHttpHeaders, + RunTimeTicks = item.RunTimeTicks, + Name = id, + Id = id + }; + + return source; } private IEnumerable<MediaStream> GetMediaStreams(ChannelMediaInfo info) |