aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Library/Resolvers/Movies
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-12-15 00:16:23 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-12-15 00:16:23 -0500
commite92e0365747c04f081be0efbb9afb78dc96aef9b (patch)
tree51a7d2c0647d491737ca0bf9b9b8b3a11e9ee313 /MediaBrowser.Server.Implementations/Library/Resolvers/Movies
parented31b883f4bf1884ee974171501e61f83c768379 (diff)
add new sync methods
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library/Resolvers/Movies')
-rw-r--r--MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs22
1 files changed, 21 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index 9f714cfc5c..276b99d3a2 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -456,7 +456,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
// Don't do any resolving within a series structure
if (string.IsNullOrEmpty(collectionType))
{
- if (parent is Season || parent is Series)
+ if (HasParent<Series>(parent) || HasParent<Season>(parent))
{
return true;
}
@@ -480,5 +480,25 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
return !validCollectionTypes.Contains(collectionType ?? string.Empty, StringComparer.OrdinalIgnoreCase);
}
+
+ private bool HasParent<T>(Folder parent)
+ where T : Folder
+ {
+ if (parent != null)
+ {
+ var item = parent as T;
+
+ // Just in case the user decided to nest episodes.
+ // Not officially supported but in some cases we can handle it.
+ if (item == null)
+ {
+ item = parent.Parents.OfType<T>().FirstOrDefault();
+ }
+
+ return item != null;
+
+ }
+ return false;
+ }
}
}