Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
gnattu 2024-06-01 18:41:12 -04:00 committed by Joshua M. Boniface
parent c1032967c2
commit 0d0a2b4d58
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
View File

@ -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))
{ {