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

fetcher: remove the Cloning prefix from the events to make more sense grammatically

Browse source
This commit is contained in:
Hylke Bons 2011-05-03 18:30:39 +01:00
parent 92a1b1b627
commit f07dd48d0d
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
SparkleLib/SparkleFetcher.cs
View file

@ -26,13 +26,13 @@ namespace SparkleLib {
public class SparkleFetcher { public class SparkleFetcher {
// TODO: remove 'cloning' prefix // TODO: remove 'cloning' prefix
public delegate void CloningStartedEventHandler (object o, SparkleEventArgs args); public delegate void StartedEventHandler (object o, SparkleEventArgs args);
public delegate void CloningFinishedEventHandler (object o, SparkleEventArgs args); public delegate void FinishedEventHandler (object o, SparkleEventArgs args);
public delegate void CloningFailedEventHandler (object o, SparkleEventArgs args); public delegate void FailedEventHandler (object o, SparkleEventArgs args);
public event CloningStartedEventHandler CloningStarted; public event StartedEventHandler Started;
public event CloningFinishedEventHandler CloningFinished; public event FinishedEventHandler Finished;
public event CloningFailedEventHandler CloningFailed; public event FailedEventHandler Failed;
private string TargetFolder; private string TargetFolder;
private string RemoteOriginUrl; private string RemoteOriginUrl;
@ -54,8 +54,8 @@ namespace SparkleLib {
Directory.Delete (TargetFolder, true); Directory.Delete (TargetFolder, true);
if (CloningStarted != null) if (Started != null)
CloningStarted (this, new SparkleEventArgs ("CloningStarted")); Started (this, new SparkleEventArgs ("Started"));
SparkleGit git = new SparkleGit (SparklePaths.SparkleTmpPath, SparkleGit git = new SparkleGit (SparklePaths.SparkleTmpPath,
"clone \"" + RemoteOriginUrl + "\" " + "\"" + TargetFolder + "\""); "clone \"" + RemoteOriginUrl + "\" " + "\"" + TargetFolder + "\"");
@ -66,16 +66,16 @@ namespace SparkleLib {
if (git.ExitCode != 0) { if (git.ExitCode != 0) {
SparkleHelpers.DebugInfo ("Git", "[" + TargetFolder + "] Cloning failed"); SparkleHelpers.DebugInfo ("Git", "[" + TargetFolder + "] Cloning failed");
if (CloningFailed != null) if (Failed != null)
CloningFailed (this, new SparkleEventArgs ("CloningFailed")); Failed (this, new SparkleEventArgs ("CloningFailed"));
} else { } else {
InstallConfiguration (); InstallConfiguration ();
InstallExcludeRules (); InstallExcludeRules ();
SparkleHelpers.DebugInfo ("Git", "[" + TargetFolder + "] Repository cloned"); SparkleHelpers.DebugInfo ("Git", "[" + TargetFolder + "] Repository cloned");
if (CloningFinished != null) if (Finished != null)
CloningFinished (this, new SparkleEventArgs ("CloningFinished")); Finished (this, new SparkleEventArgs ("Finished"));
} }
}; };

4
SparkleShare/SparkleController.cs
View file

@ -985,7 +985,7 @@ namespace SparkleShare {
if (i > 1) if (i > 1)
target_folder_name += " (" + i + ")"; target_folder_name += " (" + i + ")";
fetcher.CloningFinished += delegate { fetcher.Finished += delegate {
EnableHostKeyCheckingForHost (host); EnableHostKeyCheckingForHost (host);
// Needed to do the moving // Needed to do the moving
@ -1009,7 +1009,7 @@ namespace SparkleShare {
}; };
fetcher.CloningFailed += delegate { fetcher.Failed += delegate {
EnableHostKeyCheckingForHost (host); EnableHostKeyCheckingForHost (host);
if (Directory.Exists (tmp_folder)) { if (Directory.Exists (tmp_folder)) {