Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-06-26 17:08:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix playlist parsing for relative paths

Browse source
This commit is contained in:
Shadowghost 2024-05-04 12:35:11 +02:00
parent f9f263a481
commit f4acabc1e5
1 changed files with 49 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
View file

@ -50,106 +50,120 @@ namespace MediaBrowser.Providers.Playlists
return Task.FromResult(ItemUpdateType.None); return Task.FromResult(ItemUpdateType.None);
} }
using (var stream = File.OpenRead(path)) var items = GetItems(path, extension).ToArray();
{
var items = GetItems(stream, extension).ToArray();
item.LinkedChildren = items; item.LinkedChildren = items;
}
return Task.FromResult(ItemUpdateType.None); return Task.FromResult(ItemUpdateType.None);
} }
private IEnumerable<LinkedChild> GetItems(Stream stream, string extension) private IEnumerable<LinkedChild> GetItems(string path, string extension)
{ {
if (string.Equals(".wpl", extension, StringComparison.OrdinalIgnoreCase)) using (var stream = File.OpenRead(path))
{ {
return GetWplItems(stream); if (string.Equals(".wpl", extension, StringComparison.OrdinalIgnoreCase))
} {
return GetWplItems(stream, path);
}
if (string.Equals(".zpl", extension, StringComparison.OrdinalIgnoreCase)) if (string.Equals(".zpl", extension, StringComparison.OrdinalIgnoreCase))
{ {
return GetZplItems(stream); return GetZplItems(stream, path);
} }
if (string.Equals(".m3u", extension, StringComparison.OrdinalIgnoreCase)) if (string.Equals(".m3u", extension, StringComparison.OrdinalIgnoreCase))
{ {
return GetM3uItems(stream); return GetM3uItems(stream, path);
} }
if (string.Equals(".m3u8", extension, StringComparison.OrdinalIgnoreCase)) if (string.Equals(".m3u8", extension, StringComparison.OrdinalIgnoreCase))
{ {
return GetM3u8Items(stream); return GetM3u8Items(stream, path);
} }
if (string.Equals(".pls", extension, StringComparison.OrdinalIgnoreCase)) if (string.Equals(".pls", extension, StringComparison.OrdinalIgnoreCase))
{ {
return GetPlsItems(stream); return GetPlsItems(stream, path);
}
} }
return Enumerable.Empty<LinkedChild>(); return Enumerable.Empty<LinkedChild>();
} }
private IEnumerable<LinkedChild> GetPlsItems(Stream stream) private IEnumerable<LinkedChild> GetPlsItems(Stream stream, string path)
{ {
var content = new PlsContent(); var content = new PlsContent();
var playlist = content.GetFromStream(stream); var playlist = content.GetFromStream(stream);
return playlist.PlaylistEntries.Select(i => new LinkedChild return playlist.PlaylistEntries.Select(i => new LinkedChild
{ {
Path = i.Path, Path = GetPlaylistItemPath(i.Path, path),
Type = LinkedChildType.Manual Type = LinkedChildType.Manual
}); });
} }
private IEnumerable<LinkedChild> GetM3u8Items(Stream stream) private IEnumerable<LinkedChild> GetM3u8Items(Stream stream, string path)
{ {
var content = new M3uContent(); var content = new M3uContent();
var playlist = content.GetFromStream(stream); var playlist = content.GetFromStream(stream);
return playlist.PlaylistEntries.Select(i => new LinkedChild return playlist.PlaylistEntries.Select(i => new LinkedChild
{ {
Path = i.Path, Path = GetPlaylistItemPath(i.Path, path),
Type = LinkedChildType.Manual Type = LinkedChildType.Manual
}); });
} }
private IEnumerable<LinkedChild> GetM3uItems(Stream stream) private IEnumerable<LinkedChild> GetM3uItems(Stream stream, string path)
{ {
var content = new M3uContent(); var content = new M3uContent();
var playlist = content.GetFromStream(stream); var playlist = content.GetFromStream(stream);
return playlist.PlaylistEntries.Select(i => new LinkedChild return playlist.PlaylistEntries.Select(i => new LinkedChild
{ {
Path = i.Path, Path = GetPlaylistItemPath(i.Path, path),
Type = LinkedChildType.Manual Type = LinkedChildType.Manual
}); });
} }
private IEnumerable<LinkedChild> GetZplItems(Stream stream) private IEnumerable<LinkedChild> GetZplItems(Stream stream, string path)
{ {
var content = new ZplContent(); var content = new ZplContent();
var playlist = content.GetFromStream(stream); var playlist = content.GetFromStream(stream);
return playlist.PlaylistEntries.Select(i => new LinkedChild return playlist.PlaylistEntries.Select(i => new LinkedChild
{ {
Path = i.Path, Path = GetPlaylistItemPath(i.Path, path),
Type = LinkedChildType.Manual Type = LinkedChildType.Manual
}); });
} }
private IEnumerable<LinkedChild> GetWplItems(Stream stream) private IEnumerable<LinkedChild> GetWplItems(Stream stream, string path)
{ {
var content = new WplContent(); var content = new WplContent();
var playlist = content.GetFromStream(stream); var playlist = content.GetFromStream(stream);
return playlist.PlaylistEntries.Select(i => new LinkedChild return playlist.PlaylistEntries.Select(i => new LinkedChild
{ {
Path = i.Path, Path = GetPlaylistItemPath(i.Path, path),
Type = LinkedChildType.Manual Type = LinkedChildType.Manual
}); });
} }
private string GetPlaylistItemPath(string itemPath, string containingPlaylistFolder)
{
if (!File.Exists(itemPath))
{
var path = Path.Combine(Path.GetDirectoryName(containingPlaylistFolder), itemPath);
if (File.Exists(path))
{
return path;
}
}
return itemPath;
}
public bool HasChanged(BaseItem item, IDirectoryService directoryService) public bool HasChanged(BaseItem item, IDirectoryService directoryService)
{ {
var path = item.Path; var path = item.Path;
@ -159,7 +173,7 @@ namespace MediaBrowser.Providers.Playlists
var file = directoryService.GetFile(path); var file = directoryService.GetFile(path);
if (file is not null && file.LastWriteTimeUtc != item.DateModified) if (file is not null && file.LastWriteTimeUtc != item.DateModified)
{ {
_logger.LogDebug("Refreshing {0} due to date modified timestamp change.", path); _logger.LogDebug("Refreshing {Path} due to date modified timestamp change.", path);
return true; return true;
} }
} }