diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations/Channels')
3 files changed, 318 insertions, 145 deletions
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs index 8c510afd2..c8aa90b99 100644 --- a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs +++ b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs @@ -1,11 +1,11 @@ -using MediaBrowser.Common.Extensions; -using MediaBrowser.Common.IO; +using MediaBrowser.Common.IO; using MediaBrowser.Common.Net; using MediaBrowser.Common.Progress; using MediaBrowser.Common.ScheduledTasks; using MediaBrowser.Common.Security; using MediaBrowser.Controller.Channels; using MediaBrowser.Controller.Configuration; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Channels; using MediaBrowser.Model.Configuration; @@ -107,7 +107,7 @@ namespace MediaBrowser.Server.Implementations.Channels CancellationToken cancellationToken, IProgress<double> progress) { - var result = await _manager.GetLatestChannelItems(new AllChannelMediaQuery + var result = await _manager.GetLatestChannelItemsInternal(new AllChannelMediaQuery { UserId = userId @@ -127,7 +127,7 @@ namespace MediaBrowser.Server.Implementations.Channels CancellationToken cancellationToken, IProgress<double> progress) { - var result = await _manager.GetAllMedia(new AllChannelMediaQuery + var result = await _manager.GetAllMediaInternal(new AllChannelMediaQuery { UserId = userId @@ -143,7 +143,7 @@ namespace MediaBrowser.Server.Implementations.Channels await DownloadChannelContent(result, path, cancellationToken, innerProgress).ConfigureAwait(false); } - private async Task DownloadChannelContent(QueryResult<BaseItemDto> result, + private async Task DownloadChannelContent(QueryResult<BaseItem> result, string path, CancellationToken cancellationToken, IProgress<double> progress) @@ -154,7 +154,8 @@ namespace MediaBrowser.Server.Implementations.Channels foreach (var item in result.Items) { - if (options.DownloadingChannels.Contains(item.ChannelId)) + var channelItem = (IChannelItem)item; + if (options.DownloadingChannels.Contains(channelItem.ChannelId)) { try { @@ -164,6 +165,10 @@ namespace MediaBrowser.Server.Implementations.Channels { break; } + catch (ChannelDownloadException) + { + // Logged at lower levels + } catch (Exception ex) { _logger.ErrorException("Error downloading channel content for {0}", ex, item.Name); @@ -191,7 +196,7 @@ namespace MediaBrowser.Server.Implementations.Channels return channelOptions.DownloadSizeLimit; } - private async Task DownloadChannelItem(BaseItemDto item, + private async Task DownloadChannelItem(BaseItem item, ChannelOptions channelOptions, CancellationToken cancellationToken, string path) @@ -206,7 +211,8 @@ namespace MediaBrowser.Server.Implementations.Channels } } - var sources = await _manager.GetChannelItemMediaSources(item.Id, cancellationToken) + var itemId = item.Id.ToString("N"); + var sources = await _manager.GetChannelItemMediaSources(itemId, cancellationToken) .ConfigureAwait(false); var list = sources.ToList(); @@ -226,58 +232,34 @@ namespace MediaBrowser.Server.Implementations.Channels return; } - var options = new HttpRequestOptions - { - CancellationToken = cancellationToken, - Url = source.Path, - Progress = new Progress<double>() - }; - - foreach (var header in source.RequiredHttpHeaders) - { - options.RequestHeaders[header.Key] = header.Value; - } - - var destination = Path.Combine(path, item.ChannelId, item.Id); - Directory.CreateDirectory(Path.GetDirectoryName(destination)); + var channelItem = (IChannelMediaItem)item; - // Determine output extension - var response = await _httpClient.GetTempFileResponse(options).ConfigureAwait(false); + var destination = Path.Combine(path, channelItem.ChannelId, itemId); - if (item.IsVideo && response.ContentType.StartsWith("video/", StringComparison.OrdinalIgnoreCase)) - { - var extension = response.ContentType.Split('/') - .Last() - .Replace("quicktime", "mov", StringComparison.OrdinalIgnoreCase); + await _manager.DownloadChannelItem(channelItem, destination, new Progress<double>(), cancellationToken) + .ConfigureAwait(false); - destination += "." + extension; - } - else if (item.IsAudio && response.ContentType.StartsWith("audio/", StringComparison.OrdinalIgnoreCase)) - { - var extension = response.ContentType.Replace("audio/mpeg", "audio/mp3", StringComparison.OrdinalIgnoreCase) - .Split('/') - .Last(); + await RefreshMediaSourceItem(destination, cancellationToken).ConfigureAwait(false); + } - destination += "." + extension; - } - else + private async Task RefreshMediaSourceItems(IEnumerable<MediaSourceInfo> items, CancellationToken cancellationToken) + { + foreach (var item in items) { - File.Delete(response.TempFilePath); - - throw new ApplicationException("Unexpected response type encountered: " + response.ContentType); + await RefreshMediaSourceItem(item.Path, cancellationToken).ConfigureAwait(false); } + } - File.Copy(response.TempFilePath, destination, true); - - await RefreshMediaSourceItem(destination, cancellationToken).ConfigureAwait(false); + private async Task RefreshMediaSourceItem(string path, CancellationToken cancellationToken) + { + var item = _libraryManager.ResolvePath(new FileInfo(path)); - try - { - File.Delete(response.TempFilePath); - } - catch + if (item != null) { - + // Get the version from the database + item = _libraryManager.GetItemById(item.Id) ?? item; + + await item.RefreshMetadata(cancellationToken).ConfigureAwait(false); } } @@ -307,27 +289,6 @@ namespace MediaBrowser.Server.Implementations.Channels } } - private async Task RefreshMediaSourceItems(IEnumerable<MediaSourceInfo> items, CancellationToken cancellationToken) - { - foreach (var item in items) - { - await RefreshMediaSourceItem(item.Path, cancellationToken).ConfigureAwait(false); - } - } - - 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); - } - } - public IEnumerable<ITaskTrigger> GetDefaultTriggers() { return new ITaskTrigger[] diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs index c66db51db..d3b5fc0c3 100644 --- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs +++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs @@ -1,5 +1,8 @@ -using MediaBrowser.Common.Extensions; +using System.Net; +using System.Text; +using MediaBrowser.Common.Extensions; using MediaBrowser.Common.IO; +using MediaBrowser.Common.Net; using MediaBrowser.Controller.Channels; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Dto; @@ -12,6 +15,8 @@ using MediaBrowser.Model.Channels; using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; +using MediaBrowser.Model.MediaInfo; +using MediaBrowser.Model.Net; using MediaBrowser.Model.Querying; using MediaBrowser.Model.Serialization; using System; @@ -37,13 +42,17 @@ namespace MediaBrowser.Server.Implementations.Channels private readonly IServerConfigurationManager _config; private readonly IFileSystem _fileSystem; private readonly IJsonSerializer _jsonSerializer; + private readonly IHttpClient _httpClient; private readonly ILocalizationManager _localization; private readonly ConcurrentDictionary<Guid, bool> _refreshedItems = new ConcurrentDictionary<Guid, bool>(); + private readonly ConcurrentDictionary<string, int> _downloadCounts = new ConcurrentDictionary<string, int>(); + private Timer _refreshTimer; + private Timer _clearDownloadCountsTimer; - public ChannelManager(IUserManager userManager, IDtoService dtoService, ILibraryManager libraryManager, ILogger logger, IServerConfigurationManager config, IFileSystem fileSystem, IUserDataManager userDataManager, IJsonSerializer jsonSerializer, ILocalizationManager localization) + public ChannelManager(IUserManager userManager, IDtoService dtoService, ILibraryManager libraryManager, ILogger logger, IServerConfigurationManager config, IFileSystem fileSystem, IUserDataManager userDataManager, IJsonSerializer jsonSerializer, ILocalizationManager localization, IHttpClient httpClient) { _userManager = userManager; _dtoService = dtoService; @@ -54,8 +63,10 @@ namespace MediaBrowser.Server.Implementations.Channels _userDataManager = userDataManager; _jsonSerializer = jsonSerializer; _localization = localization; + _httpClient = httpClient; _refreshTimer = new Timer(s => _refreshedItems.Clear(), null, TimeSpan.FromHours(3), TimeSpan.FromHours(3)); + _clearDownloadCountsTimer = new Timer(s => _downloadCounts.Clear(), null, TimeSpan.FromHours(24), TimeSpan.FromHours(24)); } private TimeSpan CacheLength @@ -261,7 +272,7 @@ namespace MediaBrowser.Server.Implementations.Channels sources.InsertRange(0, cachedVersions); - return sources; + return sources.Where(IsValidMediaSource); } private readonly ConcurrentDictionary<string, Tuple<DateTime, List<ChannelMediaInfo>>> _channelItemMediaInfo = @@ -522,7 +533,6 @@ namespace MediaBrowser.Server.Implementations.Channels public ChannelFeatures GetChannelFeatures(string id) { var channel = GetChannel(id); - var channelProvider = GetChannelProvider(channel); return GetChannelFeaturesDto(channel, channelProvider, channelProvider.GetChannelFeatures()); @@ -568,6 +578,31 @@ namespace MediaBrowser.Server.Implementations.Channels ? null : _userManager.GetUserById(query.UserId); + var internalResult = await GetLatestChannelItemsInternal(query, cancellationToken).ConfigureAwait(false); + + // Get everything + var fields = Enum.GetNames(typeof(ItemFields)) + .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)) + .ToList(); + + var returnItems = internalResult.Items.Select(i => _dtoService.GetBaseItemDto(i, fields, user)) + .ToArray(); + + var result = new QueryResult<BaseItemDto> + { + Items = returnItems, + TotalRecordCount = internalResult.TotalRecordCount + }; + + return result; + } + + public async Task<QueryResult<BaseItem>> GetLatestChannelItemsInternal(AllChannelMediaQuery query, CancellationToken cancellationToken) + { + var user = string.IsNullOrWhiteSpace(query.UserId) + ? null + : _userManager.GetUserById(query.UserId); + if (!string.IsNullOrWhiteSpace(query.UserId) && user == null) { throw new ArgumentException("User not found."); @@ -648,7 +683,7 @@ namespace MediaBrowser.Server.Implementations.Channels var internalItems = await Task.WhenAll(itemTasks).ConfigureAwait(false); internalItems = ApplyFilters(internalItems, query.Filters, user).ToArray(); - await RefreshIfNeeded(internalItems, cancellationToken).ConfigureAwait(false); + await RefreshIfNeeded(internalItems, new Progress<double>(), cancellationToken).ConfigureAwait(false); if (query.StartIndex.HasValue) { @@ -659,10 +694,9 @@ namespace MediaBrowser.Server.Implementations.Channels internalItems = internalItems.Take(query.Limit.Value).ToArray(); } - var returnItemArray = internalItems.Select(i => _dtoService.GetBaseItemDto(i, query.Fields, user)) - .ToArray(); + var returnItemArray = internalItems.ToArray(); - return new QueryResult<BaseItemDto> + return new QueryResult<BaseItem> { TotalRecordCount = totalCount, Items = returnItemArray @@ -796,7 +830,6 @@ namespace MediaBrowser.Server.Implementations.Channels }); var internalItems = await Task.WhenAll(itemTasks).ConfigureAwait(false); - await RefreshIfNeeded(internalItems, cancellationToken).ConfigureAwait(false); var returnItemArray = internalItems.ToArray(); @@ -815,6 +848,8 @@ namespace MediaBrowser.Server.Implementations.Channels var internalResult = await GetAllMediaInternal(query, cancellationToken).ConfigureAwait(false); + await RefreshIfNeeded(internalResult.Items, new Progress<double>(), cancellationToken).ConfigureAwait(false); + // Get everything var fields = Enum.GetNames(typeof(ItemFields)) .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)) @@ -834,59 +869,10 @@ namespace MediaBrowser.Server.Implementations.Channels private async Task<ChannelItemResult> GetAllItems(IIndexableChannel indexable, IChannel channel, InternalAllChannelMediaQuery query, CancellationToken cancellationToken) { - var cacheLength = CacheLength; - var folderId = _jsonSerializer.SerializeToString(query).GetMD5().ToString("N"); - var cachePath = GetChannelDataCachePath(channel, query.UserId, folderId, null, false); - - try - { - if (_fileSystem.GetLastWriteTimeUtc(cachePath).Add(cacheLength) > DateTime.UtcNow) - { - return _jsonSerializer.DeserializeFromFile<ChannelItemResult>(cachePath); - } - } - catch (FileNotFoundException) - { - - } - catch (DirectoryNotFoundException) - { - - } - - await _resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false); - - try - { - try - { - if (_fileSystem.GetLastWriteTimeUtc(cachePath).Add(cacheLength) > DateTime.UtcNow) - { - return _jsonSerializer.DeserializeFromFile<ChannelItemResult>(cachePath); - } - } - catch (FileNotFoundException) - { - - } - catch (DirectoryNotFoundException) - { - - } - - var result = await indexable.GetAllMedia(query, cancellationToken).ConfigureAwait(false); - - CacheResponse(result, cachePath); - - return result; - } - finally - { - _resourcePool.Release(); - } + return await indexable.GetAllMedia(query, cancellationToken).ConfigureAwait(false); } - public async Task<QueryResult<BaseItem>> GetChannelItemsInternal(ChannelItemQuery query, CancellationToken cancellationToken) + public async Task<QueryResult<BaseItem>> GetChannelItemsInternal(ChannelItemQuery query, IProgress<double> progress, CancellationToken cancellationToken) { // Get the internal channel entity var channel = GetChannel(query.ChannelId); @@ -956,7 +942,7 @@ namespace MediaBrowser.Server.Implementations.Channels } } - return await GetReturnItems(internalItems, providerTotalRecordCount, user, query, cancellationToken).ConfigureAwait(false); + return await GetReturnItems(internalItems, providerTotalRecordCount, user, query, progress, cancellationToken).ConfigureAwait(false); } public async Task<QueryResult<BaseItemDto>> GetChannelItems(ChannelItemQuery query, CancellationToken cancellationToken) @@ -965,7 +951,7 @@ namespace MediaBrowser.Server.Implementations.Channels ? null : _userManager.GetUserById(query.UserId); - var internalResult = await GetChannelItemsInternal(query, cancellationToken).ConfigureAwait(false); + var internalResult = await GetChannelItemsInternal(query, new Progress<double>(), cancellationToken).ConfigureAwait(false); // Get everything var fields = Enum.GetNames(typeof(ItemFields)) @@ -1125,7 +1111,12 @@ namespace MediaBrowser.Server.Implementations.Channels filename + ".json"); } - private async Task<QueryResult<BaseItem>> GetReturnItems(IEnumerable<BaseItem> items, int? totalCountFromProvider, User user, ChannelItemQuery query, CancellationToken cancellationToken) + private async Task<QueryResult<BaseItem>> GetReturnItems(IEnumerable<BaseItem> items, + int? totalCountFromProvider, + User user, + ChannelItemQuery query, + IProgress<double> progress, + CancellationToken cancellationToken) { items = ApplyFilters(items, query.Filters, user); @@ -1147,9 +1138,8 @@ namespace MediaBrowser.Server.Implementations.Channels } } - await RefreshIfNeeded(all, cancellationToken).ConfigureAwait(false); - var returnItemArray = all.ToArray(); + await RefreshIfNeeded(returnItemArray, progress, cancellationToken).ConfigureAwait(false); return new QueryResult<BaseItem> { @@ -1272,11 +1262,19 @@ namespace MediaBrowser.Server.Implementations.Channels return item; } - private async Task RefreshIfNeeded(IEnumerable<BaseItem> programs, CancellationToken cancellationToken) + private async Task RefreshIfNeeded(BaseItem[] programs, IProgress<double> progress, CancellationToken cancellationToken) { + var numComplete = 0; + var numItems = programs.Length; + foreach (var program in programs) { await RefreshIfNeeded(program, cancellationToken).ConfigureAwait(false); + + numComplete++; + double percent = numComplete; + percent /= numItems; + progress.Report(percent * 100); } } @@ -1396,8 +1394,220 @@ namespace MediaBrowser.Server.Implementations.Channels return await _libraryManager.GetNamedView(name, "channels", "zz_" + name, cancellationToken).ConfigureAwait(false); } + public async Task DownloadChannelItem(IChannelMediaItem item, string destination, + IProgress<double> progress, CancellationToken cancellationToken) + { + var itemId = item.Id.ToString("N"); + var sources = await GetChannelItemMediaSources(itemId, cancellationToken) + .ConfigureAwait(false); + + var list = sources.Where(i => i.Protocol == MediaProtocol.Http).ToList(); + + foreach (var source in list) + { + try + { + await TryDownloadChannelItem(source, item, destination, progress, cancellationToken).ConfigureAwait(false); + return; + } + catch (HttpException ex) + { + if (ex.StatusCode.HasValue && ex.StatusCode.Value == HttpStatusCode.NotFound) + { + MarkBadMediaSource(source); + } + } + } + } + + private async Task TryDownloadChannelItem(MediaSourceInfo source, + IChannelMediaItem item, + string destination, + IProgress<double> progress, + CancellationToken cancellationToken) + { + var options = new HttpRequestOptions + { + CancellationToken = cancellationToken, + Url = source.Path, + Progress = new Progress<double>() + }; + + var host = new Uri(source.Path).Host.ToLower(); + var channel = GetChannel(item.ChannelId); + var channelProvider = GetChannelProvider(channel); + var limit = channelProvider.GetChannelFeatures().DailyDownloadLimit; + + if (!ValidateDownloadLimit(host, limit)) + { + _logger.Error(string.Format("Download limit has been reached for {0}", channel.Name)); + throw new ChannelDownloadException(string.Format("Download limit has been reached for {0}", channel.Name)); + } + + foreach (var header in source.RequiredHttpHeaders) + { + options.RequestHeaders[header.Key] = header.Value; + } + + Directory.CreateDirectory(Path.GetDirectoryName(destination)); + + // Determine output extension + var response = await _httpClient.GetTempFileResponse(options).ConfigureAwait(false); + + if (response.ContentType.StartsWith("text/html")) + { + throw new HttpException("File not found") + { + StatusCode = HttpStatusCode.NotFound + }; + } + + IncrementDownloadCount(host, limit); + + if (string.Equals(item.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase) && response.ContentType.StartsWith("video/", StringComparison.OrdinalIgnoreCase)) + { + var extension = response.ContentType.Split('/') + .Last() + .Replace("quicktime", "mov", StringComparison.OrdinalIgnoreCase); + + destination += "." + extension; + } + else if (string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase) && response.ContentType.StartsWith("audio/", StringComparison.OrdinalIgnoreCase)) + { + var extension = response.ContentType.Replace("audio/mpeg", "audio/mp3", StringComparison.OrdinalIgnoreCase) + .Split('/') + .Last(); + + destination += "." + extension; + } + else + { + File.Delete(response.TempFilePath); + + throw new ApplicationException("Unexpected response type encountered: " + response.ContentType); + } + + File.Copy(response.TempFilePath, destination, true); + + try + { + File.Delete(response.TempFilePath); + } + catch + { + + } + } + + private readonly ReaderWriterLockSlim _mediaSourceHistoryLock = new ReaderWriterLockSlim(); + private bool IsValidMediaSource(MediaSourceInfo source) + { + if (source.Protocol == MediaProtocol.Http) + { + return !GetBadMediaSourceHistory().Contains(source.Path, StringComparer.OrdinalIgnoreCase); + } + return true; + } + + private void MarkBadMediaSource(MediaSourceInfo source) + { + var list = GetBadMediaSourceHistory(); + list.Add(source.Path); + + var path = GetMediaSourceHistoryPath(); + + Directory.CreateDirectory(Path.GetDirectoryName(path)); + + if (_mediaSourceHistoryLock.TryEnterWriteLock(TimeSpan.FromSeconds(5))) + { + try + { + File.WriteAllLines(path, list.ToArray(), Encoding.UTF8); + } + catch (Exception ex) + { + _logger.ErrorException("Error saving file", ex); + } + finally + { + _mediaSourceHistoryLock.ExitWriteLock(); + } + } + } + + private ConcurrentBag<string> _badMediaSources = null; + private ConcurrentBag<string> GetBadMediaSourceHistory() + { + if (_badMediaSources == null) + { + var path = GetMediaSourceHistoryPath(); + + if (_mediaSourceHistoryLock.TryEnterReadLock(TimeSpan.FromSeconds(1))) + { + if (_badMediaSources == null) + { + try + { + _badMediaSources = new ConcurrentBag<string>(File.ReadAllLines(path, Encoding.UTF8)); + } + catch (IOException) + { + _badMediaSources = new ConcurrentBag<string>(); + } + catch (Exception ex) + { + _logger.ErrorException("Error reading file", ex); + _badMediaSources = new ConcurrentBag<string>(); + } + finally + { + _mediaSourceHistoryLock.ExitReadLock(); + } + } + } + } + return _badMediaSources; + } + + private string GetMediaSourceHistoryPath() + { + return Path.Combine(_config.ApplicationPaths.DataPath, "channels", "failures.txt"); + } + + private void IncrementDownloadCount(string key, int? limit) + { + if (!limit.HasValue) + { + return; + } + + int current; + _downloadCounts.TryGetValue(key, out current); + + current++; + _downloadCounts.AddOrUpdate(key, current, (k, v) => current); + } + + private bool ValidateDownloadLimit(string key, int? limit) + { + if (!limit.HasValue) + { + return true; + } + + int current; + _downloadCounts.TryGetValue(key, out current); + + return current < limit.Value; + } + public void Dispose() { + if (_clearDownloadCountsTimer != null) + { + _clearDownloadCountsTimer.Dispose(); + _clearDownloadCountsTimer = null; + } if (_refreshTimer != null) { _refreshTimer.Dispose(); diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs b/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs index 1dff669ae..f677661f7 100644 --- a/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs +++ b/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs @@ -99,20 +99,22 @@ namespace MediaBrowser.Server.Implementations.Channels } progress.Report(100); - } private async Task GetAllItems(string user, string channelId, string folderId, int currentRefreshLevel, int maxRefreshLevel, IProgress<double> progress, CancellationToken cancellationToken) { var folderItems = new List<string>(); + var innerProgress = new ActionableProgress<double>(); + innerProgress.RegisterAction(p => progress.Report(p / 2)); + var result = await _channelManager.GetChannelItemsInternal(new ChannelItemQuery { ChannelId = channelId, UserId = user, FolderId = folderId - }, cancellationToken); + }, innerProgress, cancellationToken); folderItems.AddRange(result.Items.Where(i => i.IsFolder).Select(i => i.Id.ToString("N"))); @@ -128,7 +130,7 @@ namespace MediaBrowser.Server.Implementations.Channels StartIndex = totalRetrieved, FolderId = folderId - }, cancellationToken); + }, new Progress<double>(), cancellationToken); folderItems.AddRange(result.Items.Where(i => i.IsFolder).Select(i => i.Id.ToString("N"))); @@ -142,12 +144,12 @@ namespace MediaBrowser.Server.Implementations.Channels { var numComplete = 0; var numItems = folderItems.Count; - + foreach (var folder in folderItems) { try { - var innerProgress = new ActionableProgress<double>(); + innerProgress = new ActionableProgress<double>(); var startingNumberComplete = numComplete; innerProgress.RegisterAction(p => @@ -157,7 +159,7 @@ namespace MediaBrowser.Server.Implementations.Channels innerPercent /= numItems; progress.Report((innerPercent * 50) + 50); }); - + await GetAllItems(user, channelId, folder, currentRefreshLevel + 1, maxRefreshLevel, innerProgress, cancellationToken).ConfigureAwait(false); } catch (Exception ex) @@ -168,7 +170,7 @@ namespace MediaBrowser.Server.Implementations.Channels numComplete++; double percent = numComplete; percent /= numItems; - progress.Report(percent * 100); + progress.Report((percent * 50) + 50); } } |