lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try harder to find ffmpeg in app directory. While here do some cleanup

Browse Source
This commit is contained in:
Max Git 2020-04-27 03:25:57 +02:00
parent 820cd7e644
commit cee587d6e3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
SetAvailableEncoders(validator.GetEncoders()); SetAvailableEncoders(validator.GetEncoders());
} }
_logger.LogInformation("FFmpeg: {0}: {1}", EncoderLocation, _ffmpegPath ?? string.Empty); _logger.LogInformation("FFmpeg: {EncoderLocation}: {FfmpegPath}", EncoderLocation, _ffmpegPath ?? string.Empty);
} }
/// <summary> /// <summary>
@ -126,7 +126,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
{ {
string newPath; string newPath;
_logger.LogInformation("Attempting to update encoder path to {0}. pathType: {1}", path ?? string.Empty, pathType ?? string.Empty); _logger.LogInformation("Attempting to update encoder path to {Path}. pathType: {PathType}", path ?? string.Empty, pathType ?? string.Empty);
if (!string.Equals(pathType, "custom", StringComparison.OrdinalIgnoreCase)) if (!string.Equals(pathType, "custom", StringComparison.OrdinalIgnoreCase))
{ {
@ -180,7 +180,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
if (!rc) if (!rc)
{ {
_logger.LogWarning("FFmpeg: {0}: Failed version check: {1}", location, path); _logger.LogWarning("FFmpeg: {Location}: Failed version check: {Path}", location, path);
} }
// ToDo - Enable the ffmpeg validator. At the moment any version can be used. // ToDo - Enable the ffmpeg validator. At the moment any version can be used.
@ -191,18 +191,18 @@ namespace MediaBrowser.MediaEncoding.Encoder
} }
else else
{ {
_logger.LogWarning("FFmpeg: {0}: File not found: {1}", location, path); _logger.LogWarning("FFmpeg: {Location}: File not found: {Path}", location, path);
} }
} }
return rc; return rc;
} }
private string GetEncoderPathFromDirectory(string path, string filename) private string GetEncoderPathFromDirectory(string path, string filename, bool recursive = false)
{ {
try try
{ {
var files = _fileSystem.GetFilePaths(path); var files = _fileSystem.GetFilePaths(path, recursive);
var excludeExtensions = new[] { ".c" }; var excludeExtensions = new[] { ".c" };
@ -223,7 +223,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
/// <returns></returns> /// <returns></returns>
private string ExistsOnSystemPath(string fileName) private string ExistsOnSystemPath(string fileName)
{ {
string inJellyfinPath = GetEncoderPathFromDirectory(System.AppContext.BaseDirectory, fileName); var inJellyfinPath = GetEncoderPathFromDirectory(AppContext.BaseDirectory, fileName, recursive: true);
if (!string.IsNullOrEmpty(inJellyfinPath)) if (!string.IsNullOrEmpty(inJellyfinPath))
{ {
return inJellyfinPath; return inJellyfinPath;
@ -892,7 +892,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
return minSizeVobs.Count == 0 ? vobs.Select(i => i.FullName) : minSizeVobs.Select(i => i.FullName); return minSizeVobs.Count == 0 ? vobs.Select(i => i.FullName) : minSizeVobs.Select(i => i.FullName);
} }
_logger.LogWarning("Could not determine vob file list for {0} using DvdLib. Will scan using file sizes.", path); _logger.LogWarning("Could not determine vob file list for {Path} using DvdLib. Will scan using file sizes.", path);
} }
var files = allVobs var files = allVobs