open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use a separate line for each property initializer

Browse Source
pull/2680/head
Mark Monteiro 4 years ago
parent 3d8501e462
commit 7152b55747
6 changed files with 97 additions and 70 deletions
Show Stats Download Patch File Download Diff File

13
Emby.Server.Implementations/ApplicationHost.cs
Unescape View File

@ -1700,13 +1700,16 @@ namespace Emby.Server.Implementations
throw new NotSupportedException(); throw new NotSupportedException();
} }
var processStartInfo = new ProcessStartInfo var process = new Process
{ {
FileName = url, StartInfo = new ProcessStartInfo
UseShellExecute = true, {
ErrorDialog = false FileName = url,
UseShellExecute = true,
ErrorDialog = false
},
EnableRaisingEvents = true
}; };
var process = new Process { StartInfo = processStartInfo, EnableRaisingEvents = true };
process.Exited += (sender, args) => ((Process)sender).Dispose(); process.Exited += (sender, args) => ((Process)sender).Dispose();
try try

21
Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
Unescape View File

@ -1680,16 +1680,19 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
try try
{ {
var processStartInfo = new ProcessStartInfo var process = new Process
{ {
Arguments = GetPostProcessArguments(path, options.RecordingPostProcessorArguments), StartInfo = new ProcessStartInfo
CreateNoWindow = true, {
ErrorDialog = false, Arguments = GetPostProcessArguments(path, options.RecordingPostProcessorArguments),
FileName = options.RecordingPostProcessor, CreateNoWindow = true,
WindowStyle = ProcessWindowStyle.Hidden, ErrorDialog = false,
UseShellExecute = false FileName = options.RecordingPostProcessor,
WindowStyle = ProcessWindowStyle.Hidden,
UseShellExecute = false
},
EnableRaisingEvents = true
}; };
var process = new Process { StartInfo = processStartInfo, EnableRaisingEvents = true };
_logger.LogInformation("Running recording post processor {0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments); _logger.LogInformation("Running recording post processor {0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);

8
Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
Unescape View File

@ -90,9 +90,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
WindowStyle = ProcessWindowStyle.Hidden, WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false ErrorDialog = false
}; };
_process = new Process { StartInfo = processStartInfo, EnableRaisingEvents = true };
var commandLineLogMessage = _process.StartInfo.FileName + " " + _process.StartInfo.Arguments; var commandLineLogMessage = processStartInfo.FileName + " " + processStartInfo.Arguments;
_logger.LogInformation(commandLineLogMessage); _logger.LogInformation(commandLineLogMessage);
var logFilePath = Path.Combine(_appPaths.LogDirectoryPath, "record-transcode-" + Guid.NewGuid() + ".txt"); var logFilePath = Path.Combine(_appPaths.LogDirectoryPath, "record-transcode-" + Guid.NewGuid() + ".txt");
@ -104,6 +103,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
var commandLineLogMessageBytes = Encoding.UTF8.GetBytes(_json.SerializeToString(mediaSource) + Environment.NewLine + Environment.NewLine + commandLineLogMessage + Environment.NewLine + Environment.NewLine); var commandLineLogMessageBytes = Encoding.UTF8.GetBytes(_json.SerializeToString(mediaSource) + Environment.NewLine + Environment.NewLine + commandLineLogMessage + Environment.NewLine + Environment.NewLine);
_logFileStream.Write(commandLineLogMessageBytes, 0, commandLineLogMessageBytes.Length); _logFileStream.Write(commandLineLogMessageBytes, 0, commandLineLogMessageBytes.Length);
_process = new Process
{
StartInfo = processStartInfo,
EnableRaisingEvents = true
};
_process.Exited += (sender, args) => OnFfMpegProcessExited(_process, inputFile); _process.Exited += (sender, args) => OnFfMpegProcessExited(_process, inputFile);
_process.Start(); _process.Start();

23
MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
Unescape View File

@ -155,19 +155,22 @@ namespace MediaBrowser.MediaEncoding.Attachments
inputPath, inputPath,
attachmentStreamIndex, attachmentStreamIndex,
outputPath); outputPath);
var startInfo = new ProcessStartInfo
{
Arguments = processArgs,
FileName = _mediaEncoder.EncoderPath,
UseShellExecute = false,
CreateNoWindow = true,
WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false
};
int exitCode; int exitCode;
using (var process = new Process { StartInfo = startInfo, EnableRaisingEvents = true }) using (var process = new Process
{
StartInfo = new ProcessStartInfo
{
Arguments = processArgs,
FileName = _mediaEncoder.EncoderPath,
UseShellExecute = false,
CreateNoWindow = true,
WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false
},
EnableRaisingEvents = true
})
{ {
_logger.LogInformation("{File} {Arguments}", process.StartInfo.FileName, process.StartInfo.Arguments); _logger.LogInformation("{File} {Arguments}", process.StartInfo.FileName, process.StartInfo.Arguments);

54
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
Unescape View File

@ -359,30 +359,33 @@ namespace MediaBrowser.MediaEncoding.Encoder
: "{0} -i {1} -threads 0 -v warning -print_format json -show_streams -show_format"; : "{0} -i {1} -threads 0 -v warning -print_format json -show_streams -show_format";
args = string.Format(args, probeSizeArgument, inputPath).Trim(); args = string.Format(args, probeSizeArgument, inputPath).Trim();
var processStartInfo = new ProcessStartInfo var process = new Process
{ {
CreateNoWindow = true, StartInfo = new ProcessStartInfo
UseShellExecute = false, {
CreateNoWindow = true,
UseShellExecute = false,
// Must consume both or ffmpeg may hang due to deadlocks. See comments below. // Must consume both or ffmpeg may hang due to deadlocks. See comments below.
RedirectStandardOutput = true, RedirectStandardOutput = true,
FileName = _ffprobePath, FileName = _ffprobePath,
Arguments = args, Arguments = args,
WindowStyle = ProcessWindowStyle.Hidden, WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false, ErrorDialog = false,
},
EnableRaisingEvents = true
}; };
var process = new Process { StartInfo = processStartInfo, EnableRaisingEvents = true };
if (forceEnableLogging) if (forceEnableLogging)
{ {
_logger.LogInformation("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments); _logger.LogInformation("{ProcessFileName} {ProcessArgs}", process.StartInfo.FileName, process.StartInfo.Arguments);
} }
else else
{ {
_logger.LogDebug("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments); _logger.LogDebug("{ProcessFileName} {ProcessArgs}", process.StartInfo.FileName, process.StartInfo.Arguments);
} }
using (var processWrapper = new ProcessWrapper(process, this)) using (var processWrapper = new ProcessWrapper(process, this))
@ -568,19 +571,22 @@ namespace MediaBrowser.MediaEncoding.Encoder
} }
} }
var processStartInfo = new ProcessStartInfo var process = new Process
{ {
CreateNoWindow = true, StartInfo = new ProcessStartInfo
UseShellExecute = false, {
FileName = _ffmpegPath, CreateNoWindow = true,
Arguments = args, UseShellExecute = false,
WindowStyle = ProcessWindowStyle.Hidden, FileName = _ffmpegPath,
ErrorDialog = false, Arguments = args,
WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false,
},
EnableRaisingEvents = true
}; };
_logger.LogDebug("{0} {1}", processStartInfo.FileName, processStartInfo.Arguments); _logger.LogDebug("{ProcessFileName} {ProcessArguments}", process.StartInfo.FileName, process.StartInfo.Arguments);
var process = new Process { StartInfo = processStartInfo, EnableRaisingEvents = true };
using (var processWrapper = new ProcessWrapper(process, this)) using (var processWrapper = new ProcessWrapper(process, this))
{ {
bool ranToCompletion; bool ranToCompletion;
@ -713,7 +719,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
bool ranToCompletion = false; bool ranToCompletion = false;
var process = new Process { StartInfo = processStartInfo, EnableRaisingEvents = true }; var process = new Process
{
StartInfo = processStartInfo,
EnableRaisingEvents = true
};
using (var processWrapper = new ProcessWrapper(process, this)) using (var processWrapper = new ProcessWrapper(process, this))
{ {
try try

48
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
Unescape View File

@ -426,19 +426,21 @@ namespace MediaBrowser.MediaEncoding.Subtitles
encodingParam = " -sub_charenc " + encodingParam; encodingParam = " -sub_charenc " + encodingParam;
} }
var processStartInfo = new ProcessStartInfo
{
CreateNoWindow = true,
UseShellExecute = false,
FileName = _mediaEncoder.EncoderPath,
Arguments = string.Format("{0} -i \"{1}\" -c:s srt \"{2}\"", encodingParam, inputPath, outputPath),
WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false
};
int exitCode; int exitCode;
using (var process = new Process { StartInfo = processStartInfo, EnableRaisingEvents = true }) using (var process = new Process
{
StartInfo = new ProcessStartInfo
{
CreateNoWindow = true,
UseShellExecute = false,
FileName = _mediaEncoder.EncoderPath,
Arguments = string.Format("{0} -i \"{1}\" -c:s srt \"{2}\"", encodingParam, inputPath, outputPath),
WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false
},
EnableRaisingEvents = true
})
{ {
_logger.LogInformation("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments); _logger.LogInformation("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
@ -577,19 +579,21 @@ namespace MediaBrowser.MediaEncoding.Subtitles
outputCodec, outputCodec,
outputPath); outputPath);
var processStartInfo = new ProcessStartInfo
{
CreateNoWindow = true,
UseShellExecute = false,
FileName = _mediaEncoder.EncoderPath,
Arguments = processArgs,
WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false
};
int exitCode; int exitCode;
using (var process = new Process { StartInfo = processStartInfo, EnableRaisingEvents = true }) using (var process = new Process
{
StartInfo = new ProcessStartInfo
{
CreateNoWindow = true,
UseShellExecute = false,
FileName = _mediaEncoder.EncoderPath,
Arguments = processArgs,
WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false
},
EnableRaisingEvents = true
})
{ {
_logger.LogInformation("{File} {Arguments}", process.StartInfo.FileName, process.StartInfo.Arguments); _logger.LogInformation("{File} {Arguments}", process.StartInfo.FileName, process.StartInfo.Arguments);

Write Preview
Loading…
Cancel
Save