Merge branch 'gaksen-master'

extesy · Sep 24, 2017 · 359d97f · 359d97f
2 parents 958171f + e892b70
commit 359d97f
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 15 deletions.
diff --git a/DeckTracker/App.xaml.cs b/DeckTracker/App.xaml.cs
@@ -6,9 +6,6 @@
 using DeckTracker.LowLevel;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-#if !DEBUG
-using Squirrel;
-#endif
 
 namespace DeckTracker
 {
@@ -47,8 +44,8 @@ protected override void OnStartup(StartupEventArgs e)
             }
             GameMessageDispatcher.Start();
             ProcessMonitor.Start();
-#if !DEBUG
-            Update();
+#if !DEBUG            
+            UpdateManager.StartUpdateCheck();
 #endif
         }
 
@@ -70,15 +67,5 @@ protected override void OnExit(ExitEventArgs e)
             base.OnExit(e);
         }
 
-#if !DEBUG
-        private static async void Update()
-        {
-            try {
-                using (var updateManager = await UpdateManager.GitHubUpdateManager("https://github.com/extesy/DeckTracker"))
-                    await updateManager.UpdateApp();
-            } catch {
-            }
-        }
-#endif
     }
 }
diff --git a/DeckTracker/DeckTracker.csproj b/DeckTracker/DeckTracker.csproj
@@ -101,6 +101,7 @@
     <Compile Include="Domain\Deck.cs" />
     <Compile Include="Domain\Game.cs" />
     <Compile Include="Properties\AssemblyCommonInfo.cs" />
+    <Compile Include="UpdateManager.cs" />
     <Compile Include="Windows\ImportDeckDialog.xaml.cs">
       <DependentUpon>ImportDeckDialog.xaml</DependentUpon>
     </Compile>

diff --git a/DeckTracker/UpdateManager.cs b/DeckTracker/UpdateManager.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Threading.Tasks;
+using Squirrel;
+using System.Reflection;
+using DeckTracker.LowLevel;
+
+namespace DeckTracker
+{
+    public static class UpdateManager
+    {
+        private const string UpdateUrl = "https://github.com/extesy/DeckTracker";
+
+        public delegate void OnNewVersionHandler(string newVersion);
+        public static event OnNewVersionHandler OnNewVersion;   
+
+        private static async void CheckForUpdate()
+        {
+            try {
+                string currentVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString(3);
+                using (var updateManager = await Squirrel.UpdateManager.GitHubUpdateManager(UpdateUrl)) {
+                    var updateInfo = await updateManager.CheckForUpdate();
+                    string newVersion = updateInfo.FutureReleaseEntry.Version.ToString();
+                    if (!newVersion.Equals(currentVersion)) {
+                        Logger.LogDebug(Domain.GameType.Eternal, $"Started update to version {newVersion}");                        
+                        await updateManager.UpdateApp();
+                        Logger.LogDebug(Domain.GameType.Eternal, $"Updated to version {newVersion}");
+                        OnNewVersion?.Invoke(newVersion);
+                    }
+                }
+            } catch (Exception e) {
+                Logger.LogError(e.ToString());
+            }
+        }
+
+        public static async void StartUpdateCheck()
+        {
+            while (true) {
+                CheckForUpdate();
+                await Task.Delay(TimeSpan.FromHours(1.0));                
+            }
+        }
+    }
+}
diff --git a/DeckTracker/Windows/MainWindow.xaml b/DeckTracker/Windows/MainWindow.xaml
@@ -17,6 +17,11 @@
             <Button Content="Report bugs" Click="ReportBugs_OnClick" ToolTip="https://github.com/extesy/decktracker/issues" />
         </controls:WindowCommands>
     </controls:MetroWindow.RightWindowCommands>
+    <controls:MetroWindow.LeftWindowCommands>
+        <controls:WindowCommands>
+            <Button x:Name="RestartButton" Content="New version is available. Restart?" Click="Restart_OnClick" ToolTip="Restart and update Universal Deck Tracker"/>
+        </controls:WindowCommands>
+    </controls:MetroWindow.LeftWindowCommands>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="30" />

diff --git a/DeckTracker/Windows/MainWindow.xaml.cs b/DeckTracker/Windows/MainWindow.xaml.cs
@@ -289,6 +289,21 @@ public MainWindow()
                 ExportCollectionButton.IsEnabled = injectionState == InjectionState.Injected;
                 ImportDeckButton.IsEnabled = injectionState == InjectionState.Injected;
             };
+
+            LeftWindowCommands.Visibility = Visibility.Collapsed;
+            UpdateManager.OnNewVersion += newVersion => Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() => OnNewVersion(newVersion)));
+        }
+
+        private void OnNewVersion(string newVersion)
+        {
+            LeftWindowCommands.Visibility = Visibility.Visible;
+            RestartButton.Content = $"New version {newVersion} is available. Restart the tracker?";
+        }
+
+        private void Restart_OnClick(object sender, RoutedEventArgs e)
+        {
+            Process.Start(Application.ResourceAssembly.Location);
+            Application.Current.Shutdown();
         }
 
         private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)