diff options
6 files changed, 9 insertions, 21 deletions
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index 45d5fa01c..14231f3ad 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -143,12 +143,6 @@ namespace MediaBrowser.Model.Configuration public bool ShowLogWindow { get; set; } /// <summary> - /// The list of types that will NOT be allowed to have internet providers run against them even if they are turned on. - /// </summary> - /// <value>The internet provider exclude types.</value> - public string[] InternetProviderExcludeTypes { get; set; } - - /// <summary> /// Gets or sets the recent item days. /// </summary> /// <value>The recent item days.</value> @@ -266,7 +260,6 @@ namespace MediaBrowser.Model.Configuration RecentItemDays = 10; EnableInternetProviders = true; //initial installs will need these - InternetProviderExcludeTypes = new string[] { }; ManualLoginClients = new ManualLoginCategory[] { }; diff --git a/MediaBrowser.Providers/TV/SeriesPostScanTask.cs b/MediaBrowser.Providers/TV/SeriesPostScanTask.cs index 56b06f490..b889b991e 100644 --- a/MediaBrowser.Providers/TV/SeriesPostScanTask.cs +++ b/MediaBrowser.Providers/TV/SeriesPostScanTask.cs @@ -39,8 +39,7 @@ namespace MediaBrowser.Providers.TV private async Task RunInternal(IProgress<double> progress, CancellationToken cancellationToken) { - if (!_config.Configuration.EnableInternetProviders || - _config.Configuration.InternetProviderExcludeTypes.Contains(typeof(Series).Name, StringComparer.OrdinalIgnoreCase)) + if (!_config.Configuration.EnableInternetProviders) { progress.Report(100); return; diff --git a/MediaBrowser.Providers/TV/TvdbPrescanTask.cs b/MediaBrowser.Providers/TV/TvdbPrescanTask.cs index df5c39b65..1a7f8e10e 100644 --- a/MediaBrowser.Providers/TV/TvdbPrescanTask.cs +++ b/MediaBrowser.Providers/TV/TvdbPrescanTask.cs @@ -70,8 +70,7 @@ namespace MediaBrowser.Providers.TV /// <returns>Task.</returns> public async Task Run(IProgress<double> progress, CancellationToken cancellationToken) { - if (!_config.Configuration.EnableInternetProviders || - _config.Configuration.InternetProviderExcludeTypes.Contains(typeof(Series).Name, StringComparer.OrdinalIgnoreCase)) + if (!_config.Configuration.EnableInternetProviders) { progress.Report(100); return; diff --git a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs index cccabe2b8..18f55b477 100644 --- a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs +++ b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs @@ -105,7 +105,6 @@ namespace MediaBrowser.Server.Implementations.Providers cancellationToken.ThrowIfCancellationRequested(); var enableInternetProviders = ConfigurationManager.Configuration.EnableInternetProviders; - var excludeTypes = ConfigurationManager.Configuration.InternetProviderExcludeTypes; var providerHistories = item.DateLastSaved == default(DateTime) ? new List<BaseProviderInfo>() : @@ -133,15 +132,6 @@ namespace MediaBrowser.Server.Implementations.Providers continue; } - // Skip if internet provider and this type is not allowed - if (provider.RequiresInternet && - enableInternetProviders && - excludeTypes.Length > 0 && - excludeTypes.Contains(item.GetType().Name, StringComparer.OrdinalIgnoreCase)) - { - continue; - } - // Put this check below the await because the needs refresh of the next tier of providers may depend on the previous ones running // This is the case for the fan art provider which depends on the movie and tv providers having run before them if (provider.RequiresInternet && item.DontFetchMeta && provider.EnforceDontFetchMetadata) diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 805aec6e7..b5584b166 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -508,6 +508,7 @@ namespace MediaBrowser.WebDashboard.Api "mediaplayer.js", "metadataconfigurationpage.js", "metadataimagespage.js", + "metadataimageextraction.js", "moviegenres.js", "movies.js", "moviepeople.js", diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index e04f59f94..bb635d1ae 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -106,6 +106,9 @@ <Content Include="dashboard-ui\livetvtimers.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\metadataimageextraction.html">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\musicalbumartists.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -379,6 +382,9 @@ <Content Include="dashboard-ui\scripts\livetvtimers.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\scripts\metadataimageextraction.js">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\scripts\musicalbumartists.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
|