Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-05-31 20:24:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Apply review suggestions

Browse Source
This commit is contained in:
Shadowghost 2023-02-04 20:16:45 +01:00
parent 626bb24bdd
commit f2b7f664aa
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jellyfin.Api/Helpers/TranscodingJobHelper.cs
View File

@ -325,7 +325,7 @@ public class TranscodingJobHelper : IDisposable
await DeletePartialStreamFiles(job.Path!, job.Type, 0, 1500).ConfigureAwait(false); await DeletePartialStreamFiles(job.Path!, job.Type, 0, 1500).ConfigureAwait(false);
if (job.MediaSource?.VideoType == VideoType.Dvd || job.MediaSource?.VideoType == VideoType.BluRay) if (job.MediaSource?.VideoType == VideoType.Dvd || job.MediaSource?.VideoType == VideoType.BluRay)
{ {
var path = Path.GetDirectoryName(job.Path) + "/" + job.MediaSource.Id + ".concat"; var path = Path.Join(job.Path, "/" + job.MediaSource.Id + ".concat");
File.Delete(path); File.Delete(path);
} }
} }

8
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -943,10 +943,12 @@ namespace MediaBrowser.Controller.MediaEncoding
if (state.MediaSource.VideoType == VideoType.Dvd || state.MediaSource.VideoType == VideoType.BluRay) if (state.MediaSource.VideoType == VideoType.Dvd || state.MediaSource.VideoType == VideoType.BluRay)
{ {
var tmpConcatPath = options.TranscodingTempPath + "/" + state.MediaSource.Id + ".concat"; var tmpConcatPath = Path.Join(options.TranscodingTempPath, "/" + state.MediaSource.Id + ".concat");
_mediaEncoder.GenerateConcatConfig(state.MediaSource, tmpConcatPath); _mediaEncoder.GenerateConcatConfig(state.MediaSource, tmpConcatPath);
arg.Append(" -f concat -safe 0 "); arg.Append(" -f concat -safe 0 ")
arg.Append(" -i " + tmpConcatPath + " "); .Append(" -i ")
.Append(tmpConcatPath)
.Append(' ');
} }
else else
{ {

4
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -450,7 +450,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
prefix = "bluray"; prefix = "bluray";
} }
return EncodingUtils.GetInputArgument(prefix, new List<string>() { inputFile }, mediaSource.Protocol); return EncodingUtils.GetInputArgument(prefix, new[] { inputFile }, mediaSource.Protocol);
} }
/// <inheritdoc /> /// <inheritdoc />
@ -458,7 +458,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
{ {
const string Prefix = "file"; const string Prefix = "file";
return EncodingUtils.GetInputArgument(Prefix, new List<string> { inputFile }, MediaProtocol.File); return EncodingUtils.GetInputArgument(Prefix, new[] { inputFile }, MediaProtocol.File);
} }
/// <summary> /// <summary>