From 06c603428bceccdb793eb34cc0340e25552d6c1d Mon Sep 17 00:00:00 2001 From: Shadowghost Date: Tue, 19 Nov 2024 15:43:33 -0500 Subject: [PATCH] Backport pull request #13059 from jellyfin/release-10.10.z Exclude file system based library playlists from migration Original-merge: 23de7e517e3b4acdefd92e731140d0fa358d3611 Merged-by: crobibero Backported-by: Joshua M. Boniface --- .../Library/Resolvers/PlaylistResolver.cs | 2 +- .../Migrations/Routines/RemoveDuplicatePlaylistChildren.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs index a03c1214d6..14798dda65 100644 --- a/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs +++ b/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs @@ -28,7 +28,7 @@ namespace Emby.Server.Implementations.Library.Resolvers { if (args.IsDirectory) { - // It's a boxset if the path is a directory with [playlist] in its name + // It's a playlist if the path is a directory with [playlist] in its name var filename = Path.GetFileName(Path.TrimEndingDirectorySeparator(args.Path)); if (string.IsNullOrEmpty(filename)) { diff --git a/Jellyfin.Server/Migrations/Routines/RemoveDuplicatePlaylistChildren.cs b/Jellyfin.Server/Migrations/Routines/RemoveDuplicatePlaylistChildren.cs index 99047b2a2a..f84bccc258 100644 --- a/Jellyfin.Server/Migrations/Routines/RemoveDuplicatePlaylistChildren.cs +++ b/Jellyfin.Server/Migrations/Routines/RemoveDuplicatePlaylistChildren.cs @@ -46,6 +46,7 @@ internal class RemoveDuplicatePlaylistChildren : IMigrationRoutine IncludeItemTypes = [BaseItemKind.Playlist] }) .Cast() + .Where(p => !p.OpenAccess || !p.OwnerUserId.Equals(Guid.Empty)) .ToArray(); if (playlists.Length > 0)