perf: refresh folder status view the right way

Author: pixelspark

Localizable.xcstrings

@@ -264,6 +264,46 @@
         }
       }
     },
+    "(Transfer speed unknown)" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "(Übertragungsgeschwindigkeit unbekannt)"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "(Velocidad de transferencia desconocida)"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "(Velocità di trasferimento sconosciuta)"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "(Overdrachtsnelheid onbekend)"
+          }
+        },
+        "uk" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "(Швидкість передачі невідома)"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "(传输速度未知)"
+          }
+        }
+      }
+    },
     "%@" : {
       "localizations" : {
         "de" : {

Sushitrain/BrowserListView.swift

@@ -20,7 +20,6 @@ struct BrowserListView: View {
 		List {
 			Section {
 				FolderStatusView(folder: folder)
-					.id(appState.eventCounter)  // Update for each event
 
 				if hasExtraneousFiles {
 					NavigationLink(destination: { ExtraFilesView(folder: self.folder) }) {

Sushitrain/BrowserView.swift

@@ -116,7 +116,6 @@ struct BrowserView: View {
 						.accessibilityLabel(fsd.text)
 						.popover(isPresented: $showStatusPopover, arrowEdge: .bottom) {
 							FolderStatusView(folder: folder)
-								.id(appState.eventCounter)  // Update for each event
 								.padding()
 								.frame(minWidth: 120)
 						}
@@ -556,7 +555,6 @@ private struct BrowserItemsView: View {
 					HStack {
 						#if os(iOS)
 							FolderStatusView(folder: folder)
-								.id(appState.eventCounter)  // Update for each event
 								.padding(.all, 10)
 						#endif
 

Sushitrain/FolderView.swift

@@ -207,46 +207,65 @@ struct FolderStatusDescription {
 struct FolderStatusView: View {
 	@Environment(AppState.self) private var appState
 	var folder: SushitrainFolder
+	
+	@State private var statistics: SushitrainFolderStats? = nil
+	@State private var status: String? = nil
+	@State private var folderStatusDescription: FolderStatusDescription? = nil
 
 	var body: some View {
-		var error: NSError? = nil
-		let status = folder.state(&error)
-
-		if status == "syncing" && !folder.isSelective() {
-			if let statistics = try? folder.statistics(), statistics.global!.bytes > 0 {
-				let formatter = ByteCountFormatter()
-				if let globalBytes = statistics.global?.bytes, let localBytes = statistics.local?.bytes {
-					let remainingText = formatter.string(fromByteCount: (globalBytes - localBytes))
-
-					ProgressView(
-						value: Double(localBytes) / Double(globalBytes),
-						total: 1.0
-					) {
-						Label(
-							"Synchronizing...", systemImage: "bolt.horizontal.circle"
-						)
-						.foregroundStyle(.orange)
-						.badge(Text(remainingText))
-					}.tint(.orange)
+		ZStack {
+			if let status = status {
+				if status == "syncing" && !folder.isSelective() {
+					if let statistics = self.statistics, statistics.global!.bytes > 0 {
+						let formatter = ByteCountFormatter()
+						if let globalBytes = statistics.global?.bytes, let localBytes = statistics.local?.bytes {
+							let remainingText = formatter.string(fromByteCount: (globalBytes - localBytes))
+							
+							ProgressView(
+								value: Double(localBytes) / Double(globalBytes),
+								total: 1.0
+							) {
+								Label(
+									"Synchronizing...", systemImage: "bolt.horizontal.circle"
+								)
+								.foregroundStyle(.orange)
+								.badge(Text(remainingText))
+							}.tint(.orange)
+						}
+						else {
+							self.statusLabel()
+						}
+					}
+					else {
+						self.statusLabel()
+					}
 				}
 				else {
 					self.statusLabel()
 				}
+				
+				if let folderStatus = self.folderStatusDescription, let txt = folderStatus.additionalText {
+					Text(txt).foregroundStyle(.red)
+				}
 			}
-			else {
-				self.statusLabel()
-			}
-		}
-		else {
-			self.statusLabel()
+		}.task {
+			await Task.detached {
+				await self.update()
+			}.value
 		}
-
-		let folderStatus = FolderStatusDescription(folder)
-
-		if let txt = folderStatus.additionalText {
-			Text(txt).foregroundStyle(.red)
+		.onChange(of: appState.eventCounter) { _, _ in
+			Task.detached {
+				await self.update()
+			}
 		}
 	}
+	
+	private func update() async {
+		var error: NSError? = nil
+		self.status = folder.state(&error)
+		self.statistics = try? folder.statistics()
+		self.folderStatusDescription = FolderStatusDescription(folder)
+	}
 
 	@ViewBuilder private func statusLabel() -> some View {
 		let folderStatus = FolderStatusDescription(folder)

Sushitrain/StartView.swift

@@ -140,23 +140,25 @@ private struct OverallDownloadProgressView: View {
 
 	@ViewBuilder private var speeds: some View {
 		// Download speed
-		if let (date, progress) = progress, let (lastDate, lastProgress) = self.lastProgress {
-			HStack {
+		HStack {
+			Spacer()
+			if let (date, progress) = progress, let (lastDate, lastProgress) = self.lastProgress {
 				let diffBytes = progress.bytesDone - lastProgress.bytesDone
 				let diffTime = date.timeIntervalSince(lastDate)
 				let speed = Int64(Double(diffBytes) / Double(diffTime))
 				let formatter = ByteCountFormatter()
 
 				if speed > 0 && diffTime > 0 {
-					Spacer()
 					Text("\(formatter.string(fromByteCount: speed))/s")
 						.foregroundStyle(.green)
-
 					let secondsToGo = Duration(
 						secondsComponent: (progress.bytesTotal - progress.bytesDone) / speed, attosecondsComponent: 0)
 					let secondsToGoFormatted: String = secondsToGo.formatted(.time(pattern: .hourMinuteSecond(padHourToLength: 0)))
 					Text(secondsToGoFormatted).foregroundStyle(.green)
 				}
+				else {
+					Text("(Transfer speed unknown)").foregroundStyle(.gray)
+				}
 			}
 		}
 	}
@@ -538,6 +540,10 @@ struct StartView: View {
 		self.peers = p
 		self.folders = await self.appState.folders().sorted()
 		self.longTimeNotSeenDevices = p.filter {
+			if $0.isPaused() {
+				return false
+			}
+			
 			if let d = $0.lastSeen()?.date() {
 				return -d.timeIntervalSinceNow > appState.userSettings.longTimeNoSeeInterval
 			}