starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-28 11:44:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

update recording dialogs

Browse Source
This commit is contained in:
Luke Pulverenti
2016-09-22 02:57:31 -04:00
parent 6999017bc9
commit eee9c0e048
5 changed files with 64 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,6 +82,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
private readonly List<ProcessWrapper> _runningProcesses = new List<ProcessWrapper>();
private readonly bool _hasExternalEncoder;
private string _originalFFMpegPath;
private string _originalFFProbePath;
public MediaEncoder(ILogger logger, IJsonSerializer jsonSerializer, string ffMpegPath, string ffProbePath, bool hasExternalEncoder, IServerConfigurationManager configurationManager, IFileSystem fileSystem, ILiveTvManager liveTvManager, IIsoManager isoManager, ILibraryManager libraryManager, IChannelManager channelManager, ISessionManager sessionManager, Func<ISubtitleEncoder> subtitleEncoder, Func<IMediaSourceManager> mediaSourceManager, IHttpClient httpClient, IZipClient zipClient)
{
@@ -100,6 +102,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
_zipClient = zipClient;
FFProbePath = ffProbePath;
FFMpegPath = ffMpegPath;
_originalFFProbePath = ffProbePath;
_originalFFMpegPath = ffMpegPath;
_hasExternalEncoder = hasExternalEncoder;
}
@@ -231,6 +235,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
throw new ResourceNotFoundException("ffprobe not found");
}
if (!ValidateVersion(path))
{
throw new ResourceNotFoundException("ffmpeg version 3.0 or greater is required.");
}
var config = GetEncodingOptions();
config.EncoderAppPath = path;
ConfigurationManager.SaveConfiguration("encoding", config);
@@ -238,6 +247,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
Init();
}
private bool ValidateVersion(string path)
{
return new EncoderValidator(_logger).ValidateVersion(path);
}
private void ConfigureEncoderPaths()
{
var appPath = GetEncodingOptions().EncoderAppPath;
@@ -287,47 +301,24 @@ namespace MediaBrowser.MediaEncoding.Encoder
string encoderPath = null;
string probePath = null;
if (TestSystemInstalled("ffmpeg"))
if (_hasExternalEncoder && ValidateVersion(_originalFFMpegPath))
{
encoderPath = "ffmpeg";
encoderPath = _originalFFMpegPath;
probePath = _originalFFProbePath;
}
if (TestSystemInstalled("ffprobe"))
if (string.IsNullOrWhiteSpace(encoderPath))
{
probePath = "ffprobe";
if (ValidateVersion("ffmpeg") && ValidateVersion("ffprobe"))
{
encoderPath = "ffmpeg";
probePath = "ffprobe";
}
}
return new Tuple<string, string>(encoderPath, probePath);
}
private bool TestSystemInstalled(string app)
{
try
{
var startInfo = new ProcessStartInfo
{
FileName = app,
Arguments = "-v",
UseShellExecute = false,
CreateNoWindow = true,
WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false
};
using (var process = Process.Start(startInfo))
{
process.WaitForExit();
}
_logger.Debug("System app installed: " + app);
return true;
}
catch
{
_logger.Debug("System app not installed: " + app);
return false;
}
}
private Tuple<string, string> GetPathsFromDirectory(string path)
{
// Since we can't predict the file extension, first try directly within the folder