archive progress

- removed unused daemon
- renamed percent property

Author: shukriadams

src/Tetrifact.Core/ArchiveProgressInfo.cs

@@ -32,11 +32,7 @@ public class ArchiveProgressInfo
         /// <summary>
         /// 
         /// </summary>
-        public decimal FileCopyProgress { get ; set;}
-
-        public decimal CompressProgress { get; set; }
-
-        public decimal CombinedPercent { get; set; }
+        public decimal PercentProgress { get ; set;}
 
         public long ProjectedSize { get; set; }
 

src/Tetrifact.Core/ArchiveService.cs

@@ -203,6 +203,7 @@ private async Task ArchiveDotNetZip(string packageId, string archivePathTemp)
 
             _log.LogInformation($"Starting archive generation for package \"{packageId}\". Type: .Net compression. Rate : {_settings.ArchiveCompression}.");
 
+            // static progress handler, this calculates percentage from tick events returned by zip 
             ProgressEvent progressEvent = (long delta, long localTotal) => {
                 progress += delta;
                 int thisPercent = Percent.Calc(progress, total);
@@ -218,7 +219,7 @@ private async Task ArchiveDotNetZip(string packageId, string archivePathTemp)
                         };
 
                     progress.State = PackageArchiveCreationStates.ArchiveGenerating;
-                    progress.CombinedPercent = percent;
+                    progress.PercentProgress = percent;
                     _cache.Set(progressCacheKey, progress);
                 }
             };

src/Tetrifact.Core/PruneService.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Tetrifact.Core
 {

src/Tetrifact.Web/Core/Daemons/ArchiveStatusChecker.cs

@@ -78,7 +78,6 @@ public void ConfigureServices(IServiceCollection services)
             services.AddTransient<ICron, PruneCron>();
             services.AddTransient<ICron, CleanerCron>();
             services.AddTransient<ICron, ArchiveGenerator>();
-            services.AddTransient<ICron, ArchiveStatusChecker>();
 
             // ignore error, how else are we going to get an instaace of settings from this piece of crap Microsoft IOC framework?
             ISettingsProvider settingsProvider = services.BuildServiceProvider().GetRequiredService<ISettingsProvider>();

src/Tetrifact.Web/Startup.cs

@@ -32,7 +32,7 @@
         }
 
         <text>
-            @(Math.Round(Model.CombinedPercent, 0))% complete
+            @(Math.Round(Model.PercentProgress, 0))% complete
         </text>
     }