diff options
| author | Shadowghost <Shadowghost@users.noreply.github.com> | 2024-11-19 15:43:33 -0500 |
|---|---|---|
| committer | Joshua M. Boniface <joshua@boniface.me> | 2024-11-19 15:43:33 -0500 |
| commit | 06c603428bceccdb793eb34cc0340e25552d6c1d (patch) | |
| tree | c516464bea4f247e0be92e36abef507f71e0ffbe | |
| parent | 924c80a209be808366498bef46aaf1c52d52509b (diff) | |
Backport pull request #13059 from jellyfin/release-10.10.z
Exclude file system based library playlists from migration
Original-merge: 23de7e517e3b4acdefd92e731140d0fa358d3611
Merged-by: crobibero <cody@robibe.ro>
Backported-by: Joshua M. Boniface <joshua@boniface.me>
| -rw-r--r-- | Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs | 2 | ||||
| -rw-r--r-- | Jellyfin.Server/Migrations/Routines/RemoveDuplicatePlaylistChildren.cs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs index a03c1214d..14798dda6 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 99047b2a2..f84bccc25 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<Playlist>() + .Where(p => !p.OpenAccess || !p.OwnerUserId.Equals(Guid.Empty)) .ToArray(); if (playlists.Length > 0) |