Skip to content

Run a virtual iPhone on an Apple Silicon Mac.

Swift

fix: show alert on file transfer failure in File Browser

McNighte8cb15fa7295
diff --git a/sources/vphone-cli/VPhoneFileBrowserModel.swift b/sources/vphone-cli/VPhoneFileBrowserModel.swift
index 7c30d0fb..fc421119 100644
--- a/sources/vphone-cli/VPhoneFileBrowserModel.swift
+++ b/sources/vphone-cli/VPhoneFileBrowserModel.swift
@@ -172,9 +172,13 @@ class VPhoneFileBrowserModel {
}
func uploadFiles(urls: [URL]) async {
+ var uploadError: String?
for url in urls {
- guard let data = try? Data(contentsOf: url) else { continue }
let name = url.lastPathComponent
+ guard let data = try? Data(contentsOf: url) else {
+ uploadError = "Could not read \"\(name)\" from disk."
+ break
+ }
let dest = (currentPath as NSString).appendingPathComponent(name)
transferName = name
transferTotal = Int64(data.count)
@@ -184,11 +188,14 @@ class VPhoneFileBrowserModel {
transferCurrent = Int64(data.count)
print("[files] uploaded \(name) (\(data.count) bytes)")
} catch {
- self.error = "Upload failed: \(error)"
+ uploadError = "Upload failed for \"\(name)\": \(error)"
+ break
}
}
transferName = nil
await refresh()
+ // Set error after refresh so refresh() doesn't clear it before the alert fires.
+ if let e = uploadError { self.error = e }
}
func createNewFolder(name: String) async {
diff --git a/sources/vphone-cli/VPhoneFileBrowserView.swift b/sources/vphone-cli/VPhoneFileBrowserView.swift
index 88f0c957..3726e0cd 100644
--- a/sources/vphone-cli/VPhoneFileBrowserView.swift
+++ b/sources/vphone-cli/VPhoneFileBrowserView.swift
@@ -313,7 +313,9 @@ struct VPhoneFileBrowserView: View {
urls.append(url)
}
}
- if !urls.isEmpty {
+ if urls.isEmpty {
+ model.error = "Could not load any files from the dropped items."
+ } else {
await model.uploadFiles(urls: urls)
}
}