Release 2018.01.03.1

Author: Lustyn

Constants.cs

@@ -8,6 +8,6 @@ namespace TMF_Simplifier
 {
     public class Constants
     {
-        public const string Version = "2018.01.03.0";
+        public const string Version = "2018.01.03.1";
     }
 }

MainForm.cs

@@ -52,6 +52,7 @@ string status
         HelpPage Help;
         public TMFS()
         {
+            CleanDir(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location));
             InitializeComponent();
             if (!Directory.Exists(TotalMinerMain))
             {
@@ -401,5 +402,27 @@ private void SettingsBTN_Click(object sender, EventArgs e)
         {
             SettingsStrip.Visible = !SettingsStrip.Visible;
         }
+
+        static void CleanDir(string sDir)
+        {
+            try
+            {
+                foreach (string d in Directory.GetDirectories(sDir))
+                {
+                    foreach (string f in Directory.GetFiles(d))
+                    {
+                        if(f.EndsWith(".bak"))
+                        {
+                            File.Delete(f);
+                        }
+                    }
+                    CleanDir(d);
+                }
+            }
+            catch (System.Exception excpt)
+            {
+                Console.WriteLine(excpt.Message);
+            }
+        }
     }
 }

Updater.cs

@@ -62,19 +62,18 @@ public static async Task Update()
             Release release = await GetLatestRelease();
             Asset asset = release.assets.First();
             Uri download_uri = new Uri(asset.browser_download_url);
-            string exe_location = Assembly.GetExecutingAssembly().Location;
-            string exe_bak_location = exe_location + ".bak";
-            string extract_location = Path.GetDirectoryName(exe_location);
+            string extract_location = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
             string download_location = Path.Combine(extract_location, "download.zip");
             await _client.DownloadFileTaskAsync(download_uri, download_location);
-            if(File.Exists(exe_bak_location))
-            {
-                File.Delete(exe_bak_location);
-            }
-            File.Move(exe_location, exe_bak_location);
-            File.Copy(exe_bak_location, exe_location);
             using (var tmp = new SevenZipExtractor(download_location))
             {
+                tmp.FileExists += (object sender, FileOverwriteEventArgs e) =>
+                {
+                    string loc = Path.Combine(extract_location, e.FileName);
+                    string bak = loc + ".bak";
+                    File.Move(loc, bak);
+                    File.Copy(bak, loc);
+                };
                 tmp.ExtractArchive(extract_location);
             }
             File.Delete(download_location);