From e92e0365747c04f081be0efbb9afb78dc96aef9b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 15 Dec 2014 00:16:23 -0500 Subject: add new sync methods --- .../Library/Resolvers/Audio/MusicAlbumResolver.cs | 7 +++---- .../Library/Resolvers/Audio/MusicArtistResolver.cs | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Library/Resolvers/Audio') diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs index 7f844ca0e..f32ed2b20 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs @@ -1,5 +1,4 @@ using MediaBrowser.Common.IO; -using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Entities.TV; @@ -9,10 +8,10 @@ using MediaBrowser.Controller.Resolvers; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; using MediaBrowser.Naming.Audio; +using MediaBrowser.Naming.Common; using System; using System.Collections.Generic; using System.IO; -using MediaBrowser.Naming.Common; namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio { @@ -53,10 +52,10 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio //Avoid mis-identifying top folders if (args.Parent == null) return null; if (args.Parent.IsRoot) return null; - if (args.Parent is MusicAlbum) return null; + if (args.HasParent()) return null; // Optimization - if (args.Parent is BoxSet || args.Parent is Series || args.Parent is Season) + if (args.HasParent() || args.HasParent() || args.HasParent()) { return null; } diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs index 53063b35e..71b6c0843 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs @@ -51,13 +51,13 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio if (args.Parent.IsRoot) return null; // Don't allow nested artists - if (args.Parent is MusicArtist) + if (args.HasParent() || args.HasParent()) { return null; } // Optimization - if (args.Parent is BoxSet || args.Parent is Series || args.Parent is Season) + if (args.HasParent() || args.HasParent() || args.HasParent()) { return null; } -- cgit v1.2.3