mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-01-16 08:08:16 +00:00
Fix trickplay directory path construction (#14036)
Some checks are pending
CodeQL / Analyze (csharp) (push) Waiting to run
OpenAPI / OpenAPI - HEAD (push) Waiting to run
OpenAPI / OpenAPI - BASE (push) Waiting to run
OpenAPI / OpenAPI - Difference (push) Blocked by required conditions
OpenAPI / OpenAPI - Publish Unstable Spec (push) Blocked by required conditions
OpenAPI / OpenAPI - Publish Stable Spec (push) Blocked by required conditions
Tests / run-tests (macos-latest) (push) Waiting to run
Tests / run-tests (ubuntu-latest) (push) Waiting to run
Tests / run-tests (windows-latest) (push) Waiting to run
Project Automation / Project board (push) Waiting to run
Merge Conflict Labeler / Labeling (push) Waiting to run
Some checks are pending
CodeQL / Analyze (csharp) (push) Waiting to run
OpenAPI / OpenAPI - HEAD (push) Waiting to run
OpenAPI / OpenAPI - BASE (push) Waiting to run
OpenAPI / OpenAPI - Difference (push) Blocked by required conditions
OpenAPI / OpenAPI - Publish Unstable Spec (push) Blocked by required conditions
OpenAPI / OpenAPI - Publish Stable Spec (push) Blocked by required conditions
Tests / run-tests (macos-latest) (push) Waiting to run
Tests / run-tests (ubuntu-latest) (push) Waiting to run
Tests / run-tests (windows-latest) (push) Waiting to run
Project Automation / Project board (push) Waiting to run
Merge Conflict Labeler / Labeling (push) Waiting to run
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user