Patch release [v1.0.2.0]

- Improved the auto update code
o7q · Jul 28, 2023 · 7a60b75 · 7a60b75
1 parent 98492ee
commit 7a60b75
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 23 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,2 +1,5 @@
+~ v1.0.2.0
+- Improved the auto update code
+
 ~ v1.0.1.0
 - Fixed bug with auto update not working
diff --git a/src/Scribe/Scribe/Includes/Data/Storage.cs b/src/Scribe/Scribe/Includes/Data/Storage.cs
@@ -2,6 +2,6 @@
 {
     public static class Constants
     {
-        public const string VERSION = "v1.0.1";
+        public const string VERSION = "v1.0.2";
     }
 }
diff --git a/src/Scribe/Scribe/Includes/Tools/Files.cs b/src/Scribe/Scribe/Includes/Tools/Files.cs
@@ -13,10 +13,10 @@ public static int CleanFolder(string folder)
             {
                 string extension = Path.GetExtension(filePath);
 
-                // Check if the current file is not the specified file type
+                // check if the current file is not the specified file type
                 if (extension != fileExtensionToKeep)
                 {
-                    // Delete the file
+                    // delete the file
                     try
                     {
                         File.Delete(filePath);

diff --git a/src/Scribe/Scribe/MainMenu.cs b/src/Scribe/Scribe/MainMenu.cs
@@ -88,7 +88,8 @@ private void MainMenu_Load(object sender, EventArgs e)
 
             // configure and start mediaRefreshTimer
             mediaRefreshTimer.Elapsed += new ElapsedEventHandler(MediaRefresh);
-            UpdateMediaRefreshTimer(60);
+            mediaRefreshTimer.Interval = 60 * 1000;
+            mediaRefreshTimer.Enabled = true;
 
             CustomRenderer renderer = new CustomRenderer();
             MainMenuContextMenuStrip.Renderer = renderer;
@@ -151,25 +152,18 @@ private void MainToolTip_Draw(object sender, DrawToolTipEventArgs e)
         private void MediaRefresh(object source, ElapsedEventArgs e)
         {
             if (config.PROCESS_AUTO_UPDATE)
-                ProcessMedia();
-        }
-
-        private void UpdateMediaRefreshTimer(int time)
-        {
-            mediaRefreshTimer.Enabled = false;
-            mediaRefreshTimer.Interval = time * 1000;
-            mediaRefreshTimer.Enabled = true;
+                ProcessMedia(true);
         }
 
-        private void ProcessMedia()
+        private void ProcessMedia(bool autoStart)
         {
-            mediaRefreshTimer.Enabled = false;
+            if (!config.PROCESS_AUTO_UPDATE && autoStart)
+                return;
 
             if (config.SELECTION_DIRECTORIES == null || willAbort || isRunning)
-            {
-                mediaRefreshTimer.Enabled = true;
                 return;
-            }
+
+            mediaRefreshTimer.Enabled = false;
 
             Directory.CreateDirectory("Scribe\\storage\\_queue");
 
@@ -219,17 +213,17 @@ private void ProcessMedia()
                 if (willAbort)
                 {
                     willAbort = false;
-                    return;
+                    break;
                 }
 
+                isRunning = true;
+
                 string mediaQueueName = Path.GetFileNameWithoutExtension(mediaQueue[i]);
                 string mediaQueueMediaPath = File.ReadAllText(mediaQueue[i]);
 
                 if (!File.Exists(mediaQueueMediaPath) || !File.Exists(mediaQueue[i]))
                     continue;
 
-                isRunning = true;
-
                 try
                 {
                     Invoke((MethodInvoker)delegate
@@ -315,8 +309,7 @@ private void ProcessMedia()
 
             File.WriteAllText("Scribe\\latest.log", log);
 
-            if (config.PROCESS_AUTO_UPDATE)
-                UpdateMediaRefreshTimer(60);
+            mediaRefreshTimer.Enabled = true;
         }
 
         private void UpdateSearch()
@@ -512,7 +505,7 @@ private void ProcessUpdateButton_Click(object sender, EventArgs e)
             if (!isRunning)
                 willAbort = false;
 
-            Task.Run(() => ProcessMedia());
+            Task.Run(() => ProcessMedia(false));
         }
 
         private void ProcessEnableStartWithWindowsCheckBox_CheckedChanged(object sender, EventArgs e)