manual updating in about window

MemeLabs · Jun 1, 2021 · 7ae1cda · 7ae1cda
1 parent 60e1054
commit 7ae1cda
Show file tree

Hide file tree

Showing 4 changed files with 149 additions and 30 deletions.
diff --git a/anidow/Bootstrapper.cs b/anidow/Bootstrapper.cs
@@ -33,9 +33,6 @@
 #if RELEASE
 using System.IO;
 using System.Windows.Threading;
-using Onova;
-using Onova.Models;
-using Onova.Services;
 
 using MessageBox = AdonisUI.Controls.MessageBox;
 using MessageBoxImage = AdonisUI.Controls.MessageBoxImage;
@@ -50,13 +47,15 @@ public class Bootstrapper : Bootstrapper<ShellViewModel>
         private ILogger _logger;
         private TaskbarIcon _taskBarIcon;
         private ShellView _shell;
+        private UpdateManager _updateManager;
 
         // Configure the IoC container in here
         protected override void ConfigureIoC(IStyletIoCBuilder builder)
         {
             builder.Bind<Assembly>().ToInstance(Assembly.GetExecutingAssembly());
             var tracker = InitTracker();
             builder.Bind<Tracker>().ToInstance(tracker);
+
 
             var logViewModel = new LogViewModel();
             InitLogger(logViewModel);
@@ -80,6 +79,10 @@ protected override void ConfigureIoC(IStyletIoCBuilder builder)
 
             _httpClient = InitHttpClient();
             builder.Bind<HttpClient>().ToInstance(_httpClient);
+
+            _updateManager = new UpdateManager(_httpClient);
+            builder.Bind<UpdateManager>().ToInstance(_updateManager);
+
             _shell = new ShellView(tracker);
             if (Args.Length > 0 && Args[0] == "/autostart")
             {
@@ -208,7 +211,6 @@ protected override async void Configure()
             JobManager.JobException += info =>
                 _logger.Error(info.Exception, "An error just happened with a scheduled job");
 
-
             var selfContained = false;
 #if SELF_CONTAINED && RELEASE
             selfContained = true;
@@ -219,34 +221,15 @@ protected override async void Configure()
 #if RELEASE
             try
             {
-                var manager = new UpdateManager(
-                    AssemblyMetadata.FromAssembly(
-                        Assembly.GetEntryAssembly(),
-                        System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName),
-                    new GithubPackageResolver(
-                        _httpClient,
-                        "MemeLabs",
-                        "Anidow",
-                        selfContained ? "anidow-full.zip" : "anidow.zip"),
-                    new ZipPackageExtractor());
-
-                var check = await manager.CheckForUpdatesAsync();
-                if (!check.CanUpdate || check.LastVersion == null)
+                var (check, hasUpdate) = await _updateManager.HasUpdate();
+                if (hasUpdate && check != null)
                 {
-                    return;
+                    await _updateManager.Update(check);
                 }
-
-                // Prepare the latest update
-                await manager.PrepareUpdateAsync(check.LastVersion);
-
-                // Launch updater and exit
-                manager.LaunchUpdater(check.LastVersion);
-
-                Environment.Exit(0);
             }
             catch (Exception e)
             {
-                _logger.Error(e, "failed updating the app");
+                _logger.Error(e, "failed updating anidow");
             }
 #endif
         }

diff --git a/anidow/Helpers/UpdateManager.cs b/anidow/Helpers/UpdateManager.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Onova;
+using Onova.Models;
+using Onova.Services;
+
+namespace Anidow.Helpers
+{
+    public class UpdateManager
+    {
+        private readonly Onova.UpdateManager _updateManager;
+
+        public UpdateManager(HttpClient httpClient)
+        {
+            var selfContained = false;
+#if SELF_CONTAINED && RELEASE
+            selfContained = true;
+#endif
+            _updateManager = new Onova.UpdateManager(
+                AssemblyMetadata.FromAssembly(
+                    Assembly.GetEntryAssembly(),
+                    System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName),
+                new GithubPackageResolver(
+                    httpClient,
+                    "MemeLabs",
+                    "Anidow",
+                    selfContained ? "anidow-full.zip" : "anidow.zip"),
+                new ZipPackageExtractor());
+
+        }
+
+        public async Task<(CheckForUpdatesResult, bool)> HasUpdate()
+        {
+            var check = await _updateManager.CheckForUpdatesAsync();
+            if (!check.CanUpdate || check.LastVersion == null)
+            {
+                return (null, false);
+            }
+
+            return (check, true);
+        }
+
+        public async Task Update(CheckForUpdatesResult check)
+        {
+
+            // Prepare the latest update
+            await _updateManager.PrepareUpdateAsync(check.LastVersion);
+
+            // Launch updater and exit
+            _updateManager.LaunchUpdater(check.LastVersion);
+
+            Environment.Exit(0);
+        }
+    }
+}
diff --git a/anidow/Pages/AboutView.xaml b/anidow/Pages/AboutView.xaml
@@ -18,13 +18,14 @@
     mc:Ignorable="d">
     <Grid Margin="4">
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <Grid>
             <DockPanel HorizontalAlignment="Center">
                 <TextBlock
-                    Margin="0,0,0,16"
+                    Margin="0,0,0,8"
                     DockPanel.Dock="Bottom"
                     TextAlignment="Center">
                     <Run Text="Author: Tensei C." />
@@ -47,7 +48,34 @@
             </DockPanel>
         </Grid>
 
-        <Grid Grid.Row="1">
+        <Grid
+            Grid.Row="1"
+            Margin="0,0,0,4"
+            HorizontalAlignment="Center">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+
+            <TextBlock Margin="0,0,0,4" Text="{Binding UpdateMessage}"/>
+            <Button
+                Visibility="{Binding HasUpdate, Converter={x:Static s:BoolToVisibilityConverter.InverseInstance}}"
+                Grid.Row="1"
+                HorizontalAlignment="Center"
+                Command="{s:Action CheckForUpdate,
+                                   ActionNotFound=Disable}"
+                Content="Check for Updates" />
+            <Button
+                HorizontalAlignment="Center"
+                Visibility="{Binding HasUpdate, Converter={x:Static s:BoolToVisibilityConverter.Instance}}"
+                Grid.Row="1"
+                Command="{s:Action UpdateNow,
+                                   ActionNotFound=Disable}"
+                Content="Update now" />
+
+        </Grid>
+
+        <Grid Grid.Row="2">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />

diff --git a/anidow/Pages/AboutViewModel.cs b/anidow/Pages/AboutViewModel.cs
@@ -2,20 +2,30 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Threading.Tasks;
+using Anidow.Helpers;
 using Anidow.Model;
 using Anidow.Utils;
+using Humanizer;
 using Newtonsoft.Json;
+using Onova.Models;
+using Serilog;
 using Stylet;
 
 namespace Anidow.Pages
 {
     public class AboutViewModel : Screen
     {
         private readonly Assembly _assembly;
+        private readonly UpdateManager _updateManager;
+        private readonly ILogger _logger;
+        private CheckForUpdatesResult _lastCheck;
 
-        public AboutViewModel(Assembly assembly)
+        public AboutViewModel(Assembly assembly, UpdateManager updateManager, ILogger logger)
         {
             _assembly = assembly;
+            _updateManager = updateManager;
+            _logger = logger;
             DisplayName = "About";
             var licenses = assembly.GetManifestResourceNames().Single(p => p.EndsWith("licenses.json"));
             using var stream = assembly.GetManifestResourceStream(licenses);
@@ -30,10 +40,48 @@ public AboutViewModel(Assembly assembly)
         public string ProjectUrl => "https://github.com/MemeLabs/Anidow";
         public string AssemblyVersionString => $"{_assembly.GetName().Version} {(Environment.Is64BitProcess ? "(x64)" : "(x32)")}";
         public string Product => "Anidow";
+        public string UpdateMessage { get; private set; }
+        public bool HasUpdate { get; private set; }
+
+        protected override async void OnInitialActivate()
+        {
+            await CheckForUpdate();
+        }
 
         public void OpenProjectUrl()
         {
             LinkUtil.Open(ProjectUrl);
         }
+
+        public bool CanCheckForUpdate { get; set; } = true;
+        public async Task CheckForUpdate()
+        {
+            CanCheckForUpdate = false;
+            var (check, hasUpdate) = await _updateManager.HasUpdate();
+            if (!hasUpdate)
+            {
+                UpdateMessage = $"You have the latest version";
+            }
+            else if (check is not null)
+            {
+                HasUpdate = true;
+                UpdateMessage = $"New version is out (v{check.LastVersion})";
+                _lastCheck = check;
+            }
+
+            CanCheckForUpdate = true;
+        }
+
+        public async Task UpdateNow()
+        {
+            try
+            {
+                await _updateManager.Update(_lastCheck);
+            }
+            catch (Exception e)
+            {
+                _logger.Error(e, "failed updating anidow");
+            }
+        }
     }
 }