Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-04 06:04:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't set ffmpeg path from null to its Display value + add 404

Browse Source
This commit is contained in:
cvium 2021-09-11 16:20:49 +02:00 committed by Claus Vium (Rebase PR Action)
parent b4c0518001
commit 95f344722c
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,6 +151,16 @@ namespace MediaBrowser.MediaEncoding.Encoder
/// <param name="pathType">The path type.</param> /// <param name="pathType">The path type.</param>
public void UpdateEncoderPath(string path, string pathType) public void UpdateEncoderPath(string path, string pathType)
{ {
var config = _configurationManager.GetEncodingOptions();
// Filesystem may not be case insensitive, but EncoderAppPathDisplay should always point to a valid file?
if (string.IsNullOrEmpty(config.EncoderAppPath)
&& string.Equals(config.EncoderAppPathDisplay, path, StringComparison.OrdinalIgnoreCase))
{
_logger.LogDebug("Existing ffmpeg path is empty and the new path is the same as {EncoderAppPathDisplay}. Skipping", nameof(config.EncoderAppPathDisplay));
return;
}
string newPath; string newPath;
_logger.LogInformation("Attempting to update encoder path to {Path}. pathType: {PathType}", path ?? string.Empty, pathType ?? string.Empty); _logger.LogInformation("Attempting to update encoder path to {Path}. pathType: {PathType}", path ?? string.Empty, pathType ?? string.Empty);
@ -183,9 +193,14 @@ namespace MediaBrowser.MediaEncoding.Encoder
} }
} }
// Don't save an invalid path
if (!File.Exists(path))
{
throw new FileNotFoundException();
}
// Write the new ffmpeg path to the xml as <EncoderAppPath> // Write the new ffmpeg path to the xml as <EncoderAppPath>
// This ensures its not lost on next startup // This ensures its not lost on next startup
var config = _configurationManager.GetEncodingOptions();
config.EncoderAppPath = newPath; config.EncoderAppPath = newPath;
_configurationManager.SaveConfiguration("encoding", config); _configurationManager.SaveConfiguration("encoding", config);