michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

add additional metadata config tab

Browse Source
This commit is contained in:
Luke Pulverenti 2013-12-17 23:39:44 -05:00
parent b3b72e1259
commit 14a8b41503
6 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -142,12 +142,6 @@ namespace MediaBrowser.Model.Configuration
/// <value><c>true</c> if [show log window]; otherwise, <c>false</c>.</value>
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>
@ -266,7 +260,6 @@ namespace MediaBrowser.Model.Configuration
RecentItemDays = 10;
EnableInternetProviders = true; //initial installs will need these
InternetProviderExcludeTypes = new string[] { };
ManualLoginClients = new ManualLoginCategory[] { };

3
MediaBrowser.Providers/TV/SeriesPostScanTask.cs
View File

@ -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;

3
MediaBrowser.Providers/TV/TvdbPrescanTask.cs
View File

@ -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;

10
MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
View File

@ -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)

1
MediaBrowser.WebDashboard/Api/DashboardService.cs
View File

@ -508,6 +508,7 @@ namespace MediaBrowser.WebDashboard.Api
"mediaplayer.js",
"metadataconfigurationpage.js",
"metadataimagespage.js",
"metadataimageextraction.js",
"moviegenres.js",
"movies.js",
"moviepeople.js",

6
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -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>