diff options
| author | ebr11 Eric Reed spam <ebr11 Eric Reed spam@reedsplace.com> | 2012-09-19 10:22:53 -0400 |
|---|---|---|
| committer | ebr11 Eric Reed spam <ebr11 Eric Reed spam@reedsplace.com> | 2012-09-19 10:22:53 -0400 |
| commit | 6edc836ce591c466743a1d94a75cb3537c4835bd (patch) | |
| tree | cc09e1b8beacddf200f49ffcc4b1cb7a9657afe8 /MediaBrowser.Controller/Resolvers | |
| parent | 442081f4e20a2a0bb5a17023817754ef6045b5ee (diff) | |
I lied - re-worked metadata folder handling again. Should now really only hit once and is available for other item types
Diffstat (limited to 'MediaBrowser.Controller/Resolvers')
| -rw-r--r-- | MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Resolvers/FolderResolver.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Resolvers/TV/SeasonResolver.cs | 5 |
3 files changed, 3 insertions, 10 deletions
diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs index ebb1f4103c..b821f88018 100644 --- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs +++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs @@ -18,6 +18,7 @@ namespace MediaBrowser.Controller.Resolvers public static List<string> IgnoreFolders = new List<string>()
{
"trailers",
+ "metadata",
"bdmv",
"certificate",
"backup",
@@ -62,11 +63,6 @@ namespace MediaBrowser.Controller.Resolvers // Ignore any folders containing a file called .ignore
resolve = false;
}
- else if (args.IsMetadataFolder)
- {
- // I think this is redundant, but...
- resolve = false;
- }
return resolve;
}
diff --git a/MediaBrowser.Controller/Resolvers/FolderResolver.cs b/MediaBrowser.Controller/Resolvers/FolderResolver.cs index b34d8163b6..408e513d44 100644 --- a/MediaBrowser.Controller/Resolvers/FolderResolver.cs +++ b/MediaBrowser.Controller/Resolvers/FolderResolver.cs @@ -14,7 +14,7 @@ namespace MediaBrowser.Controller.Resolvers protected override Folder Resolve(ItemResolveEventArgs args)
{
- if (args.IsDirectory && !args.IsMetadataFolder)
+ if (args.IsDirectory)
{
return new Folder() { PhysicalLocations = args.PhysicalLocations };
}
diff --git a/MediaBrowser.Controller/Resolvers/TV/SeasonResolver.cs b/MediaBrowser.Controller/Resolvers/TV/SeasonResolver.cs index d01e1ce31f..0ad0782e07 100644 --- a/MediaBrowser.Controller/Resolvers/TV/SeasonResolver.cs +++ b/MediaBrowser.Controller/Resolvers/TV/SeasonResolver.cs @@ -10,15 +10,12 @@ namespace MediaBrowser.Controller.Resolvers.TV {
protected override Season Resolve(ItemResolveEventArgs args)
{
- if (args.Parent is Series && args.IsDirectory && !args.IsMetadataFolder)
+ if (args.Parent is Series && args.IsDirectory)
{
var season = new Season { };
season.IndexNumber = TVUtils.GetSeasonNumberFromPath(args.Path);
- // Gather these now so that the episode provider classes can utilize them instead of having to make their own file system calls
- season.MetadataFiles = args.ContainsFolder("metadata") ? Directory.GetFiles(Path.Combine(args.Path, "metadata"), "*", SearchOption.TopDirectoryOnly) : new string[] { };
-
return season;
}
|