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

Apply review suggestions

Browse Source
This commit is contained in:
Shadowghost 2024-05-16 17:04:42 +02:00
parent 56a158e5c9
commit 2ca8ce6f60
1 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
View File

@ -8,6 +8,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Jellyfin.Data.Enums;
using Jellyfin.Extensions; using Jellyfin.Extensions;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
@ -25,10 +26,13 @@ namespace MediaBrowser.Providers.Playlists
IHasItemChangeMonitor IHasItemChangeMonitor
{ {
private readonly ILogger<PlaylistItemsProvider> _logger; private readonly ILogger<PlaylistItemsProvider> _logger;
private readonly ILibraryManager _libraryManager;
private readonly CollectionType[] _ignoredCollections = [CollectionType.livetv, CollectionType.boxsets, CollectionType.playlists];
public PlaylistItemsProvider(ILogger<PlaylistItemsProvider> logger) public PlaylistItemsProvider(ILogger<PlaylistItemsProvider> logger, ILibraryManager libraryManager)
{ {
_logger = logger; _logger = logger;
_libraryManager = libraryManager;
} }
public string Name => "Playlist Reader"; public string Name => "Playlist Reader";
@ -59,80 +63,87 @@ namespace MediaBrowser.Providers.Playlists
private IEnumerable<LinkedChild> GetItems(string path, string extension) private IEnumerable<LinkedChild> GetItems(string path, string extension)
{ {
var libraryRoots = _libraryManager.GetUserRootFolder().Children
.OfType<CollectionFolder>()
.Where(f => f.CollectionType.HasValue && !_ignoredCollections.Contains(f.CollectionType.Value))
.SelectMany(f => f.PhysicalLocations)
.Distinct(StringComparer.OrdinalIgnoreCase)
.ToList();
using (var stream = File.OpenRead(path)) using (var stream = File.OpenRead(path))
{ {
if (string.Equals(".wpl", extension, StringComparison.OrdinalIgnoreCase)) if (string.Equals(".wpl", extension, StringComparison.OrdinalIgnoreCase))
{ {
return GetWplItems(stream, path); return GetWplItems(stream, path, libraryRoots);
} }
if (string.Equals(".zpl", extension, StringComparison.OrdinalIgnoreCase)) if (string.Equals(".zpl", extension, StringComparison.OrdinalIgnoreCase))
{ {
return GetZplItems(stream, path); return GetZplItems(stream, path, libraryRoots);
} }
if (string.Equals(".m3u", extension, StringComparison.OrdinalIgnoreCase)) if (string.Equals(".m3u", extension, StringComparison.OrdinalIgnoreCase))
{ {
return GetM3uItems(stream, path); return GetM3uItems(stream, path, libraryRoots);
} }
if (string.Equals(".m3u8", extension, StringComparison.OrdinalIgnoreCase)) if (string.Equals(".m3u8", extension, StringComparison.OrdinalIgnoreCase))
{ {
return GetM3uItems(stream, path); return GetM3uItems(stream, path, libraryRoots);
} }
if (string.Equals(".pls", extension, StringComparison.OrdinalIgnoreCase)) if (string.Equals(".pls", extension, StringComparison.OrdinalIgnoreCase))
{ {
return GetPlsItems(stream, path); return GetPlsItems(stream, path, libraryRoots);
} }
} }
return Enumerable.Empty<LinkedChild>(); return Enumerable.Empty<LinkedChild>();
} }
private IEnumerable<LinkedChild> GetPlsItems(Stream stream, string path) private IEnumerable<LinkedChild> GetPlsItems(Stream stream, string playlistPath, List<string> libraryRoots)
{ {
var content = new PlsContent(); var content = new PlsContent();
var playlist = content.GetFromStream(stream); var playlist = content.GetFromStream(stream);
return playlist.PlaylistEntries return playlist.PlaylistEntries
.Select(i => GetLinkedChild(i.Path, path)) .Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
.Where(i => i is not null); .Where(i => i is not null);
} }
private IEnumerable<LinkedChild> GetM3uItems(Stream stream, string path) private IEnumerable<LinkedChild> GetM3uItems(Stream stream, string playlistPath, List<string> libraryRoots)
{ {
var content = new M3uContent(); var content = new M3uContent();
var playlist = content.GetFromStream(stream); var playlist = content.GetFromStream(stream);
return playlist.PlaylistEntries return playlist.PlaylistEntries
.Select(i => GetLinkedChild(i.Path, path)) .Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
.Where(i => i is not null); .Where(i => i is not null);
} }
private IEnumerable<LinkedChild> GetZplItems(Stream stream, string path) private IEnumerable<LinkedChild> GetZplItems(Stream stream, string playlistPath, List<string> libraryRoots)
{ {
var content = new ZplContent(); var content = new ZplContent();
var playlist = content.GetFromStream(stream); var playlist = content.GetFromStream(stream);
return playlist.PlaylistEntries return playlist.PlaylistEntries
.Select(i => GetLinkedChild(i.Path, path)) .Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
.Where(i => i is not null); .Where(i => i is not null);
} }
private IEnumerable<LinkedChild> GetWplItems(Stream stream, string path) private IEnumerable<LinkedChild> GetWplItems(Stream stream, string playlistPath, List<string> libraryRoots)
{ {
var content = new WplContent(); var content = new WplContent();
var playlist = content.GetFromStream(stream); var playlist = content.GetFromStream(stream);
return playlist.PlaylistEntries return playlist.PlaylistEntries
.Select(i => GetLinkedChild(i.Path, path)) .Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
.Where(i => i is not null); .Where(i => i is not null);
} }
private LinkedChild GetLinkedChild(string itemPath, string playlistPath) private LinkedChild GetLinkedChild(string itemPath, string playlistPath, List<string> libraryRoots)
{ {
if (TryGetPlaylistItemPath(itemPath, playlistPath, out var parsedPath)) if (TryGetPlaylistItemPath(itemPath, playlistPath, libraryRoots, out var parsedPath))
{ {
return new LinkedChild return new LinkedChild
{ {
@ -144,23 +155,20 @@ namespace MediaBrowser.Providers.Playlists
return null; return null;
} }
private bool TryGetPlaylistItemPath(string itemPath, string playlistPath, out string path) private bool TryGetPlaylistItemPath(string itemPath, string playlistPath, List<string> libraryPaths, out string path)
{ {
path = null; path = null;
var baseFolder = Path.GetDirectoryName(playlistPath); var baseFolder = Path.GetDirectoryName(playlistPath);
if (itemPath.StartsWith(baseFolder, StringComparison.OrdinalIgnoreCase) && File.Exists(itemPath))
{
path = itemPath;
return true;
}
var basePath = Path.Combine(baseFolder, itemPath); var basePath = Path.Combine(baseFolder, itemPath);
var fullPath = Path.GetFullPath(basePath); var fullPath = Path.GetFullPath(basePath);
if (fullPath.StartsWith(baseFolder, StringComparison.OrdinalIgnoreCase) && File.Exists(fullPath))
foreach (var libraryPath in libraryPaths)
{ {
path = fullPath; if (fullPath.StartsWith(libraryPath, StringComparison.OrdinalIgnoreCase) && File.Exists(fullPath))
return true; {
path = fullPath;
return true;
}
} }
return false; return false;