Merge pull request #2267 from MediaBrowser/dev

Dev

2 files changed, 0 insertions, 464 deletions

diff --git a/MediaBrowser.Server.Implementations/TV/SeriesPostScanTask.cs b/MediaBrowser.Server.Implementations/TV/SeriesPostScanTask.cs
deleted file mode 100644
index a498dfec3c..0000000000
--- a/MediaBrowser.Server.Implementations/TV/SeriesPostScanTask.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Plugins;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Tasks;
-using MediaBrowser.Model.Xml;
-using MediaBrowser.Providers.TV;
-
-namespace MediaBrowser.Server.Implementations.TV
-{
-    class SeriesGroup : List<Series>, IGrouping<string, Series>
-    {
-        public string Key { get; set; }
-    }
-
-    class SeriesPostScanTask : ILibraryPostScanTask, IHasOrder
-    {
-        /// <summary>
-        /// The _library manager
-        /// </summary>
-        private readonly ILibraryManager _libraryManager;
-        private readonly IServerConfigurationManager _config;
-        private readonly ILogger _logger;
-        private readonly ILocalizationManager _localization;
-        private readonly IFileSystem _fileSystem;
-        private readonly IXmlReaderSettingsFactory _xmlSettings;
-
-        public SeriesPostScanTask(ILibraryManager libraryManager, ILogger logger, IServerConfigurationManager config, ILocalizationManager localization, IFileSystem fileSystem, IXmlReaderSettingsFactory xmlSettings)
-        {
-            _libraryManager = libraryManager;
-            _logger = logger;
-            _config = config;
-            _localization = localization;
-            _fileSystem = fileSystem;
-            _xmlSettings = xmlSettings;
-        }
-
-        public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
-        {
-            return RunInternal(progress, cancellationToken);
-        }
-
-        private Task RunInternal(IProgress<double> progress, CancellationToken cancellationToken)
-        {
-            var seriesList = _libraryManager.GetItemList(new InternalItemsQuery()
-            {
-                IncludeItemTypes = new[] { typeof(Series).Name },
-                Recursive = true,
-                GroupByPresentationUniqueKey = false
-
-            }).Cast<Series>().ToList();
-
-            var seriesGroups = FindSeriesGroups(seriesList).Where(g => !string.IsNullOrEmpty(g.Key)).ToList();
-
-            return new MissingEpisodeProvider(_logger, _config, _libraryManager, _localization, _fileSystem, _xmlSettings).Run(seriesGroups, true, cancellationToken);
-        }
-
-        internal static IEnumerable<IGrouping<string, Series>> FindSeriesGroups(List<Series> seriesList)
-        {
-            var links = seriesList.ToDictionary(s => s, s => seriesList.Where(c => c != s && ShareProviderId(s, c)).ToList());
-
-            var visited = new HashSet<Series>();
-
-            foreach (var series in seriesList)
-            {
-                if (!visited.Contains(series))
-                {
-                    var group = new SeriesGroup();
-                    FindAllLinked(series, visited, links, group);
-
-                    group.Key = group.Select(s => s.GetProviderId(MetadataProviders.Tvdb)).FirstOrDefault(id => !string.IsNullOrEmpty(id));
-
-                    yield return group;
-                }
-            }
-        }
-
-        private static void FindAllLinked(Series series, HashSet<Series> visited, IDictionary<Series, List<Series>> linksMap, List<Series> results)
-        {
-            results.Add(series);
-            visited.Add(series);
-
-            var links = linksMap[series];
-
-            foreach (var s in links)
-            {
-                if (!visited.Contains(s))
-                {
-                    FindAllLinked(s, visited, linksMap, results);
-                }
-            }
-        }
-
-        private static bool ShareProviderId(Series a, Series b)
-        {
-            return a.ProviderIds.Any(id =>
-            {
-                string value;
-                return b.ProviderIds.TryGetValue(id.Key, out value) && id.Value == value;
-            });
-        }
-
-        public int Order
-        {
-            get
-            {
-                // Run after tvdb update task
-                return 1;
-            }
-        }
-    }
-
-    public class CleanMissingEpisodesEntryPoint : IServerEntryPoint
-    {
-        private readonly ILibraryManager _libraryManager;
-        private readonly IServerConfigurationManager _config;
-        private readonly ILogger _logger;
-        private readonly ILocalizationManager _localization;
-        private readonly IFileSystem _fileSystem;
-        private readonly object _libraryChangedSyncLock = new object();
-        private const int LibraryUpdateDuration = 180000;
-        private readonly ITaskManager _taskManager;
-        private readonly IXmlReaderSettingsFactory _xmlSettings;
-
-        public CleanMissingEpisodesEntryPoint(ILibraryManager libraryManager, IServerConfigurationManager config, ILogger logger, ILocalizationManager localization, IFileSystem fileSystem, ITaskManager taskManager, IXmlReaderSettingsFactory xmlSettings)
-        {
-            _libraryManager = libraryManager;
-            _config = config;
-            _logger = logger;
-            _localization = localization;
-            _fileSystem = fileSystem;
-            _taskManager = taskManager;
-            _xmlSettings = xmlSettings;
-        }
-
-        private Timer LibraryUpdateTimer { get; set; }
-
-        public void Run()
-        {
-            _libraryManager.ItemAdded += _libraryManager_ItemAdded;
-        }
-
-        private void _libraryManager_ItemAdded(object sender, ItemChangeEventArgs e)
-        {
-            if (!FilterItem(e.Item))
-            {
-                return;
-            }
-
-            lock (_libraryChangedSyncLock)
-            {
-                if (LibraryUpdateTimer == null)
-                {
-                    LibraryUpdateTimer = new Timer(LibraryUpdateTimerCallback, null, LibraryUpdateDuration, Timeout.Infinite);
-                }
-                else
-                {
-                    LibraryUpdateTimer.Change(LibraryUpdateDuration, Timeout.Infinite);
-                }
-            }
-        }
-
-        private async void LibraryUpdateTimerCallback(object state)
-        {
-            try
-            {
-                if (MissingEpisodeProvider.IsRunning)
-                {
-                    return;
-                }
-
-                if (_libraryManager.IsScanRunning)
-                {
-                    return;
-                }
-
-                var seriesList = _libraryManager.GetItemList(new InternalItemsQuery()
-                {
-                    IncludeItemTypes = new[] { typeof(Series).Name },
-                    Recursive = true,
-                    GroupByPresentationUniqueKey = false
-
-                }).Cast<Series>().ToList();
-
-                var seriesGroups = SeriesPostScanTask.FindSeriesGroups(seriesList).Where(g => !string.IsNullOrEmpty(g.Key)).ToList();
-
-                await new MissingEpisodeProvider(_logger, _config, _libraryManager, _localization, _fileSystem, _xmlSettings)
-                    .Run(seriesGroups, false, CancellationToken.None).ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("Error in SeriesPostScanTask", ex);
-            }
-        }
-
-        private bool FilterItem(BaseItem item)
-        {
-            return item is Episode && item.LocationType != LocationType.Virtual;
-        }
-
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-        }
-
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources.
-        /// </summary>
-        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool dispose)
-        {
-            if (dispose)
-            {
-                if (LibraryUpdateTimer != null)
-                {
-                    LibraryUpdateTimer.Dispose();
-                    LibraryUpdateTimer = null;
-                }
-
-                _libraryManager.ItemAdded -= _libraryManager_ItemAdded;
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs b/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
deleted file mode 100644
index 03e8a9178e..0000000000
--- a/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
+++ /dev/null
@@ -1,226 +0,0 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.TV;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Querying;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using MediaBrowser.Controller.Configuration;
-
-namespace MediaBrowser.Server.Implementations.TV
-{
-    public class TVSeriesManager : ITVSeriesManager
-    {
-        private readonly IUserManager _userManager;
-        private readonly IUserDataManager _userDataManager;
-        private readonly ILibraryManager _libraryManager;
-        private readonly IServerConfigurationManager _config;
-
-        public TVSeriesManager(IUserManager userManager, IUserDataManager userDataManager, ILibraryManager libraryManager, IServerConfigurationManager config)
-        {
-            _userManager = userManager;
-            _userDataManager = userDataManager;
-            _libraryManager = libraryManager;
-            _config = config;
-        }
-
-        public QueryResult<BaseItem> GetNextUp(NextUpQuery request)
-        {
-            var user = _userManager.GetUserById(request.UserId);
-
-            if (user == null)
-            {
-                throw new ArgumentException("User not found");
-            }
-
-            var parentIdGuid = string.IsNullOrWhiteSpace(request.ParentId) ? (Guid?)null : new Guid(request.ParentId);
-
-            string presentationUniqueKey = null;
-            int? limit = null;
-            if (!string.IsNullOrWhiteSpace(request.SeriesId))
-            {
-                var series = _libraryManager.GetItemById(request.SeriesId);
-
-                if (series != null)
-                {
-                    presentationUniqueKey = GetUniqueSeriesKey(series);
-                    limit = 1;
-                }
-            }
-
-            if (string.IsNullOrWhiteSpace(presentationUniqueKey) && limit.HasValue)
-            {
-                limit = limit.Value + 10;
-            }
-
-            var items = _libraryManager.GetItemList(new InternalItemsQuery(user)
-            {
-                IncludeItemTypes = new[] { typeof(Series).Name },
-                SortOrder = SortOrder.Ascending,
-                PresentationUniqueKey = presentationUniqueKey,
-                Limit = limit,
-                ParentId = parentIdGuid,
-                Recursive = true
-
-            }).Cast<Series>();
-
-            // Avoid implicitly captured closure
-            var episodes = GetNextUpEpisodes(request, user, items);
-
-            return GetResult(episodes, null, request);
-        }
-
-        public QueryResult<BaseItem> GetNextUp(NextUpQuery request, IEnumerable<Folder> parentsFolders)
-        {
-            var user = _userManager.GetUserById(request.UserId);
-
-            if (user == null)
-            {
-                throw new ArgumentException("User not found");
-            }
-
-            string presentationUniqueKey = null;
-            int? limit = null;
-            if (!string.IsNullOrWhiteSpace(request.SeriesId))
-            {
-                var series = _libraryManager.GetItemById(request.SeriesId);
-
-                if (series != null)
-                {
-                    presentationUniqueKey = GetUniqueSeriesKey(series);
-                    limit = 1;
-                }
-            }
-
-            if (string.IsNullOrWhiteSpace(presentationUniqueKey) && limit.HasValue)
-            {
-                limit = limit.Value + 10;
-            }
-
-            var items = _libraryManager.GetItemList(new InternalItemsQuery(user)
-            {
-                IncludeItemTypes = new[] { typeof(Series).Name },
-                SortOrder = SortOrder.Ascending,
-                PresentationUniqueKey = presentationUniqueKey,
-                Limit = limit
-
-            }, parentsFolders.Select(i => i.Id.ToString("N"))).Cast<Series>();
-
-            // Avoid implicitly captured closure
-            var episodes = GetNextUpEpisodes(request, user, items);
-
-            return GetResult(episodes, null, request);
-        }
-
-        public IEnumerable<Episode> GetNextUpEpisodes(NextUpQuery request, User user, IEnumerable<Series> series)
-        {
-            // Avoid implicitly captured closure
-            var currentUser = user;
-
-            var allNextUp = series
-                .Select(i => GetNextUp(i, currentUser))
-                .Where(i => i.Item1 != null)
-                // Include if an episode was found, and either the series is not unwatched or the specific series was requested
-                .OrderByDescending(i => i.Item2)
-                .ThenByDescending(i => i.Item1.PremiereDate ?? DateTime.MinValue)
-                .ToList();
-
-            // If viewing all next up for all series, remove first episodes
-            if (string.IsNullOrWhiteSpace(request.SeriesId))
-            {
-                var withoutFirstEpisode = allNextUp
-                    .Where(i => !i.Item3)
-                    .ToList();
-
-                // But if that returns empty, keep those first episodes (avoid completely empty view)
-                if (withoutFirstEpisode.Count > 0)
-                {
-                    allNextUp = withoutFirstEpisode;
-                }
-            }
-
-            return allNextUp
-                .Select(i => i.Item1)
-                .Take(request.Limit ?? int.MaxValue);
-        }
-
-        private string GetUniqueSeriesKey(BaseItem series)
-        {
-            if (_config.Configuration.SchemaVersion < 97)
-            {
-                return series.Id.ToString("N");
-            }
-            return series.GetPresentationUniqueKey();
-        }
-
-        /// <summary>
-        /// Gets the next up.
-        /// </summary>
-        /// <param name="series">The series.</param>
-        /// <param name="user">The user.</param>
-        /// <returns>Task{Episode}.</returns>
-        private Tuple<Episode, DateTime, bool> GetNextUp(Series series, User user)
-        {
-            var lastWatchedEpisode = _libraryManager.GetItemList(new InternalItemsQuery(user)
-            {
-                AncestorWithPresentationUniqueKey = GetUniqueSeriesKey(series),
-                IncludeItemTypes = new[] { typeof(Episode).Name },
-                SortBy = new[] { ItemSortBy.SortName },
-                SortOrder = SortOrder.Descending,
-                IsPlayed = true,
-                Limit = 1,
-                ParentIndexNumberNotEquals = 0
-
-            }).FirstOrDefault();
-
-            var firstUnwatchedEpisode = _libraryManager.GetItemList(new InternalItemsQuery(user)
-            {
-                AncestorWithPresentationUniqueKey = GetUniqueSeriesKey(series),
-                IncludeItemTypes = new[] { typeof(Episode).Name },
-                SortBy = new[] { ItemSortBy.SortName },
-                SortOrder = SortOrder.Ascending,
-                Limit = 1,
-                IsPlayed = false,
-                IsVirtualItem = false,
-                ParentIndexNumberNotEquals = 0,
-                MinSortName = lastWatchedEpisode == null ? null : lastWatchedEpisode.SortName
-
-            }).Cast<Episode>().FirstOrDefault();
-
-            if (lastWatchedEpisode != null && firstUnwatchedEpisode != null)
-            {
-                var userData = _userDataManager.GetUserData(user, lastWatchedEpisode);
-
-                var lastWatchedDate = userData.LastPlayedDate ?? DateTime.MinValue.AddDays(1);
-
-                return new Tuple<Episode, DateTime, bool>(firstUnwatchedEpisode, lastWatchedDate, false);
-            }
-
-            // Return the first episode
-            return new Tuple<Episode, DateTime, bool>(firstUnwatchedEpisode, DateTime.MinValue, true);
-        }
-
-        private QueryResult<BaseItem> GetResult(IEnumerable<BaseItem> items, int? totalRecordLimit, NextUpQuery query)
-        {
-            var itemsArray = totalRecordLimit.HasValue ? items.Take(totalRecordLimit.Value).ToArray() : items.ToArray();
-            var totalCount = itemsArray.Length;
-
-            if (query.Limit.HasValue)
-            {
-                itemsArray = itemsArray.Skip(query.StartIndex ?? 0).Take(query.Limit.Value).ToArray();
-            }
-            else if (query.StartIndex.HasValue)
-            {
-                itemsArray = itemsArray.Skip(query.StartIndex.Value).ToArray();
-            }
-
-            return new QueryResult<BaseItem>
-            {
-                TotalRecordCount = totalCount,
-                Items = itemsArray
-            };
-        }
-    }
-}