From 2733c598b26f137f657319e041cf3984dace55eb Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 29 Jun 2016 23:29:46 -0400 Subject: [PATCH] remove unused components --- .../MediaBrowser.Controller.csproj | 2 -- .../Providers/ISeriesOrderManager.cs | 11 ------ .../Providers/ISeriesOrderProvider.cs | 10 ------ .../Manager/SeriesOrderManager.cs | 35 ------------------- .../MediaBrowser.Providers.csproj | 1 - .../TV/TheTVDB/TvdbSeriesProvider.cs | 16 +-------- .../ApplicationHost.cs | 6 ---- 7 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 MediaBrowser.Controller/Providers/ISeriesOrderManager.cs delete mode 100644 MediaBrowser.Controller/Providers/ISeriesOrderProvider.cs delete mode 100644 MediaBrowser.Providers/Manager/SeriesOrderManager.cs diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 9b4c35c419..d1429c366e 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -302,7 +302,6 @@ - @@ -330,7 +329,6 @@ - diff --git a/MediaBrowser.Controller/Providers/ISeriesOrderManager.cs b/MediaBrowser.Controller/Providers/ISeriesOrderManager.cs deleted file mode 100644 index 970f7a7be5..0000000000 --- a/MediaBrowser.Controller/Providers/ISeriesOrderManager.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace MediaBrowser.Controller.Providers -{ - public interface ISeriesOrderManager - { - Task FindSeriesIndex(string orderType, string seriesName); - void AddParts(IEnumerable orderProviders); - } -} diff --git a/MediaBrowser.Controller/Providers/ISeriesOrderProvider.cs b/MediaBrowser.Controller/Providers/ISeriesOrderProvider.cs deleted file mode 100644 index ee0f3c197f..0000000000 --- a/MediaBrowser.Controller/Providers/ISeriesOrderProvider.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Threading.Tasks; - -namespace MediaBrowser.Controller.Providers -{ - public interface ISeriesOrderProvider - { - string OrderType { get; } - Task FindSeriesIndex(string seriesName); - } -} \ No newline at end of file diff --git a/MediaBrowser.Providers/Manager/SeriesOrderManager.cs b/MediaBrowser.Providers/Manager/SeriesOrderManager.cs deleted file mode 100644 index 1050bdbbd6..0000000000 --- a/MediaBrowser.Providers/Manager/SeriesOrderManager.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using MediaBrowser.Controller.Providers; - -namespace MediaBrowser.Providers.Manager -{ - public class SeriesOrderManager : ISeriesOrderManager - { - private Dictionary _providers; - - public void AddParts(IEnumerable orderProviders) - { - _providers = orderProviders - .GroupBy(p => p.OrderType) - .ToDictionary(g => g.Key, g => g.ToArray()); - } - - public async Task FindSeriesIndex(string orderType, string seriesName) - { - ISeriesOrderProvider[] providers; - if (!_providers.TryGetValue(orderType, out providers)) - return null; - - foreach (ISeriesOrderProvider provider in providers) - { - int? index = await provider.FindSeriesIndex(seriesName); - if (index != null) - return index; - } - - return null; - } - } -} \ No newline at end of file diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj index 240b2e2cca..99d8b15b69 100644 --- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj +++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj @@ -103,7 +103,6 @@ - diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs index 49ca5cdf20..b6cc8777d8 100644 --- a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs +++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs @@ -38,17 +38,15 @@ namespace MediaBrowser.Providers.TV private readonly IServerConfigurationManager _config; private readonly CultureInfo _usCulture = new CultureInfo("en-US"); private readonly ILogger _logger; - private readonly ISeriesOrderManager _seriesOrder; private readonly ILibraryManager _libraryManager; - public TvdbSeriesProvider(IZipClient zipClient, IHttpClient httpClient, IFileSystem fileSystem, IServerConfigurationManager config, ILogger logger, ISeriesOrderManager seriesOrder, ILibraryManager libraryManager) + public TvdbSeriesProvider(IZipClient zipClient, IHttpClient httpClient, IFileSystem fileSystem, IServerConfigurationManager config, ILogger logger, ILibraryManager libraryManager) { _zipClient = zipClient; _httpClient = httpClient; _fileSystem = fileSystem; _config = config; _logger = logger; - _seriesOrder = seriesOrder; _libraryManager = libraryManager; Current = this; } @@ -112,23 +110,11 @@ namespace MediaBrowser.Providers.TV result.HasMetadata = true; FetchSeriesData(result, itemId.MetadataLanguage, itemId.ProviderIds, cancellationToken); - await FindAnimeSeriesIndex(result.Item, itemId).ConfigureAwait(false); } return result; } - private async Task FindAnimeSeriesIndex(Series series, SeriesInfo info) - { - var index = await _seriesOrder.FindSeriesIndex(SeriesOrderTypes.Anime, series.Name); - if (index == null) - return; - - var offset = info.AnimeSeriesIndex - index; - var id = string.Format(TvdbSeriesOffsetFormat, series.GetProviderId(MetadataProviders.Tvdb), offset); - series.SetProviderId(TvdbSeriesOffset, id); - } - internal static int? GetSeriesOffset(Dictionary seriesProviderIds) { string idString; diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs index 651b0e01f5..8978cec5f0 100644 --- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs +++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs @@ -160,7 +160,6 @@ namespace MediaBrowser.Server.Startup.Common private IHttpServer HttpServer { get; set; } private IDtoService DtoService { get; set; } private IImageProcessor ImageProcessor { get; set; } - private ISeriesOrderManager SeriesOrderManager { get; set; } /// /// Gets or sets the media encoder. @@ -476,9 +475,6 @@ namespace MediaBrowser.Server.Startup.Common ProviderManager = new ProviderManager(HttpClient, ServerConfigurationManager, LibraryMonitor, LogManager, FileSystemManager, ApplicationPaths, () => LibraryManager, JsonSerializer); RegisterSingleInstance(ProviderManager); - SeriesOrderManager = new SeriesOrderManager(); - RegisterSingleInstance(SeriesOrderManager); - RegisterSingleInstance(() => new SearchEngine(LogManager, LibraryManager, UserManager)); HttpServer = ServerFactory.CreateServer(this, LogManager, ServerConfigurationManager, NetworkManager, "Emby", "web/index.html"); @@ -819,8 +815,6 @@ namespace MediaBrowser.Server.Startup.Common GetExports(), GetExports()); - SeriesOrderManager.AddParts(GetExports()); - ImageProcessor.AddParts(GetExports()); LiveTvManager.AddParts(GetExports(), GetExports(), GetExports());