Fixed reupload timer not ticking properly

Plenyx · Aug 16, 2024 · 0238f49 · 0238f49
1 parent 932a328
commit 0238f49
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 47 deletions.
diff --git a/Forms/FormMain.Designer.cs b/Forms/FormMain.Designer.cs
diff --git a/Forms/FormMain.cs b/Forms/FormMain.cs
@@ -121,6 +121,18 @@ private int LastLogPullCounter
             { "%channel%", "" },
         };
         private bool bypassCloseToTray = false;
+        private readonly System.Timers.Timer timerFailedLogsReupload = new()
+        {
+            Enabled = false,
+            Interval = 900000,
+            AutoReset = false,
+        };
+        private readonly System.Timers.Timer timerCheckUpdate = new()
+        {
+            Enabled = false,
+            Interval = 5400000,
+            AutoReset = false,
+        };
 
         // constants
         private const int minFileSize = 8192;
@@ -360,6 +372,8 @@ internal FormMain()
                 logSessionLink.checkBoxOnlySuccess.CheckedChanged += logSessionLink.CheckBoxOnlySuccess_CheckedChanged;
                 logSessionLink.checkBoxSaveToFile.CheckedChanged += logSessionLink.CheckBoxSaveToFile_CheckedChanged;
                 discordWebhooksLink.checkBoxShortenThousands.CheckedChanged += discordWebhooksLink.CheckBoxShortenThousands_CheckedChanged;
+                timerFailedLogsReupload.Elapsed += TimerFailedLogsReupload_Elapsed;
+                timerCheckUpdate.Elapsed += TimerCheckUpdate_Elapsed;
                 ApplicationSettings.Current.Save();
             }
             catch (Exception e)
@@ -558,7 +572,6 @@ protected async Task NewReleaseCheckAsync(bool appStartup = false, bool quietFai
                     {
                         AddToText(">>> Could not verify the version release.");
                     }
-                    timerCheckUpdate.Enabled = true;
                     timerCheckUpdate.Start();
                     return;
                 }
@@ -568,7 +581,6 @@ protected async Task NewReleaseCheckAsync(bool appStartup = false, bool quietFai
                     {
                         AddToText(">>> The uploader is up to date.");
                     }
-                    timerCheckUpdate.Enabled = true;
                     timerCheckUpdate.Start();
                     return;
                 }
@@ -947,9 +959,7 @@ internal async Task HandleQuickLogUploadRetry(string file, Dictionary<string, st
                     AddToText($">:> Upload retry failed 4 times for {Path.GetFileName(file)}, will try again during log reupload timer.");
                     LogReuploader.FailedLogs.Add(file);
                     LogReuploader.SaveFailedLogs();
-                    timerFailedLogsReupload.Enabled = true;
-                    timerFailedLogsReupload.Stop();
-                    timerFailedLogsReupload.Start();
+                    EnsureReuploadTimerStart();
                 }
                 else
                 {
@@ -1679,16 +1689,14 @@ private void ButtonReset_Click(object sender, EventArgs e)
             ExitApp();
         }
 
-        private void TimerCheckUpdate_Tick(object sender, EventArgs e)
+        private void TimerCheckUpdate_Elapsed(object sender, EventArgs e)
         {
-            timerCheckUpdate.Stop();
-            timerCheckUpdate.Enabled = false;
             _ = NewReleaseCheckAsync(false, true);
         }
 
-        private async void TimerFailedLogsReupload_Tick(object sender, EventArgs e)
+        private void TimerFailedLogsReupload_Elapsed(object sender, EventArgs e)
         {
-            await HandleReuploadTimerStop();
+            _ = HandleLogReuploads();
         }
 
         private void EnsureReuploadTimerStart()
@@ -1697,22 +1705,9 @@ private void EnsureReuploadTimerStart()
             {
                 return;
             }
-            timerFailedLogsReupload.Enabled = true;
-            timerFailedLogsReupload.Stop();
             timerFailedLogsReupload.Start();
         }
 
-        private async Task HandleReuploadTimerStop()
-        {
-            if (!timerFailedLogsReupload.Enabled)
-            {
-                return;
-            }
-            timerFailedLogsReupload.Enabled = false;
-            timerFailedLogsReupload.Stop();
-            await HandleLogReuploads();
-        }
-
         private async Task HandleLogReuploads()
         {
             if (LogReuploader.FailedLogs.Count == 0)

diff --git a/Forms/FormMain.resx b/Forms/FormMain.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
@@ -118,18 +118,12 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="notifyIconTray.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+    <value>15, 29</value>
   </metadata>
   <metadata name="contextMenuStripIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>165, 25</value>
   </metadata>
-  <metadata name="timerCheckUpdate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>370, 25</value>
-  </metadata>
   <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>553, 25</value>
-  </metadata>
-  <metadata name="timerFailedLogsReupload.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>661, 25</value>
+    <value>373, 28</value>
   </metadata>
 </root>