From b4fabcf944ec69bfd9771e2625765d2293d36907 Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Sun, 30 Jun 2013 15:48:35 +0100
Subject: [PATCH] controller: Move cloned folder deletion logic to fetcher

---
 SparkleLib/Git/SparkleFetcherGit.cs   | 19 +++++++++++++++----
 SparkleShare/SparkleControllerBase.cs | 13 +------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/SparkleLib/Git/SparkleFetcherGit.cs b/SparkleLib/Git/SparkleFetcherGit.cs
index b7300e68..e913907c 100755
--- a/SparkleLib/Git/SparkleFetcherGit.cs
+++ b/SparkleLib/Git/SparkleFetcherGit.cs
@@ -254,10 +254,8 @@ namespace SparkleLib.Git {
                     return false;
             }
 
-            Process process = new Process () {
-                EnableRaisingEvents = true
-            };
-
+            Process process = new Process ();
+            process.EnableRaisingEvents              = true;
             process.StartInfo.WorkingDirectory       = TargetFolder;
             process.StartInfo.UseShellExecute        = false;
             process.StartInfo.RedirectStandardOutput = true;
@@ -267,6 +265,9 @@ namespace SparkleLib.Git {
             process.StartInfo.Arguments = "enc -d -aes-256-cbc -base64 -S " + this.crypto_salt +
                 " -pass pass:\"" + password + "\" -in " + password_check_file_path;
 
+            SparkleLogger.LogInfo ("Cmd | " + System.IO.Path.GetFileName (process.StartInfo.WorkingDirectory),
+                System.IO.Path.GetFileName (process.StartInfo.FileName) + " " + process.StartInfo.Arguments);
+
             process.Start ();
             process.WaitForExit ();
 
@@ -291,6 +292,16 @@ namespace SparkleLib.Git {
             } catch (Exception e) {
                 SparkleLogger.LogInfo ("Fetcher", "Failed to dispose properly", e);
             }
+
+            if (Directory.Exists (TargetFolder)) {
+                try {
+                    Directory.Delete (TargetFolder, true /* Recursive */ );
+                    SparkleLogger.LogInfo ("Fetcher", "Deleted '" + TargetFolder + "'");
+                    
+                } catch (Exception e) {
+                    SparkleLogger.LogInfo ("Fetcher", "Failed to delete '" + TargetFolder + "'", e);
+                }
+            }
         }
 
 
diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
index 6ac1fba9..1242f55d 100644
--- a/SparkleShare/SparkleControllerBase.cs
+++ b/SparkleShare/SparkleControllerBase.cs
@@ -588,20 +588,9 @@ namespace SparkleShare {
         public void StopFetcher ()
         {
             this.fetcher.Stop ();
-
-            if (Directory.Exists (this.fetcher.TargetFolder)) {
-                try {
-                    Directory.Delete (this.fetcher.TargetFolder, true /* Recursive */ );
-                    SparkleLogger.LogInfo ("Controller", "Deleted '" + this.fetcher.TargetFolder + "'");
-
-                } catch (Exception e) {
-                    SparkleLogger.LogInfo ("Controller", "Failed to delete '" + this.fetcher.TargetFolder + "'", e);
-                }
-            }
-
             this.fetcher.Dispose ();
-            this.fetcher = null;
 
+            this.fetcher = null;
             this.watcher.EnableRaisingEvents = true;
         }