Round formatted bytes, display plus sign more often

Author: WumboSpasm

FlashpointInstaller/src/Common.cs

@@ -376,7 +376,7 @@ public static string GetFormattedBytes(long bytes)
                 while (--i >= 0)
                 {
                     double unitSize = Math.Pow(1024, i);
-                    if (bytes >= unitSize) return (Math.Floor(bytes / unitSize * 10) / 10).ToString("N1") + units[i];
+                    if (bytes >= unitSize) return (Math.Round(bytes / unitSize * 10) / 10).ToString("N1") + units[i];
                 }
 
                 return "0 bytes";

FlashpointManager/src/Common.cs

@@ -374,8 +374,7 @@ public static void SyncManager()
                     long sizeChange = component.Size - oldSize;
                     totalSizeChange += sizeChange;
 
-                    string displayedSize = GetFormattedBytes(sizeChange);
-                    if (displayedSize[0] != '-') displayedSize = "+" + displayedSize;
+                    string displayedSize = GetFormattedBytes(sizeChange, true);
 
                     var item = new ListViewItem();
                     item.Text = component.Title;
@@ -394,7 +393,7 @@ public static void SyncManager()
                     item.Text = component.Title;
                     item.SubItems.Add("This component is deprecated and can be deleted.");
                     item.SubItems.Add("");
-                    item.SubItems.Add(GetFormattedBytes(-component.Size));
+                    item.SubItems.Add(GetFormattedBytes(-component.Size, true));
 
                     Main.UpdateList.Items.Add(item);
                 }
@@ -406,7 +405,7 @@ public static void SyncManager()
 
                 if (ComponentTracker.Outdated.Count > 0 || ComponentTracker.Deprecated.Count > 0)
                 {
-                    Main.UpdateButton.Text += $" ({GetFormattedBytes(totalSizeChange)})";
+                    Main.UpdateButton.Text += $" ({GetFormattedBytes(totalSizeChange, true)})";
                     Main.UpdateButton.Enabled = true;
                 }
                 else
@@ -604,18 +603,24 @@ void AddDependencies(string[] depends)
             }
 
             // Formats bytes as a human-readable string
-            public static string GetFormattedBytes(long bytes)
+            public static string GetFormattedBytes(long bytes, bool plusSign = false)
             {
                 string[] units = new[] { " bytes", "KB", "MB", "GB" };
                 int i = units.Length;
 
+                string formattedBytes = "0 bytes";
+
                 while (--i >= 0)
                 {
                     double unitSize = Math.Pow(1024, i);
-                    if (Math.Abs(bytes) >= unitSize) return (Math.Floor(bytes / unitSize * 10) / 10).ToString("N1") + units[i];
+                    if (Math.Abs(bytes) >= unitSize)
+                    {
+                        formattedBytes = (Math.Round(bytes / unitSize * 10) / 10).ToString("N1") + units[i];
+                        break;
+                    }
                 }
 
-                return "0 bytes";
+                return (plusSign && !formattedBytes.StartsWith("-") ? "+" : "") + formattedBytes;
             }
 
             // Function for errors unrelated to the component list

FlashpointManager/src/Forms/Main.cs

@@ -83,7 +83,7 @@ public void ComponentList_AfterCheck(object sender, TreeViewEventArgs e)
                 ? long.Parse(File.ReadLines(component.InfoFile).First().Split(' ')[1])
                 : component.Size);
 
-            ChangeButton.Text = $"Apply changes ({FPM.GetFormattedBytes(FPM.ModifiedSize)})";
+            ChangeButton.Text = $"Apply changes ({FPM.GetFormattedBytes(FPM.ModifiedSize, true)})";
             ChangeButton.Enabled = true;
         }