alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 17:44:43 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix access to playlists not created by a user (#9746)

Browse Source
This commit is contained in:
Shadowghost
2023-05-12 15:11:59 +02:00
committed by GitHub
parent fdda721394
commit a8cdf4434b
5 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
View File

@@ -30,7 +30,7 @@ namespace Emby.Server.Implementations.Library.Resolvers
{
if (args.IsDirectory)
{
// It's a boxset if the path is a directory with [playlist] in it's the name
// It's a boxset if the path is a directory with [playlist] in its name
var filename = Path.GetFileName(Path.TrimEndingDirectorySeparator(args.Path));
if (string.IsNullOrEmpty(filename))
{
@@ -42,7 +42,8 @@ namespace Emby.Server.Implementations.Library.Resolvers
return new Playlist
{
Path = args.Path,
Name = filename.Replace("[playlist]", string.Empty, StringComparison.OrdinalIgnoreCase).Trim()
Name = filename.Replace("[playlist]", string.Empty, StringComparison.OrdinalIgnoreCase).Trim(),
OpenAccess = true
};
}
@@ -53,7 +54,8 @@ namespace Emby.Server.Implementations.Library.Resolvers
return new Playlist
{
Path = args.Path,
Name = filename
Name = filename,
OpenAccess = true
};
}
}
@@ -70,7 +72,8 @@ namespace Emby.Server.Implementations.Library.Resolvers
Path = args.Path,
Name = Path.GetFileNameWithoutExtension(args.Path),
IsInMixedFolder = true,
PlaylistMediaType = MediaType.Audio
PlaylistMediaType = MediaType.Audio,
OpenAccess = true
};
}
}

2
Emby.Server.Implementations/Playlists/PlaylistManager.cs
View File

@@ -549,7 +549,7 @@ namespace Emby.Server.Implementations.Playlists
SavePlaylistFile(playlist);
}
}
else
else if (!playlist.OpenAccess)
{
// Remove playlist if not shared
_libraryManager.DeleteItem(