2
0
Эх сурвалжийг харах

Backport pull request #11886 from jellyfin/release-10.9.z

Fix multi-part album folder being detected as artist folder

Original-merge: d602b6dbc5762d649a6d0532456e8289e6ff55cd

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
gnattu 1 жил өмнө
parent
commit
0d0a2b4d58

+ 8 - 0
Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs

@@ -3,6 +3,7 @@
 using System;
 using System;
 using System.Linq;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
+using Emby.Naming.Audio;
 using Emby.Naming.Common;
 using Emby.Naming.Common;
 using Jellyfin.Data.Enums;
 using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Audio;
@@ -85,6 +86,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
             }
             }
 
 
             var albumResolver = new MusicAlbumResolver(_logger, _namingOptions, _directoryService);
             var albumResolver = new MusicAlbumResolver(_logger, _namingOptions, _directoryService);
+            var albumParser = new AlbumParser(_namingOptions);
 
 
             var directories = args.FileSystemChildren.Where(i => i.IsDirectory);
             var directories = args.FileSystemChildren.Where(i => i.IsDirectory);
 
 
@@ -100,6 +102,12 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
                     }
                     }
                 }
                 }
 
 
+                // If the folder is a multi-disc folder, then it is not an artist folder
+                if (albumParser.IsMultiPart(fileSystemInfo.FullName))
+                {
+                    return;
+                }
+
                 // If we contain a music album assume we are an artist folder
                 // If we contain a music album assume we are an artist folder
                 if (albumResolver.IsMusicAlbum(fileSystemInfo.FullName, _directoryService))
                 if (albumResolver.IsMusicAlbum(fileSystemInfo.FullName, _directoryService))
                 {
                 {