Merge branch 'develop'

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);
                 }
             };
@@ -228,7 +229,7 @@ private async Task ArchiveDotNetZip(string packageId, string archivePathTemp)
             {
                 // Note : no null check here, we assume DoesPackageExist test above would catch invalid names
                 Manifest manifest = _indexReader.GetManifest(packageId);
-                total = manifest.SizeOnDisk;
+                total = manifest.Size;
 
                 using (ZipArchive archive = new ZipArchive(zipStream, ZipArchiveMode.Create, true))
                 {
@@ -248,10 +249,10 @@ private async Task ArchiveDotNetZip(string packageId, string archivePathTemp)
                                 {
                                     ZipArchiveEntry storageArchiveEntry = storageArchive.Entries[0];
                                     using (var storageArchiveStream = storageArchiveEntry.Open()) 
-                                    {
-                                        StreamProgressCopy copy = new StreamProgressCopy(storageArchiveStream, zipStream, copyStepSize);
-                                        copy.OnProgress += progressEvent;
-                                        await copy.Work();
+                                    {
+                                        StreamProgressCopy copy = new StreamProgressCopy(storageArchiveStream, zipEntryStream, copyStepSize);
+                                        copy.OnProgress += progressEvent;
+                                        await copy.Work();
                                     }
                                 }
                             }
@@ -263,7 +264,7 @@ private async Task ArchiveDotNetZip(string packageId, string archivePathTemp)
 
                                 using (Stream fileStream = fileLookup.Content)
                                 {
-                                    StreamProgressCopy copy = new StreamProgressCopy(fileStream,zipStream, copyStepSize);
+                                    StreamProgressCopy copy = new StreamProgressCopy(fileStream, zipEntryStream, copyStepSize);
                                     copy.OnProgress += progressEvent;
                                     await copy.Work();
                                 }

src/Tetrifact.Core/Percent.cs

@@ -11,6 +11,10 @@ public class Percent
         /// <returns></returns>
         public static int Calc(decimal first, decimal second)
         {
+            // overflow check
+            if (second == 0)
+                return 0;
+
             decimal p = first / second;
             return (int)System.Math.Round((decimal)(p * 100), 0);
         }
@@ -23,6 +27,10 @@ public static int Calc(decimal first, decimal second)
         /// <returns></returns>
         public static int Calc(double first, double second)
         {
+            // overflow check
+            if (second == 0)
+                return 0;
+
             double p = first / second;
             return (int)System.Math.Round((double)(p * 100), 0);
         }

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

@@ -77,7 +77,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>
     }
 

src/Tetrifact.Web/Views/Shared/ArchiveProgress.cshtml

@@ -31,6 +31,7 @@
     item_path = os.path.join(work_dir, filename)
 
     try:
+        print(f'Attempting to remove {item_path}')
 
         if os.path.isfile(item_path):
             os.unlink(item_path)