diff --git a/WebOptimizationProject/Helpers/TemplatesHandler.cs b/WebOptimizationProject/Helpers/TemplatesHandler.cs index dfea44b..957e5e1 100644 --- 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 deleted file mode 100644 index ed49139..0000000 --- a/WebOptimizationProject/Helpers/UomHelper.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; - -namespace WebOptimizationProject.Helpers -{ - public static class UomHelper - { - public static String BytesToString(long byteCount) - { - string[] suf = { "B", "KB", "MB", "GB", "TB", "PB", "EB" }; //Longs run out around EB - if (byteCount == 0) - return "0" + suf[0]; - long bytes = Math.Abs(byteCount); - int place = Convert.ToInt32(Math.Floor(Math.Log(bytes, 1024))); - double num = Math.Round(bytes / Math.Pow(1024, place), 1); - var theNumber = Math.Sign(byteCount) * num; - return $"{theNumber}{suf[place]}"; - } - - public static String SecondsToString(long seconds) - { - string[] suf = { "Second", "Minute", "Hour" }; - if (seconds == 0) - return "0 " + suf[0]; - long bytes = Math.Abs(seconds); - int place = Convert.ToInt32(Math.Floor(Math.Log(bytes, 60))); - double num = Math.Round(bytes / Math.Pow(60, place), 1); - var theNumber = Math.Sign(seconds) * num; - return $"{theNumber} {suf[place]}{(num == 1 ? "" : "s")}"; - } - } -} diff --git a/WebOptimizationProject/WebOptimizationProject.csproj b/WebOptimizationProject/WebOptimizationProject.csproj index 127410f..d0e4c0a 100644 --- a/WebOptimizationProject/WebOptimizationProject.csproj +++ b/WebOptimizationProject/WebOptimizationProject.csproj @@ -15,7 +15,8 @@ - + +