fix: 🐇 Support concurrent file browsing and transfers (#113)

The PLP (and plptools) architecture allows for multiple parallel file operaitons. This change takes advantage of that back backing each window with a separate `FileServer` instance and creating an additional instance for long-running file transfers.
inseven · Jul 11, 2024 · b2791a9 · b2791a9
1 parent 08cffdc
commit b2791a9
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 73 deletions.
diff --git a/Reconnect/Model/BrowserModel.swift b/Reconnect/Model/BrowserModel.swift
@@ -48,7 +48,7 @@ class BrowserModel {
 
     var transfersModel = TransfersModel()
 
-    let fileServer: FileServer
+    let fileServer = FileServer()
 
     var drives: [FileServer.DriveInfo] = []
     var files: [FileServer.DirectoryEntry] = []
@@ -68,8 +68,7 @@ class BrowserModel {
 
     private var navigationStack = NavigationStack()
 
-    init(fileServer: FileServer) {
-        self.fileServer = fileServer
+    init() {
     }
 
     func start() async {
@@ -192,55 +191,7 @@ class BrowserModel {
             if path.isWindowsDirectory {
                 downloadDirectory(path: path, convertFiles: convertFiles)
             } else {
-                downloadFile(from: path, convertFiles: convertFiles)
-            }
-        }
-    }
-
-    private func downloadFile(from path: String, to destinationURL: URL? = nil, convertFiles: Bool) {
-        Task {
-            let fileManager = FileManager.default
-            let downloadsURL = fileManager.urls(for: .downloadsDirectory, in: .userDomainMask)[0]
-            let filename = path.lastWindowsPathComponent
-            let downloadURL = destinationURL ?? downloadsURL.appendingPathComponent(filename)
-            print("Downloading file at path '\(path)' to destination path '\(downloadURL.path)'...")
-            transfersModel.add(filename) { transfer in
-
-                // Get the file information.
-                let directoryEntry = try await self.fileServer.getExtendedAttributes(path: path)
-
-                // Perform the file copy.
-                try await self.fileServer.copyFile(fromRemotePath: path, toLocalPath: downloadURL.path) { progress, size in
-                    transfer.setStatus(.active(Float(progress) / Float(size)))
-                    return .continue
-                }
-
-                // Convert known types.
-                // N.B. This would be better implemented as a user-configurable and extensible pipeline, but this is a
-                // reasonable point to hook an initial implementation.
-                if convertFiles {
-                    if directoryEntry.fileType == .mbm {
-                        let directoryURL = (downloadURL as NSURL).deletingLastPathComponent!
-                        let basename = (downloadURL.lastPathComponent as NSString).deletingPathExtension
-                        let bitmaps = OpoInterpreter().getMbmBitmaps(path: downloadURL.path) ?? []
-                        for (index, bitmap) in bitmaps.enumerated() {
-                            let identifier = if index < 1 {
-                                basename
-                            } else {
-                                "\(basename) \(index)"
-                            }
-                            let conversionURL = directoryURL
-                                .appendingPathComponent(identifier)
-                                .appendingPathExtension("png")
-                            let image = CGImage.from(bitmap: bitmap)
-                            try CGImageWritePNG(image, to: conversionURL)
-                        }
-                        try fileManager.removeItem(at: downloadURL)
-                    }
-                }
-
-                // Mark the transfer as complete.
-                transfer.setStatus(.complete)
+                transfersModel.download(from: path, convertFiles: convertFiles)
             }
         }
     }
@@ -263,7 +214,7 @@ class BrowserModel {
                 if file.isDirectory {
                     try fileManager.createDirectory(at: destinationURL, withIntermediateDirectories: true)
                 } else {
-                    self.downloadFile(from: file.path, to: destinationURL, convertFiles: convertFiles)
+                    self.transfersModel.download(from: file.path, to: destinationURL, convertFiles: convertFiles)
                 }
             }
         }
@@ -274,16 +225,7 @@ class BrowserModel {
             guard let path = self.path else {
                 throw ReconnectError.invalidFilePath
             }
-            let destinationPath = path + url.lastPathComponent
-            print("Uploading file at path '\(url.path)' to destination path '\(destinationPath)'...")
-            self.transfersModel.add(url.lastPathComponent) { transfer in
-                try await self.fileServer.copyFile(fromLocalPath: url.path, toRemotePath: destinationPath) { progress, size in
-                    transfer.setStatus(.active(Float(progress) / Float(size)))
-                    return .continue
-                }
-                transfer.setStatus(.complete)
-                self.update()
-            }
+            self.transfersModel.upload(from: url, to: path + url.lastPathComponent)
         }
     }
 

diff --git a/Reconnect/Model/TransfersModel.swift b/Reconnect/Model/TransfersModel.swift
@@ -18,18 +18,22 @@
 
 import SwiftUI
 
+import OpoLua
+
 @MainActor @Observable
 class TransfersModel {
 
-    var transfers: [Transfer] = []
-    var selection: UUID? = nil
-
     var isActive: Bool {
         return transfers
             .map { $0.isActive }
             .reduce(false) { $0 || $1 }
     }
 
+    var transfers: [Transfer] = []
+    var selection: UUID? = nil
+
+    let fileServer = FileServer()
+
     init() {
     }
 
@@ -42,4 +46,62 @@ class TransfersModel {
             .removeAll { !$0.isActive }
     }
 
+    func download(from sourcePath: String, to destinationURL: URL? = nil, convertFiles: Bool) {
+        let fileManager = FileManager.default
+        let downloadsURL = fileManager.urls(for: .downloadsDirectory, in: .userDomainMask)[0]
+        let filename = sourcePath.lastWindowsPathComponent
+        let downloadURL = destinationURL ?? downloadsURL.appendingPathComponent(filename)
+        print("Downloading file at path '\(sourcePath)' to destination path '\(downloadURL.path)'...")
+
+        add(filename) { transfer in
+
+            // Get the file information.
+            let directoryEntry = try await self.fileServer.getExtendedAttributes(path: sourcePath)
+
+            // Perform the file copy.
+            try await self.fileServer.copyFile(fromRemotePath: sourcePath, toLocalPath: downloadURL.path) { progress, size in
+                transfer.setStatus(.active(Float(progress) / Float(size)))
+                return .continue
+            }
+
+            // Convert known types.
+            // N.B. This would be better implemented as a user-configurable and extensible pipeline, but this is a
+            // reasonable point to hook an initial implementation.
+            if convertFiles {
+                if directoryEntry.fileType == .mbm {
+                    let directoryURL = (downloadURL as NSURL).deletingLastPathComponent!
+                    let basename = (downloadURL.lastPathComponent as NSString).deletingPathExtension
+                    let bitmaps = OpoInterpreter().getMbmBitmaps(path: downloadURL.path) ?? []
+                    for (index, bitmap) in bitmaps.enumerated() {
+                        let identifier = if index < 1 {
+                            basename
+                        } else {
+                            "\(basename) \(index)"
+                        }
+                        let conversionURL = directoryURL
+                            .appendingPathComponent(identifier)
+                            .appendingPathExtension("png")
+                        let image = CGImage.from(bitmap: bitmap)
+                        try CGImageWritePNG(image, to: conversionURL)
+                    }
+                    try fileManager.removeItem(at: downloadURL)
+                }
+            }
+
+            // Mark the transfer as complete.
+            transfer.setStatus(.complete)
+        }
+    }
+
+    func upload(from sourceURL: URL, to destinationPath: String) {
+        print("Uploading file at path '\(sourceURL.path)' to destination path '\(destinationPath)'...")
+        add(sourceURL.lastPathComponent) { transfer in
+            try await self.fileServer.copyFile(fromLocalPath: sourceURL.path, toRemotePath: destinationPath) { progress, size in
+                transfer.setStatus(.active(Float(progress) / Float(size)))
+                return .continue
+            }
+            transfer.setStatus(.complete)
+        }
+    }
+
 }
diff --git a/Reconnect/PLP/FileServer.swift b/Reconnect/PLP/FileServer.swift
@@ -144,7 +144,7 @@ class FileServer {
 
     var client = RFSVClient()
 
-    init(host: String, port: Int32) {
+    init(host: String = "127.0.0.1", port: Int32 = 7501) {
         self.host = host
         self.port = port
     }

diff --git a/Reconnect/Views/BrowserView.swift b/Reconnect/Views/BrowserView.swift
@@ -22,11 +22,10 @@ import SwiftUI
 struct BrowserView: View {
 
     @Environment(ApplicationModel.self) var applicationModel
-
-    @State private var browserModel: BrowserModel
 
-    init(fileServer: FileServer) {
-        _browserModel = State(initialValue: BrowserModel(fileServer: fileServer))
+    @State private var browserModel = BrowserModel()
+
+    init() {
     }
 
     var body: some View {

diff --git a/Reconnect/Views/ContentView.swift b/Reconnect/Views/ContentView.swift
@@ -21,11 +21,10 @@ import SwiftUI
 struct ContentView: View {
 
     var applicationModel: ApplicationModel
-    let fileServer = FileServer(host: "127.0.0.1", port: 7501)
 
     var body: some View {
         VStack {
-            BrowserView(fileServer: fileServer)
+            BrowserView()
         }
         .showsDockIcon()
     }