add additional metadata config tab
This commit is contained in:
parent
b3b72e1259
commit
14a8b41503
|
@ -142,12 +142,6 @@ namespace MediaBrowser.Model.Configuration
|
||||||
/// <value><c>true</c> if [show log window]; otherwise, <c>false</c>.</value>
|
/// <value><c>true</c> if [show log window]; otherwise, <c>false</c>.</value>
|
||||||
public bool ShowLogWindow { get; set; }
|
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>
|
/// <summary>
|
||||||
/// Gets or sets the recent item days.
|
/// Gets or sets the recent item days.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -266,7 +260,6 @@ namespace MediaBrowser.Model.Configuration
|
||||||
RecentItemDays = 10;
|
RecentItemDays = 10;
|
||||||
|
|
||||||
EnableInternetProviders = true; //initial installs will need these
|
EnableInternetProviders = true; //initial installs will need these
|
||||||
InternetProviderExcludeTypes = new string[] { };
|
|
||||||
|
|
||||||
ManualLoginClients = new ManualLoginCategory[] { };
|
ManualLoginClients = new ManualLoginCategory[] { };
|
||||||
|
|
||||||
|
|
|
@ -39,8 +39,7 @@ namespace MediaBrowser.Providers.TV
|
||||||
|
|
||||||
private async Task RunInternal(IProgress<double> progress, CancellationToken cancellationToken)
|
private async Task RunInternal(IProgress<double> progress, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
if (!_config.Configuration.EnableInternetProviders ||
|
if (!_config.Configuration.EnableInternetProviders)
|
||||||
_config.Configuration.InternetProviderExcludeTypes.Contains(typeof(Series).Name, StringComparer.OrdinalIgnoreCase))
|
|
||||||
{
|
{
|
||||||
progress.Report(100);
|
progress.Report(100);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -70,8 +70,7 @@ namespace MediaBrowser.Providers.TV
|
||||||
/// <returns>Task.</returns>
|
/// <returns>Task.</returns>
|
||||||
public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
|
public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
if (!_config.Configuration.EnableInternetProviders ||
|
if (!_config.Configuration.EnableInternetProviders)
|
||||||
_config.Configuration.InternetProviderExcludeTypes.Contains(typeof(Series).Name, StringComparer.OrdinalIgnoreCase))
|
|
||||||
{
|
{
|
||||||
progress.Report(100);
|
progress.Report(100);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -105,7 +105,6 @@ namespace MediaBrowser.Server.Implementations.Providers
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
var enableInternetProviders = ConfigurationManager.Configuration.EnableInternetProviders;
|
var enableInternetProviders = ConfigurationManager.Configuration.EnableInternetProviders;
|
||||||
var excludeTypes = ConfigurationManager.Configuration.InternetProviderExcludeTypes;
|
|
||||||
|
|
||||||
var providerHistories = item.DateLastSaved == default(DateTime) ?
|
var providerHistories = item.DateLastSaved == default(DateTime) ?
|
||||||
new List<BaseProviderInfo>() :
|
new List<BaseProviderInfo>() :
|
||||||
|
@ -133,15 +132,6 @@ namespace MediaBrowser.Server.Implementations.Providers
|
||||||
continue;
|
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
|
// 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
|
// 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)
|
if (provider.RequiresInternet && item.DontFetchMeta && provider.EnforceDontFetchMetadata)
|
||||||
|
|
|
@ -508,6 +508,7 @@ namespace MediaBrowser.WebDashboard.Api
|
||||||
"mediaplayer.js",
|
"mediaplayer.js",
|
||||||
"metadataconfigurationpage.js",
|
"metadataconfigurationpage.js",
|
||||||
"metadataimagespage.js",
|
"metadataimagespage.js",
|
||||||
|
"metadataimageextraction.js",
|
||||||
"moviegenres.js",
|
"moviegenres.js",
|
||||||
"movies.js",
|
"movies.js",
|
||||||
"moviepeople.js",
|
"moviepeople.js",
|
||||||
|
|
|
@ -106,6 +106,9 @@
|
||||||
<Content Include="dashboard-ui\livetvtimers.html">
|
<Content Include="dashboard-ui\livetvtimers.html">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Include="dashboard-ui\metadataimageextraction.html">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<Content Include="dashboard-ui\musicalbumartists.html">
|
<Content Include="dashboard-ui\musicalbumartists.html">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
@ -379,6 +382,9 @@
|
||||||
<Content Include="dashboard-ui\scripts\livetvtimers.js">
|
<Content Include="dashboard-ui\scripts\livetvtimers.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Include="dashboard-ui\scripts\metadataimageextraction.js">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<Content Include="dashboard-ui\scripts\musicalbumartists.js">
|
<Content Include="dashboard-ui\scripts\musicalbumartists.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user