beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

process: Move SparkleProcess to SparkleLib namespace

Browse source
This commit is contained in:
Hylke Bons 2016-03-05 12:24:07 +00:00
parent eb75e974c7
commit 66485af890
4 changed files with 110 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
SparkleLib/Git/SparkleGit.cs
View file

@ -18,88 +18,11 @@
using System;
using System.IO;
using System.Diagnostics;
using SparkleLib;
namespace SparkleLib.Git {
public abstract class SparkleProcess : Process {
public SparkleProcess (string path, string args) : base ()
{
StartInfo.FileName = path;
StartInfo.Arguments = args;
}
new public void Start ()
{
SparkleLogger.LogInfo ("Cmd | " + System.IO.Path.GetFileName (StartInfo.WorkingDirectory),
System.IO.Path.GetFileName (StartInfo.FileName) + " " + StartInfo.Arguments);
try {
base.Start ();
} catch (Exception e) {
SparkleLogger.LogInfo ("Cmd", "Couldn't execute command: " + e.Message);
Environment.Exit (-1);
}
}
public void StartAndWaitForExit ()
{
Start ();
WaitForExit ();
}
public string StartAndReadStandardOutput ()
{
Start ();
// Reading the standard output HAS to go before
// WaitForExit, or it will hang forever on output > 4096 bytes
string output = StandardOutput.ReadToEnd ();
WaitForExit ();
return output.TrimEnd ();
}
public string StartAndReadStandardError ()
{
StartInfo.RedirectStandardError = true;
Start ();
// Reading the standard output HAS to go before
// WaitForExit, or it will hang forever on output > 4096 bytes
string output = StandardError.ReadToEnd ();
WaitForExit ();
return output.TrimEnd ();
}
protected string LocateCommand (string name)
{
string [] possible_command_paths = new string [] {
Environment.GetFolderPath (Environment.SpecialFolder.Personal) + "/bin/" + name,
Defines.INSTALL_DIR + "/bin/" + name,
"/usr/local/bin/" + name,
"/usr/bin/" + name,
"/opt/local/bin/" + name
};
foreach (string path in possible_command_paths) {
if (File.Exists (path))
return path;
}
return name;
}
}
public class SparkleGit : SparkleProcess {
public static string ExecPath;
@ -112,12 +35,8 @@ namespace SparkleLib.Git {
if (string.IsNullOrEmpty (GitPath))
GitPath = LocateCommand ("git");
EnableRaisingEvents = true;
StartInfo.FileName = GitPath;
StartInfo.RedirectStandardOutput = true;
StartInfo.UseShellExecute = false;
StartInfo.WorkingDirectory = path;
StartInfo.CreateNoWindow = true;
StartInfo.FileName = GitPath;
StartInfo.WorkingDirectory = path;
if (StartInfo.EnvironmentVariables.ContainsKey ("LANG"))
StartInfo.EnvironmentVariables ["LANG"] = "en_US";

1
SparkleLib/Makefile.am
View file

@ -13,6 +13,7 @@ SOURCES = \
SparkleListenerFactory.cs \
SparkleListenerTcp.cs \
SparkleLogger.cs \
SparkleProcess.cs \
SparkleRepoBase.cs \
SparkleUser.cs \
SparkleWatcher.cs \

1
SparkleLib/SparkleLib.csproj
View file

@ -46,6 +46,7 @@
<Compile Include="SparkleLogger.cs" />
<Compile Include="Defines.cs" />
<Compile Include="SparkleFetcherSSH.cs" />
<Compile Include="SparkleProcess.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>

105
SparkleLib/SparkleProcess.cs Normal file
View file

@ -0,0 +1,105 @@
// SparkleShare, a collaboration and sharing tool.
// Copyright (C) 2010 Hylke Bons <hylkebons@gmail.com>
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using System.Diagnostics;
using System.IO;
namespace SparkleLib
{
public class SparkleProcess : Process {
public SparkleProcess (string path, string args) : base ()
{
StartInfo.FileName = path;
StartInfo.Arguments = args;
StartInfo.UseShellExecute = false;
StartInfo.RedirectStandardOutput = true;
StartInfo.RedirectStandardError = true;
StartInfo.CreateNoWindow = true;
EnableRaisingEvents = true;
}
new public void Start ()
{
SparkleLogger.LogInfo ("Cmd | " + System.IO.Path.GetFileName (StartInfo.WorkingDirectory),
System.IO.Path.GetFileName (StartInfo.FileName) + " " + StartInfo.Arguments);
try {
base.Start ();
} catch (Exception e) {
SparkleLogger.LogInfo ("Cmd", "Couldn't execute command: " + e.Message);
Environment.Exit (-1);
}
}
public void StartAndWaitForExit ()
{
Start ();
WaitForExit ();
}
public string StartAndReadStandardOutput ()
{
Start ();
// Reading the standard output HAS to go before
// WaitForExit, or it will hang forever on output > 4096 bytes
string output = StandardOutput.ReadToEnd ();
WaitForExit ();
return output.TrimEnd ();
}
public string StartAndReadStandardError ()
{
StartInfo.RedirectStandardError = true;
Start ();
// Reading the standard output HAS to go before
// WaitForExit, or it will hang forever on output > 4096 bytes
string output = StandardError.ReadToEnd ();
WaitForExit ();
return output.TrimEnd ();
}
protected string LocateCommand (string name)
{
string [] possible_command_paths = new string [] {
Environment.GetFolderPath (Environment.SpecialFolder.Personal) + "/bin/" + name,
Defines.INSTALL_DIR + "/bin/" + name,
"/usr/local/bin/" + name,
"/usr/bin/" + name,
"/opt/local/bin/" + name
};
foreach (string path in possible_command_paths) {
if (File.Exists (path))
return path;
}
return name;
}
}
}