Add ETA to Wine Download

Whisky/Views/Setup Views/WineDownloadView.swift

@@ -11,11 +11,12 @@ struct WineDownloadView: View {
     @State private var fractionProgress: Double = 0
     @State private var completedBytes: Int64 = 0
     @State private var totalBytes: Int64 = 0
+    @State private var downloadSpeed: Double = 0
     @State private var downloadTask: URLSessionDownloadTask?
     @State private var observation: NSKeyValueObservation?
+    @State private var startTime: Date?
     @Binding var tarLocation: URL
     @Binding var path: [SetupStage]
-
     var body: some View {
         VStack {
             VStack {
@@ -29,11 +30,18 @@ struct WineDownloadView: View {
                 VStack {
                     ProgressView(value: fractionProgress, total: 1)
                     HStack {
-                        Text(String(format: String(localized: "setup.wine.progress"),
-                                    formatPercentage(fractionProgress),
-                                    formatBytes(completed: completedBytes, total: totalBytes)))
-                            .font(.subheadline)
-                        Spacer()
+                        HStack {
+                            Text(String(format: String(localized: "setup.wine.progress"),
+                                        formatBytes(bytes: completedBytes),
+                                        formatBytes(bytes: totalBytes)))
+                            + Text(" ")
+                            + (shouldShowEstimate() ?
+                               Text(String(format: String(localized: "setup.wine.eta"),
+                                           formatRemainingTime(remainingBytes: totalBytes - completedBytes)))
+                               : Text(""))
+                            Spacer()
+                        }
+                        .font(.subheadline)
                     }
                 }
                 .padding(.horizontal)
@@ -45,23 +53,27 @@ struct WineDownloadView: View {
         .onAppear {
             Task {
                 if let downloadInfo = await WineDownload.getLatestWineURL(),
-                    let url = downloadInfo.directURL {
+                   let url = downloadInfo.directURL {
                     downloadTask = URLSession.shared.downloadTask(with: url) { url, _, _ in
                         if let url = url {
                             tarLocation = url
                             proceed()
                         }
                     }
-
                     observation = downloadTask?.observe(\.countOfBytesReceived) { task, _ in
                         Task {
                             await MainActor.run {
+                                let currentTime = Date()
+                                let elapsedTime = currentTime.timeIntervalSince(startTime ?? currentTime)
+                                if completedBytes > 0 {
+                                    downloadSpeed = Double(completedBytes) / elapsedTime
+                                }
                                 fractionProgress = Double(task.countOfBytesReceived) / Double(totalBytes)
                                 completedBytes = task.countOfBytesReceived
                             }
                         }
                     }
-
+                    startTime = Date()
                     downloadTask?.resume()
                     await MainActor.run {
                         totalBytes = Int64(downloadInfo.totalByteCount)
@@ -71,20 +83,29 @@ struct WineDownloadView: View {
         }
     }
 
-    func formatPercentage(_ value: Double) -> String {
-        let formatter = NumberFormatter()
-        formatter.numberStyle = .percent
-        formatter.maximumFractionDigits = 0
-        formatter.minimumIntegerDigits = 1
-        return formatter.string(from: value as NSNumber) ?? ""
-    }
-
-    func formatBytes(completed: Int64, total: Int64) -> String {
+    func formatBytes(bytes: Int64) -> String {
         let formatter = ByteCountFormatter()
         formatter.countStyle = .file
-        let completed = formatter.string(fromByteCount: completed)
-        let total = formatter.string(fromByteCount: total)
-        return "(\(completed)/\(total))"
+        formatter.zeroPadsFractionDigits = true
+        return formatter.string(fromByteCount: bytes)
+    }
+
+    func shouldShowEstimate() -> Bool {
+        let elapsedTime = Date().timeIntervalSince(startTime ?? Date())
+        return Int(elapsedTime.rounded()) > 5 && completedBytes != 0
+    }
+
+    func formatRemainingTime(remainingBytes: Int64) -> String {
+        let remainingTimeInSeconds = Double(remainingBytes) / downloadSpeed
+
+        let formatter = DateComponentsFormatter()
+        formatter.allowedUnits = [.hour, .minute, .second]
+        formatter.unitsStyle = .full
+        if shouldShowEstimate() {
+            return formatter.string(from: TimeInterval(remainingTimeInSeconds)) ?? ""
+        } else {
+            return ""
+        }
     }
 
     func proceed() {

Whisky/en.lproj/Localizable.strings

@@ -87,7 +87,8 @@
 
 "setup.wine.download" = "Downloading Wine";
 "setup.wine.download.subtitle" = "Speeds will vary on your internet connection.";
-"setup.wine.progress" = "Progress: %@ %@";
+"setup.wine.progress" = "%@ of %@";
+"setup.wine.eta" = "- %@ remaining";
 
 "setup.wine.install" = "Installing Wine";
 "setup.wine.install.subtitle" = "Almost there. Don't tune out yet.";