settings: always use binary count for size formats

Fixes #4396
utmapp · Nov 27, 2022 · fe386ff · fe386ff
1 parent 88fad76
commit fe386ff
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/Configuration/UTMAppleConfigurationDrive.swift b/Configuration/UTMAppleConfigurationDrive.swift
@@ -48,7 +48,7 @@ struct UTMAppleConfigurationDrive: UTMConfigurationDrive {
         } else {
             sizeBytes = Int64(sizeMib) * Int64(bytesInMib)
         }
-        return ByteCountFormatter.string(fromByteCount: sizeBytes, countStyle: .file)
+        return ByteCountFormatter.string(fromByteCount: sizeBytes, countStyle: .binary)
     }
 
     init(newSize: Int) {

diff --git a/Managers/UTMAppleVirtualMachine.swift b/Managers/UTMAppleVirtualMachine.swift
@@ -48,7 +48,7 @@ import Virtualization
 
     @MainActor override var detailsSystemMemoryLabel: String {
         let bytesInMib = Int64(1048576)
-        return ByteCountFormatter.string(fromByteCount: Int64(appleConfig.system.memorySize) * bytesInMib, countStyle: .memory)
+        return ByteCountFormatter.string(fromByteCount: Int64(appleConfig.system.memorySize) * bytesInMib, countStyle: .binary)
     }
 
     override var hasSaveState: Bool {

diff --git a/Managers/UTMPendingVirtualMachine.swift b/Managers/UTMPendingVirtualMachine.swift
@@ -97,13 +97,13 @@ import Foundation
         lastDownloadSpeedUpdate = Date()
         let bytesPerSecond = bytesWrittenSinceLastDownloadSpeedUpdate
         bytesWrittenSinceLastDownloadSpeedUpdate = 0
-        let bytesString = ByteCountFormatter.string(fromByteCount: bytesPerSecond, countStyle: .file)
+        let bytesString = ByteCountFormatter.string(fromByteCount: bytesPerSecond, countStyle: .binary)
         let speedFormat = NSLocalizedString("%@/s",
                                             comment: "Format string for the 'per second' part of a download speed.")
         estimatedDownloadSpeed = String.localizedStringWithFormat(speedFormat, bytesString)
         /// sizes
-        downloadedSize = ByteCountFormatter.string(fromByteCount: totalBytesWritten, countStyle: .file)
-        estimatedDownloadSize = ByteCountFormatter.string(fromByteCount: totalBytesExpectedToWrite, countStyle: .file)
+        downloadedSize = ByteCountFormatter.string(fromByteCount: totalBytesWritten, countStyle: .binary)
+        estimatedDownloadSize = ByteCountFormatter.string(fromByteCount: totalBytesExpectedToWrite, countStyle: .binary)
     }
 
     public func setDownloadProgress(new newBytesWritten: Int64, currentTotal totalBytesWritten: Int64, estimatedTotal totalBytesExpectedToWrite: Int64) {

diff --git a/Managers/UTMQemuVirtualMachine.swift b/Managers/UTMQemuVirtualMachine.swift
@@ -44,7 +44,7 @@ public extension UTMQemuVirtualMachine {
 
     @MainActor override var detailsSystemMemoryLabel: String {
         let bytesInMib = Int64(1048576)
-        return ByteCountFormatter.string(fromByteCount: Int64(qemuConfig.system.memorySize) * bytesInMib, countStyle: .memory)
+        return ByteCountFormatter.string(fromByteCount: Int64(qemuConfig.system.memorySize) * bytesInMib, countStyle: .binary)
     }
 
     /// Check if a QEMU target is supported

diff --git a/Platform/Shared/VMConfigDriveDetailsView.swift b/Platform/Shared/VMConfigDriveDetailsView.swift
@@ -78,9 +78,9 @@ struct VMConfigDriveDetailsView: View {
             }
 
             if let imageUrl = config.imageURL, let fileSize = data.computeSize(for: imageUrl) {
-                DefaultTextField("Size", text: .constant(ByteCountFormatter.string(fromByteCount: fileSize, countStyle: .file))).disabled(true)
+                DefaultTextField("Size", text: .constant(ByteCountFormatter.string(fromByteCount: fileSize, countStyle: .binary))).disabled(true)
             } else if config.sizeMib > 0 {
-                DefaultTextField("Size", text: .constant(ByteCountFormatter.string(fromByteCount: Int64(config.sizeMib) * bytesInMib, countStyle: .file))).disabled(true)
+                DefaultTextField("Size", text: .constant(ByteCountFormatter.string(fromByteCount: Int64(config.sizeMib) * bytesInMib, countStyle: .binary))).disabled(true)
             }
 
             #if os(macOS)
@@ -160,7 +160,7 @@ private struct ResizePopoverView: View {
 
     private var sizeString: String? {
         if let currentSize = currentSize {
-            return ByteCountFormatter.string(fromByteCount: currentSize, countStyle: .file)
+            return ByteCountFormatter.string(fromByteCount: currentSize, countStyle: .binary)
         } else {
             return nil
         }

diff --git a/Platform/Shared/VMDetailsView.swift b/Platform/Shared/VMDetailsView.swift
@@ -32,7 +32,7 @@ struct VMDetailsView: View {
 
     private var sizeLabel: String {
         let size = data.computeSize(for: vm)
-        return ByteCountFormatter.string(fromByteCount: size, countStyle: .file)
+        return ByteCountFormatter.string(fromByteCount: size, countStyle: .binary)
     }
 
     var body: some View {

diff --git a/Platform/Shared/VMWizardSummaryView.swift b/Platform/Shared/VMWizardSummaryView.swift
@@ -29,7 +29,7 @@ struct VMWizardSummaryView: View {
             }
         }
         #endif
-        return ByteCountFormatter.string(fromByteCount: size, countStyle: .file)
+        return ByteCountFormatter.string(fromByteCount: size, countStyle: .binary)
     }
 
     var coreDescription: String {
@@ -123,7 +123,7 @@ struct VMWizardSummaryView: View {
                 TextField("Architecture", text: .constant(wizardState.systemArchitecture.prettyValue))
                 TextField("System", text: .constant(wizardState.systemTarget.prettyValue))
             }
-            TextField("RAM", text: .constant(ByteCountFormatter.string(fromByteCount: Int64(wizardState.systemMemoryMib * wizardState.bytesInMib), countStyle: .memory)))
+            TextField("RAM", text: .constant(ByteCountFormatter.string(fromByteCount: Int64(wizardState.systemMemoryMib * wizardState.bytesInMib), countStyle: .binary)))
             TextField("CPU", text: .constant(coreDescription))
             TextField("Storage", text: .constant(storageDescription))
             if !wizardState.useAppleVirtualization && wizardState.operatingSystem == .Linux {