This should fix the bug where it can't deal with an optimizer running…

… for more then 60 hours
devedse · Jul 28, 2020 · f3b54a5 · f3b54a5
1 parent cd9b5ac
commit f3b54a5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 41 deletions.
diff --git a/WebOptimizationProject/Helpers/TemplatesHandler.cs b/WebOptimizationProject/Helpers/TemplatesHandler.cs
@@ -1,4 +1,5 @@
-using DeveImageOptimizer;
+using DeveCoolLib.Conversion;
+using DeveImageOptimizer;
 using DeveImageOptimizer.State;
 using System;
 using System.Collections.Generic;
@@ -46,11 +47,11 @@ public static string GetCommitDescriptionForPullRequest(string clonedRepoPath, s
             templateText = templateText.Replace("{FilesOptimizedSuccessfully}", optimizedFileResults.Count(t => t.OptimizationResult == OptimizationResult.Success).ToString());
             templateText = templateText.Replace("{FilesAlreadyOptimized}", optimizedFileResults.Count(t => t.OptimizationResult == OptimizationResult.Skipped).ToString());
             templateText = templateText.Replace("{FilesFailedOptimization}", optimizedFileResults.Count(t => t.OptimizationResult == OptimizationResult.Failed).ToString());
-            templateText = templateText.Replace("{TotalBytesBefore}", UomHelper.BytesToString(totalBytesBefore));
-            templateText = templateText.Replace("{TotalBytesAfter}", UomHelper.BytesToString(totalBytesAfter));
+            templateText = templateText.Replace("{TotalBytesBefore}", ValuesToStringHelper.BytesToString(totalBytesBefore));
+            templateText = templateText.Replace("{TotalBytesAfter}", ValuesToStringHelper.BytesToString(totalBytesAfter));
             templateText = templateText.Replace("{PercentageRemaining}", $"{percentageRemaining}%");
-            templateText = templateText.Replace("{TotalBytesSaved}", UomHelper.BytesToString(totalBytesSaved));
-            templateText = templateText.Replace("{OptimizationDuration}", UomHelper.SecondsToString((long)timeSpan.TotalSeconds));
+            templateText = templateText.Replace("{TotalBytesSaved}", ValuesToStringHelper.BytesToString(totalBytesSaved));
+            templateText = templateText.Replace("{OptimizationDuration}", ValuesToStringHelper.SecondsToString((long)timeSpan.TotalSeconds));
 
             var optimizedFilesTable = new StringBuilder();
 
@@ -75,10 +76,10 @@ public static string GetCommitDescriptionForPullRequest(string clonedRepoPath, s
                     fileName = $"[{fileName}]({relativeGitPath})";
                 }
 
-                var originalSize = UomHelper.BytesToString(fileResult.OriginalSize);
-                var optimizedSize = UomHelper.BytesToString(fileResult.OptimizedSize);
-                var bytesSaved = UomHelper.BytesToString(fileResult.OriginalSize - fileResult.OptimizedSize);
-                optimizedFilesTable.AppendLine($"{fileName} | {originalSize} | {optimizedSize} | {bytesSaved} | {UomHelper.SecondsToString((long)fileResult.Duration.TotalSeconds)} | {fileResult.OptimizationResult}");
+                var originalSize = ValuesToStringHelper.BytesToString(fileResult.OriginalSize);
+                var optimizedSize = ValuesToStringHelper.BytesToString(fileResult.OptimizedSize);
+                var bytesSaved = ValuesToStringHelper.BytesToString(fileResult.OriginalSize - fileResult.OptimizedSize);
+                optimizedFilesTable.AppendLine($"{fileName} | {originalSize} | {optimizedSize} | {bytesSaved} | {ValuesToStringHelper.SecondsToString((long)fileResult.Duration.TotalSeconds)} | {fileResult.OptimizationResult}");
             }
 
             templateText = templateText.Replace("{OptimizedFiles}", optimizedFilesTable.ToString());

diff --git a/WebOptimizationProject/Helpers/UomHelper.cs b/WebOptimizationProject/Helpers/UomHelper.cs
diff --git a/WebOptimizationProject/WebOptimizationProject.csproj b/WebOptimizationProject/WebOptimizationProject.csproj
@@ -15,7 +15,8 @@
 
   <ItemGroup>
     <PackageReference Include="AdysTech.CredentialManager" Version="2.2.0" />
-    <PackageReference Include="DeveImageOptimizer" Version="1.0.348" />
+    <PackageReference Include="DeveCoolLib" Version="1.0.40" />
+    <PackageReference Include="DeveImageOptimizer" Version="1.0.349" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Octokit" Version="0.48.0" />
   </ItemGroup>