mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-06-19 22:20:33 +01:00
Moved TV into the main project and added Series properties to DTOBaseItem
This commit is contained in:
parent
2884df296c
commit
8b39ed2f63
@@ -8,6 +8,7 @@ using MediaBrowser.Controller.Weather;
|
||||
using MediaBrowser.Model.Authentication;
|
||||
using MediaBrowser.Model.Configuration;
|
||||
using MediaBrowser.Model.Entities;
|
||||
using MediaBrowser.Model.Entities.TV;
|
||||
using MediaBrowser.Model.Progress;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
@@ -111,12 +112,6 @@ namespace MediaBrowser.Controller
|
||||
|
||||
// Sort the providers by priority
|
||||
MetadataProviders = MetadataProvidersEnumerable.OrderBy(e => e.Priority).ToArray();
|
||||
|
||||
// Initialize the metadata providers
|
||||
Parallel.ForEach(MetadataProviders, provider =>
|
||||
{
|
||||
provider.Init();
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -126,17 +121,26 @@ namespace MediaBrowser.Controller
|
||||
/// </summary>
|
||||
void ItemController_PreBeginResolvePath(object sender, PreBeginResolveEventArgs e)
|
||||
{
|
||||
// Ignore hidden files and folders
|
||||
if (e.IsHidden || e.IsSystemFile)
|
||||
{
|
||||
// Ignore hidden files and folders
|
||||
e.Cancel = true;
|
||||
}
|
||||
|
||||
// Ignore any folders named "trailers"
|
||||
else if (Path.GetFileName(e.Path).Equals("trailers", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
// Ignore any folders named "trailers"
|
||||
e.Cancel = true;
|
||||
}
|
||||
|
||||
// Don't try and resolve files within the season metadata folder
|
||||
else if (Path.GetFileName(e.Path).Equals("metadata", StringComparison.OrdinalIgnoreCase) && e.IsDirectory)
|
||||
{
|
||||
if (e.Parent is Season || e.Parent is Series)
|
||||
{
|
||||
e.Cancel = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -383,26 +387,5 @@ namespace MediaBrowser.Controller
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected override void DisposeComposableParts()
|
||||
{
|
||||
base.DisposeComposableParts();
|
||||
|
||||
DisposeProviders();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Disposes all providers
|
||||
/// </summary>
|
||||
private void DisposeProviders()
|
||||
{
|
||||
if (MetadataProviders != null)
|
||||
{
|
||||
foreach (var provider in MetadataProviders)
|
||||
{
|
||||
provider.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user