Merge pull request #21 from adrianmteo/develop

Fix auto updater cached file after update
adrianmteo · Mar 20, 2020 · d8671f4 · d8671f4
2 parents 7b2c726 + dc2ba12
commit d8671f4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/Luna/Properties/AssemblyInfo.cs b/Luna/Properties/AssemblyInfo.cs
@@ -49,6 +49,6 @@
 // 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.1.1.0")]
-[assembly: AssemblyFileVersion("1.1.1.0")]
+[assembly: AssemblyVersion("1.1.2.0")]
+[assembly: AssemblyFileVersion("1.1.2.0")]
 [assembly: Guid("7FDBD0F5-0E11-4048-8C62-A5F64BB878AF")]
diff --git a/Luna/Utils/AutoFileSaver.cs b/Luna/Utils/AutoFileSaver.cs
@@ -62,6 +62,18 @@ public void ReloadFromDisk()
             }
         }
 
+        public void DeleteFromDisk()
+        {
+            try
+            {
+                File.Delete(Path);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error(ex.Message);
+            }
+        }
+
         private void Model_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (ReadOnly)

diff --git a/Luna/Utils/AutoUpdater.cs b/Luna/Utils/AutoUpdater.cs
@@ -1,6 +1,7 @@
 using Luna.Models;
 using Luna.Utils.Logger;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -55,7 +56,9 @@ public AutoUpdater(bool autoUpdate = false, bool noStart = false)
             AutoUpdate = autoUpdate;
             NoStart = noStart;
 
-            if (Model.Status == UpdateStatus.Checking || Model.Status == UpdateStatus.Downloading || Model.Status == UpdateStatus.Error)
+            List<UpdateStatus> resetStatuses = new List<UpdateStatus>() { UpdateStatus.Checking, UpdateStatus.Downloading, UpdateStatus.Error };
+
+            if (resetStatuses.Contains(Model.Status))
             {
                 Model.Status = UpdateStatus.None;
             }
@@ -169,9 +172,14 @@ public void InstallUpdate()
             if (!File.Exists(Model.DownloadPath))
             {
                 Logger.Warning("Update file was not found at '{0}'", Model.DownloadPath);
+
+                Model.Status = UpdateStatus.Error;
+
                 return;
             }
 
+            _autoSaver.DeleteFromDisk();
+
             Logger.Info("Staring update file at '{0}'", Model.DownloadPath);
 
             try

diff --git a/Luna/Windows/UpdateWindow.xaml b/Luna/Windows/UpdateWindow.xaml
@@ -27,11 +27,7 @@
             </StackPanel>
         </DataTemplate>
         <DataTemplate x:Key="NoUpdateTemplate">
-            <Label Padding="0">
-                <TextBlock>
-                    No new updates found. Last check was <Run Text="{Binding LastCheck}" />.
-                </TextBlock>
-            </Label>
+            <Label Padding="0" Content="No new updates found" />
         </DataTemplate>
         <DataTemplate x:Key="NewUpdateTemplate">
             <StackPanel>
@@ -66,7 +62,7 @@
         </DataTemplate>
         <DataTemplate x:Key="ErrorView">
             <StackPanel>
-                <Label Content="An error has occured. Check logs" />
+                <Label Content="An error has occured. Please check logs for more info." />
                 <Button Content="Try Again" HorizontalAlignment="Right" Click="CheckButton_Click" />
             </StackPanel>
         </DataTemplate>