fix timer GC, improve quantity handler

eddiezato · Feb 18, 2018 · cd2a44f · cd2a44f
1 parent 3bd20ae
commit cd2a44f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 30 deletions.
diff --git a/DS3SavesBackup/Program.cs b/DS3SavesBackup/Program.cs
@@ -1,17 +1,19 @@
 using System;
-using System.Collections.Generic;
 using System.Configuration;
 using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
-using System.Linq;
 using System.Threading;
 
 namespace DS3SavesBackup
 {
     class Program
     {
         private static string[] localized;
+        private static string savesPath, backupPath;
+        private static int interval, maxBackup;
+
+        private static Timer mTimer;
 
         private static string nowToString()
         {
@@ -40,45 +42,44 @@ private static void saveConfig(string appKey, string appValue)
             configuration.Save(ConfigurationSaveMode.Modified);
         }
 
-        private static void mainLoop(string saves_path, string backup_path, int maxbkup, List<string> backupList)
+        private static void mainLoop()
         {
             Process[] ds3Process = Process.GetProcessesByName("DarkSoulsIII");
             if (ds3Process.Length > 0)
             {
-                if (Directory.GetFiles(saves_path).Length == 0)
-                {
-                    messWrite(localized[10], true);
-                }
-                else
+                if (Directory.GetFiles(savesPath).Length > 0)
                 {
 
                     messWrite(localized[6] + "...", false);
-                    if (backupList.Count == maxbkup)
+
+                    string[] backupFiles = Directory.GetFiles(backupPath, "ds3*.zip", SearchOption.TopDirectoryOnly);
+                    if (backupFiles.Length >= maxBackup)
                     {
                         try
                         {
-                            File.Delete(backupList.First());
+                            for (int i = 0; i < backupFiles.Length - maxBackup + 1; i++)
+                                File.Delete(backupFiles[i]);
                         }
                         catch (Exception e)
                         {
                             messWrite(e.ToString(), true);
-                            Environment.Exit(0);
                         }
-                        backupList.RemoveAt(0);
-                    }
-                    string backup = Path.Combine(backup_path, "ds3_" + nowToString() + ".zip");
-                    backupList.Add(backup);
+                     }
+                    string backup = Path.Combine(backupPath, "ds3_" + nowToString() + ".zip");
                     try
                     {
-                        ZipFile.CreateFromDirectory(saves_path, backup, CompressionLevel.Fastest, false);
+                        ZipFile.CreateFromDirectory(savesPath, backup, CompressionLevel.Fastest, false);
                     }
                     catch (Exception e)
                     {
                         messWrite(e.ToString(), true);
-                        Environment.Exit(0);
                     }
                     Console.WriteLine(" " + localized[7] + ": " + Path.GetFileName(backup));
                 }
+                else
+                {
+                    messWrite(localized[10], true);
+                }
             }
             else
             {
@@ -130,10 +131,7 @@ static void Main(string[] args)
             Console.ForegroundColor = ConsoleColor.DarkGray;
             Console.WriteLine(localized[0] + "\n");
             Console.ResetColor();
-
-            string savesPath, backupPath;
-            int interval, maxBackup;
-
+
             try
             {
                 interval = Convert.ToInt32(ConfigurationManager.AppSettings["auto_backup_interval_min"]);
@@ -207,13 +205,7 @@ static void Main(string[] args)
             Console.WriteLine(localized[5] + ": " + maxBackup.ToString() + "\n", true);
             Console.ResetColor();
 
-            List<string> backupList = new List<string>();
-            foreach (string filename in Directory.GetFiles(backupPath, "ds3*.zip", SearchOption.TopDirectoryOnly))
-            {
-                backupList.Add(filename);
-            }
-
-            Timer mTimer = new Timer((e) => { mainLoop(savesPath, backupPath, maxBackup, backupList); }, null, 0, interval * 1000 * 60);
+            mTimer = new Timer((z) => { mainLoop(); }, null, 0, interval * 60000);
             while (Console.ReadKey(true).Key != ConsoleKey.Q) { }
         }
     }

diff --git a/DS3SavesBackup/Properties/AssemblyInfo.cs b/DS3SavesBackup/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]