Automatic Update

Author: csbernath

DataCommander.Updater/DataCommander.Updater.csproj

@@ -46,7 +46,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Updater.cs" />
     <Compile Include="UpdaterForm.cs">
       <SubType>Form</SubType>
     </Compile>

DataCommander.Updater/Program.cs

@@ -12,13 +12,10 @@ static void Main(string[] args)
             try
             {
                 Debugger.Launch();
-                MessageBox.Show("Updating Data Commander...");
 
                 var applicationExeFileName = args[0];
-                var updater = new Updater();
-                updater.Update(applicationExeFileName);
-
-                MessageBox.Show("Data Commander updated and started.");
+                var updaterDirectory = Environment.CurrentDirectory;
+                Foundation.Deployment.Updater.Update(updaterDirectory, applicationExeFileName);
 
                 //Application.EnableVisualStyles();
                 //Application.SetCompatibleTextRenderingDefault(false);

DataCommander.Updater/Updater.cs

@@ -16,6 +16,8 @@ private void Handle(DownloadingNewVersionStarted @event) => _updaterForm.Invoke(
             _updaterForm.Log("Downloading new version...");
             Application.DoEvents();
         });
+
+        private void Handle(DownloadProgressChanged @event) => _updaterForm.Invoke(() => _updaterForm.Log($"{@event.DownloadProgressChangedEventArgs.ProgressPercentage}% complete."));
         private void Handle(NewVersionDownloaded @event) => _updaterForm.Invoke(() => _updaterForm.Log("New version downloaded."));
 
         private void Handle(CheckForUpdateCompleted @event) => _updaterForm.Invoke(() =>

DataCommander/EventHandler.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Net;
 using System.Reflection;
 using System.Threading.Tasks;
 using Foundation;
@@ -19,6 +20,16 @@ public sealed class DownloadingNewVersionStarted : Event
     {
     }
 
+    public sealed class DownloadProgressChanged : Event
+    {
+        public readonly DownloadProgressChangedEventArgs DownloadProgressChangedEventArgs;
+
+        public DownloadProgressChanged(DownloadProgressChangedEventArgs downloadProgressChangedEventArgs)
+        {
+            DownloadProgressChangedEventArgs = downloadProgressChangedEventArgs;
+        }
+    }
+
     public sealed class NewVersionDownloaded : Event
     {
     }
@@ -56,7 +67,8 @@ private async Task Handle(CheckForUpdates checkForUpdates)
                     var guid = Guid.NewGuid();
                     var updaterDirectory = Path.Combine(Path.GetTempPath(), guid.ToString());
                     var zipFileName = Path.Combine(updaterDirectory, "Updater.zip");
-                    await DeploymentApplication.DownloadUpdater(address, updaterDirectory, zipFileName);
+                    await DeploymentApplication.DownloadUpdater(address, updaterDirectory, zipFileName,
+                        args => _eventPublisher(new DownloadProgressChanged(args)));
                     _eventPublisher(new NewVersionDownloaded());
                     DeploymentApplication.ExtractZip(zipFileName, updaterDirectory);
 

DataCommander/Updater.cs

@@ -18,12 +18,36 @@ public static async Task<Version> GetRemoteVersion(Uri address)
             return new Version(text);
         }
 
-        public static async Task DownloadUpdater(Uri address, string updaterDirectory, string zipFileName)
+        public static async Task DownloadUpdater(Uri address, string updaterDirectory, string zipFileName,
+            Action<DownloadProgressChangedEventArgs> eventHandler)
         {
             Directory.CreateDirectory(updaterDirectory);
 
+            var sequence = new Sequence();
+            var previousEventTimestamp = 0;
+
             using (var webClient = new WebClient())
+            {
+                webClient.DownloadProgressChanged += (sender, args) =>
+                {
+                    if (sequence.Next() == 0)
+                    {
+                        previousEventTimestamp = UniversalTime.GetTickCount();
+                        eventHandler(args);
+                    }
+                    else
+                    {
+                        var current = UniversalTime.GetTickCount();
+                        var elapsed = current - previousEventTimestamp;
+                        if (elapsed >= 1000)
+                        {
+                            previousEventTimestamp = current;
+                            eventHandler(args);
+                        }
+                    }
+                };
                 await webClient.DownloadFileTaskAsync(address, zipFileName);
+            }
         }
 
         public static void ExtractZip(string zipFileName, string updaterDirectory)
@@ -34,10 +58,7 @@ public static void ExtractZip(string zipFileName, string updaterDirectory)
 
         public static void StartUpdater(string updaterExeFileName)
         {
-            var workingDirectory = Path.GetDirectoryName(updaterExeFileName);
-
             var processStartInfo = new ProcessStartInfo();
-            processStartInfo.WorkingDirectory = workingDirectory;
             processStartInfo.FileName = updaterExeFileName;
             processStartInfo.Arguments = $"{Quote(Environment.CurrentDirectory)}";
             Process.Start(processStartInfo);

Foundation.NetStandard-2.0/Deployment/Application.cs

@@ -16,7 +16,7 @@ public static void Update(string updaterDirectory, string applicationExeFileName
             Directory.Move(updaterDirectory, applicationDirectory);
             Directory.Delete(backupDirectory);
 
-            DeploymentCommandRepository.Save(ApplicationName, new DeleteUpdater());
+            DeploymentCommandRepository.Save(ApplicationName, new DeleteUpdater {Directory = updaterDirectory});
 
             var processStartInfo = new ProcessStartInfo();
             processStartInfo.WorkingDirectory = applicationDirectory;

Foundation.NetStandard-2.0/Deployment/Updater.cs

@@ -3,9 +3,6 @@
 
 namespace Foundation
 {
-    /// <summary>
-    /// 
-    /// </summary>
     public sealed class UniversalTime : IDateTimeProvider
     {
         private static volatile int _sharedTickCount;
@@ -42,20 +39,10 @@ public UniversalTime(int increment, int adjustment)
             _incrementedDateTime = _sharedDateTime;
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
         public static int TickCount => _sharedTickCount;
 
-        /// <summary>
-        /// 
-        /// </summary>
         public static UniversalTime Default { get; } = new UniversalTime(increment: 16, adjustment: 60 * 1000);
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
         public static int GetTickCount()
         {
             _sharedTickCount = Environment.TickCount;
@@ -77,14 +64,10 @@ public DateTime UtcNow
                     {
                         var calculatedDateTime = _incrementedDateTime.AddMilliseconds(elapsed);
                         if (_sharedDateTime < calculatedDateTime)
-                        {
                             _sharedDateTime = calculatedDateTime;
-                        }
                     }
                     else
-                    {
                         _sharedDateTime = DateTime.UtcNow;
-                    }
 
                     _incrementedTickCount = _sharedTickCount;
                     _incrementedDateTime = _sharedDateTime;