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

Fix trickplay directory path construction (#14036)

Browse Source
This commit is contained in:
theguymadmax 2025-05-02 09:01:23 -04:00 committed by GitHub
parent e5c40ea98d
commit 57716833b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Emby.Server.Implementations/Library/PathManager.cs
View File

@ -29,14 +29,14 @@ public class PathManager : IPathManager
_appPaths = appPaths;
}
private string SubtitleCachePath => Path.Join(_appPaths.DataPath, "subtitles");
private string SubtitleCachePath => Path.Combine(_appPaths.DataPath, "subtitles");
private string AttachmentCachePath => Path.Join(_appPaths.DataPath, "attachments");
private string AttachmentCachePath => Path.Combine(_appPaths.DataPath, "attachments");
/// <inheritdoc />
public string GetAttachmentPath(string mediaSourceId, string fileName)
{
return Path.Join(GetAttachmentFolderPath(mediaSourceId), fileName);
return Path.Combine(GetAttachmentFolderPath(mediaSourceId), fileName);
}
/// <inheritdoc />
@ -58,7 +58,7 @@ public class PathManager : IPathManager
/// <inheritdoc />
public string GetSubtitlePath(string mediaSourceId, int streamIndex, string extension)
{
return Path.Join(GetSubtitleFolderPath(mediaSourceId), streamIndex.ToString(CultureInfo.InvariantCulture) + extension);
return Path.Combine(GetSubtitleFolderPath(mediaSourceId), streamIndex.ToString(CultureInfo.InvariantCulture) + extension);
}
/// <inheritdoc />
@ -67,14 +67,14 @@ public class PathManager : IPathManager
var id = item.Id.ToString("D", CultureInfo.InvariantCulture).AsSpan();
return saveWithMedia
? Path.Join(item.ContainingFolderPath, Path.ChangeExtension(item.Path, ".trickplay"))
? Path.Combine(item.ContainingFolderPath, Path.ChangeExtension(Path.GetFileName(item.Path), ".trickplay"))
: Path.Join(_config.ApplicationPaths.TrickplayPath, id[..2], id);
}
/// <inheritdoc/>
public string GetChapterImageFolderPath(BaseItem item)
{
return Path.Join(item.GetInternalMetadataPath(), "chapters");
return Path.Combine(item.GetInternalMetadataPath(), "chapters");
}
/// <inheritdoc/>
@ -82,6 +82,6 @@ public class PathManager : IPathManager
{
var filename = item.DateModified.Ticks.ToString(CultureInfo.InvariantCulture) + "_" + chapterPositionTicks.ToString(CultureInfo.InvariantCulture) + ".jpg";
return Path.Join(GetChapterImageFolderPath(item), filename);
return Path.Combine(GetChapterImageFolderPath(item), filename);
}
}