mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-09 03:04:24 -04:00
Fix trickplay directory path construction (#14036)
This commit is contained in:
parent
e5c40ea98d
commit
57716833b8
@ -29,14 +29,14 @@ public class PathManager : IPathManager
|
|||||||
_appPaths = appPaths;
|
_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 />
|
/// <inheritdoc />
|
||||||
public string GetAttachmentPath(string mediaSourceId, string fileName)
|
public string GetAttachmentPath(string mediaSourceId, string fileName)
|
||||||
{
|
{
|
||||||
return Path.Join(GetAttachmentFolderPath(mediaSourceId), fileName);
|
return Path.Combine(GetAttachmentFolderPath(mediaSourceId), fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
@ -58,7 +58,7 @@ public class PathManager : IPathManager
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public string GetSubtitlePath(string mediaSourceId, int streamIndex, string extension)
|
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 />
|
/// <inheritdoc />
|
||||||
@ -67,14 +67,14 @@ public class PathManager : IPathManager
|
|||||||
var id = item.Id.ToString("D", CultureInfo.InvariantCulture).AsSpan();
|
var id = item.Id.ToString("D", CultureInfo.InvariantCulture).AsSpan();
|
||||||
|
|
||||||
return saveWithMedia
|
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);
|
: Path.Join(_config.ApplicationPaths.TrickplayPath, id[..2], id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public string GetChapterImageFolderPath(BaseItem item)
|
public string GetChapterImageFolderPath(BaseItem item)
|
||||||
{
|
{
|
||||||
return Path.Join(item.GetInternalMetadataPath(), "chapters");
|
return Path.Combine(item.GetInternalMetadataPath(), "chapters");
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
@ -82,6 +82,6 @@ public class PathManager : IPathManager
|
|||||||
{
|
{
|
||||||
var filename = item.DateModified.Ticks.ToString(CultureInfo.InvariantCulture) + "_" + chapterPositionTicks.ToString(CultureInfo.InvariantCulture) + ".jpg";
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user