shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-26 20:13:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

0.5 Rc1 - Reimplement port change+tray, fix IPT+SSC. Installer fixes.

Browse Source
This commit is contained in:
Kayomani
2015-07-22 23:00:52 +01:00
parent b85ff8503c
commit 8824aa62e5
39 changed files with 1144 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/Jackett/Services/ProcessService.cs
View File

@@ -10,7 +10,8 @@ namespace Jackett.Services
{
public interface IProcessService
{
void StartProcessAndLog(string exe, string args);
void StartProcessAndLog(string exe, string args, bool asAdmin = false);
string StartProcessAndGetOutput(string exe, string args, bool keepnewlines = false, bool asAdmin = false);
}
public class ProcessService : IProcessService
@@ -22,7 +23,7 @@ namespace Jackett.Services
logger = l;
}
public void StartProcessAndLog(string exe, string args)
private void Run(string exe, string args, bool asAdmin, DataReceivedEventHandler d, DataReceivedEventHandler r)
{
var startInfo = new ProcessStartInfo()
{
@@ -35,30 +36,71 @@ namespace Jackett.Services
RedirectStandardInput = true
};
if (asAdmin)
{
startInfo.Verb = "runas";
startInfo.UseShellExecute = true;
startInfo.RedirectStandardError = false;
startInfo.RedirectStandardOutput = false;
startInfo.RedirectStandardInput = false;
}
var proc = Process.Start(startInfo);
proc.OutputDataReceived += proc_OutputDataReceived;
proc.ErrorDataReceived += proc_ErrorDataReceived;
proc.BeginErrorReadLine();
proc.BeginOutputReadLine();
if (!asAdmin)
{
proc.OutputDataReceived += d;
proc.ErrorDataReceived += r;
proc.BeginErrorReadLine();
proc.BeginOutputReadLine();
}
proc.WaitForExit();
proc.OutputDataReceived -= proc_OutputDataReceived;
proc.ErrorDataReceived -= proc_ErrorDataReceived;
}
void proc_ErrorDataReceived(object sender, DataReceivedEventArgs e)
{
if (!string.IsNullOrWhiteSpace(e.Data))
if (!asAdmin)
{
logger.Error(e.Data);
proc.OutputDataReceived -= d;
proc.ErrorDataReceived -= r;
}
}
void proc_OutputDataReceived(object sender, DataReceivedEventArgs e)
public string StartProcessAndGetOutput(string exe, string args, bool keepnewlines = false, bool asAdmin = false)
{
if (!string.IsNullOrWhiteSpace(e.Data))
var sb = new StringBuilder();
DataReceivedEventHandler rxData = (a, e) => {
if (keepnewlines || !string.IsNullOrWhiteSpace(e.Data))
{
sb.AppendLine(e.Data);
}
};
DataReceivedEventHandler rxError = (s, e) => {
if (keepnewlines || !string.IsNullOrWhiteSpace(e.Data))
{
sb.AppendLine(e.Data);
}
};
Run(exe, args, asAdmin, rxData, rxError);
return sb.ToString();
}
public void StartProcessAndLog(string exe, string args, bool asAdmin = false)
{
var sb = new StringBuilder();
DataReceivedEventHandler rxData = (a, e) =>
{
logger.Debug(e.Data);
}
if (!string.IsNullOrWhiteSpace(e.Data))
{
logger.Debug(e.Data);
}
};
DataReceivedEventHandler rxError = (s, e) =>
{
if (!string.IsNullOrWhiteSpace(e.Data))
{
logger.Error(e.Data);
}
};
Run(exe, args, asAdmin, rxData, rxError);
}
}
}