agilize updater by reopening spcode with a success message

maxijabase · maxijabase · commit c53e9cb9ae89 · 2021-12-26T02:19:10.000-03:00
diff --git a/Deploy/SpcodeUpdater/Program.cs b/Deploy/SpcodeUpdater/Program.cs
@@ -11,8 +11,7 @@ namespace SPCodeUpdater
 {
     public static class Program
     {
-        public delegate void InvokeDel();
-
+        private static bool Success;
         [STAThread]
         public static void Main()
         {
@@ -82,12 +81,21 @@ private static void Worker(object arg)
                         }
                     }
                 }
-
-                um.Invoke((InvokeDel)(() => { um.SetToReadyState(); }));
+                Success = true;
             }
             catch (Exception ex)
             {
                 MessageBox.Show($"The updater failed to update SPCode properly: {ex.Message}");
+                Success = false;
+            }
+            finally
+            {
+                Process.Start(new ProcessStartInfo
+                {
+                    Arguments = $"/C SPCode.exe {(Success ? "--updated" : string.Empty)}",
+                    FileName = "cmd",
+                    WindowStyle = ProcessWindowStyle.Hidden
+                });
                 Application.Exit();
             }
         }
diff --git a/Deploy/SpcodeUpdater/UpdateMarquee.Designer.cs b/Deploy/SpcodeUpdater/UpdateMarquee.Designer.cs
diff --git a/Deploy/SpcodeUpdater/UpdateMarquee.cs b/Deploy/SpcodeUpdater/UpdateMarquee.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Windows.Forms;
+﻿using System.Windows.Forms;
 
 namespace SPCodeUpdater
 {
@@ -9,18 +8,5 @@ public UpdateMarquee()
         {
             InitializeComponent();
         }
-
-        public void SetToReadyState()
-        {
-            label1.Text = "SPCode got updated!";
-            progressBar1.Visible = false;
-            button1.Visible = true;
-            UseWaitCursor = false;
-        }
-
-        private void Button1_Click(object sender, EventArgs e)
-        {
-            Close();
-        }
     }
 }
diff --git a/Deploy/SpcodeUpdater/UpdateMarquee.resx b/Deploy/SpcodeUpdater/UpdateMarquee.resx
@@ -126,7 +126,7 @@
     <value>12, 23</value>
   </data>
   <data name="progressBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>200, 23</value>
+    <value>276, 23</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="progressBar1.TabIndex" type="System.Int32, mscorlib">
@@ -142,7 +142,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;progressBar1.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>1</value>
   </data>
   <data name="label1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -172,33 +172,6 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="button1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>218, 23</value>
-  </data>
-  <data name="button1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
-  <data name="button1.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="button1.Text" xml:space="preserve">
-    <value>Close</value>
-  </data>
-  <data name="button1.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="&gt;&gt;button1.Name" xml:space="preserve">
-    <value>button1</value>
-  </data>
-  <data name="&gt;&gt;button1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;button1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;button1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
diff --git a/UI/MainWindow/MainWindow.xaml.cs b/UI/MainWindow/MainWindow.xaml.cs
@@ -147,6 +147,10 @@ public MainWindow(SplashScreen sc)
                 {
                     TryLoadSourceFile(args[i], out _, false, true, i == 0);
                 }
+                if (args[i].ToLowerInvariant() == "--updated")
+                {
+                    this.ShowMessageAsync("Update completed", "SPCode has been updated successfully.");
+                }
             }
 
             // Close SplashScreen

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,7 @@ namespace SPCodeUpdater`
`11`	`11`	`{`
`12`	`12`	`public static class Program`
`13`	`13`	`{`
`14`		`- public delegate void InvokeDel();`
`15`		`-`
	`14`	`+ private static bool Success;`
`16`	`15`	`[STAThread]`
`17`	`16`	`public static void Main()`
`18`	`17`	`{`
`@@ -82,12 +81,21 @@ private static void Worker(object arg)`
`82`	`81`	`}`
`83`	`82`	`}`
`84`	`83`	`}`
`85`		`-`
`86`		`- um.Invoke((InvokeDel)(() => { um.SetToReadyState(); }));`
	`84`	`+ Success = true;`
`87`	`85`	`}`
`88`	`86`	`catch (Exception ex)`
`89`	`87`	`{`
`90`	`88`	`MessageBox.Show($"The updater failed to update SPCode properly: {ex.Message}");`
	`89`	`+ Success = false;`
	`90`	`+ }`
	`91`	`+ finally`
	`92`	`+ {`
	`93`	`+ Process.Start(new ProcessStartInfo`
	`94`	`+ {`
	`95`	`+ Arguments = $"/C SPCode.exe {(Success ? "--updated" : string.Empty)}",`
	`96`	`+ FileName = "cmd",`
	`97`	`+ WindowStyle = ProcessWindowStyle.Hidden`
	`98`	`+ });`
`91`	`99`	`Application.Exit();`
`92`	`100`	`}`
`93`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Windows.Forms;`
	`1`	`+using System.Windows.Forms;`
`3`	`2`
`4`	`3`	`namespace SPCodeUpdater`
`5`	`4`	`{`
`@@ -9,18 +8,5 @@ public UpdateMarquee()`
`9`	`8`	`{`
`10`	`9`	`InitializeComponent();`
`11`	`10`	`}`
`12`		`-`
`13`		`- public void SetToReadyState()`
`14`		`- {`
`15`		`- label1.Text = "SPCode got updated!";`
`16`		`- progressBar1.Visible = false;`
`17`		`- button1.Visible = true;`
`18`		`- UseWaitCursor = false;`
`19`		`- }`
`20`		`-`
`21`		`- private void Button1_Click(object sender, EventArgs e)`
`22`		`- {`
`23`		`- Close();`
`24`		`- }`
`25`	`11`	`}`
`26`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,10 @@ public MainWindow(SplashScreen sc)`
`147`	`147`	`{`
`148`	`148`	`TryLoadSourceFile(args[i], out _, false, true, i == 0);`
`149`	`149`	`}`
	`150`	`+ if (args[i].ToLowerInvariant() == "--updated")`
	`151`	`+ {`
	`152`	`+ this.ShowMessageAsync("Update completed", "SPCode has been updated successfully.");`
	`153`	`+ }`
`150`	`154`	`}`
`151`	`155`
`152`	`156`	`// Close SplashScreen`