fixes #268 - (Multicd) Albums with discnumbers in subfolders on filesystem = Multiple album objects

2 files changed, 38 insertions, 5 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs
new file mode 100644
index 000000000..9a1065db5
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs
@@ -0,0 +1,33 @@
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Resolvers;
+
+namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
+{
+    /// <summary>
+    /// Class MusicAlbumDiscResolver
+    /// </summary>
+    public class MusicAlbumDiscResolver : ItemResolver<MusicAlbumDisc>
+    {
+        /// <summary>
+        /// Gets the priority.
+        /// </summary>
+        /// <value>The priority.</value>
+        public override ResolverPriority Priority
+        {
+            get { return ResolverPriority.Third; } // we need to be ahead of the generic folder resolver but behind the movie one
+        }
+
+        /// <summary>
+        /// Resolves the specified args.
+        /// </summary>
+        /// <param name="args">The args.</param>
+        /// <returns>MusicAlbum.</returns>
+        protected override MusicAlbumDisc Resolve(ItemResolveArgs args)
+        {
+            if (!args.IsDirectory) return null;
+
+            return args.Parent is MusicAlbum ? new MusicAlbumDisc() : null;
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index 411e431aa..98e99baa2 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -1,10 +1,9 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.IO;
+using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Resolvers;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 
 namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
 {
@@ -34,6 +33,7 @@ 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;
 
             return IsMusicAlbum(args) ? new MusicAlbum() : null;
         }