resolve mixed folder detection

This commit is contained in:
Luke Pulverenti
2014-12-04 00:24:41 -05:00
parent 56f6b0335c
commit 5eb44c42c5
18 changed files with 512 additions and 368 deletions

View File

@@ -1,9 +1,6 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Resolvers;
using MediaBrowser.Model.Entities;
using System;
using System.Linq;
namespace MediaBrowser.Server.Implementations.Library.Resolvers
{
@@ -22,22 +19,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
if (args.Parent != null)
{
// The movie resolver will handle this
if (args.IsDirectory)
{
return null;
}
var collectionType = args.GetCollectionType() ?? string.Empty;
var accepted = new[]
{
string.Empty,
CollectionType.HomeVideos
};
if (!accepted.Contains(collectionType, StringComparer.OrdinalIgnoreCase))
{
return null;
}
return null;
}
return base.Resolve(args);
@@ -52,6 +34,4 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
get { return ResolverPriority.Last; }
}
}
}