Memory & stability optimisation

Author: Steve2Go

.DS_Store

@@ -22,6 +22,7 @@ struct DetailsView: View {
     @State var fileStat: TorrentResponse?
     @State private var sheetUnwantedFiles: Set<Int> = []
     @State private var sheetFileTree: [FileNode] = []
+    @State private var isBuildingFileTree: Bool = false
 
     private let toastOptions = SimpleToastOptions(
             hideAfter: 5
@@ -404,18 +405,34 @@ Spacer()
                                 let wanted = stat["wanted"] as? Bool ?? true
                                 return wanted ? nil : i
                             })
-                            // Convert TorrentFile array to FileNode tree
-                            let fileTreeCopy = torrentFiles.enumerated().map { (i, file) in (i, file) }.toFileTree()
                             let selectedCount = torrentFiles.count - unwantedFiles.count
                             let totalCount = torrentFiles.count
                             HStack {
-                                Button("\(selectedCount) of \(totalCount) files selected") {
+                                Image(systemName:"checklist")
+                                Button("\(selectedCount) of \(totalCount) files Active") {
+                                    isBuildingFileTree = true
                                     sheetUnwantedFiles = unwantedFiles
-                                    sheetFileTree = fileTreeCopy
-                                    showFiles = true
+                                    DispatchQueue.global(qos: .userInitiated).async {
+                                        let fileTreeCopy = torrentFiles.enumerated().map { (i, file) in (i, file) }.toFileTree()
+                                        DispatchQueue.main.async {
+                                            sheetFileTree = fileTreeCopy
+                                            isBuildingFileTree = false
+                                            showFiles = true
+                                        }
+                                    }
                                 }
+                                
                                 Spacer()
                             }
+                            .overlay(
+                                Group {
+                                    if isBuildingFileTree {
+                                        ProgressView("Building file list...")
+                                            .frame(maxWidth: .infinity, maxHeight: .infinity)
+                                            .background(Color.black.opacity(0.2))
+                                    }
+                                }
+                            )
                             .sheet(isPresented: $showFiles) {
                                 FileSelectionView(
                                     fileTree: sheetFileTree,
@@ -605,13 +622,23 @@ Spacer()
                     if store.selectedTorrentId != nil{
                         try await detailedTorrent = manager.fetchTorrentDetails(id: store.selectedTorrentId!)
                         magnet = detailedTorrent?.dynamicFields["magnetLink"]?.value as? String ?? ""
+                        if let torrentFiles = detailedTorrent?.files {
+                            // fileTree = torrentFiles.enumerated().map { (i, file) in (i, file) }.toFileTree()
+                        } else {
+                            // fileTree = []
+                        }
                     }
                 }
             }
             .onChange(of: store.selectedTorrentId, {
                 Task {
                     try await detailedTorrent = manager.fetchTorrentDetails(id: store.selectedTorrentId ?? 0)
                     magnet = detailedTorrent?.dynamicFields["magnetLink"]?.value as? String ?? ""
+                    if let torrentFiles = detailedTorrent?.files {
+                        // fileTree = torrentFiles.enumerated().map { (i, file) in (i, file) }.toFileTree()
+                    } else {
+                        // fileTree = []
+                    }
                 }
             })
         #if os(iOS)

Throttle 2.xcworkspace/xcuserdata/stephengrigg.xcuserdatad/UserInterfaceState.xcuserstate

@@ -28,18 +28,14 @@ class FileBrowserViewModel: ObservableObject {
     }
 
     private func connectToServer() {
-        Task {
+        Task { [weak self] in
+            guard let self = self else { return }
             do {
-                // Create and connect a new SSH connection
-                if let server = server {
+                if let server = self.server {
                     let connection = SSHConnection(server: server)
                     try await connection.connect()
-                    
-                    // Store the connection for future use
                     self.sshConnection = connection
-                    
-                    // Fetch initial directory listing
-                    await fetchItems()
+                    await self.fetchItems()
                 } else {
                     throw NSError(domain: "FileBrowser", code: -1,
                                  userInfo: [NSLocalizedDescriptionKey: "Server configuration missing"])
@@ -55,17 +51,12 @@ class FileBrowserViewModel: ObservableObject {
 
     func createFolder(name: String) {
         let newFolderPath = "\(currentPath)/\(name)".replacingOccurrences(of: "//", with: "/")
-        
-        Task {
+        Task { [weak self] in
+            guard let self = self else { return }
             do {
-                // Use the existing connection or create a new one if needed
-                let connection = try await getOrCreateConnection()
-                
-                // Create the directory using SSH
+                let connection = try await self.getOrCreateConnection()
                 try await connection.createDirectory(path: newFolderPath)
-                
-                // Refresh directory listing
-                await fetchItems()
+                await self.fetchItems()
             } catch {
                 await MainActor.run {
                     print("❌ Failed to create folder: \(error)")
@@ -171,10 +162,12 @@ class FileBrowserViewModel: ObservableObject {
     /// ✅ Navigate into a folder and refresh UI
     func navigateToFolder(_ folderName: String) {
         let newPath = "\(currentPath)/\(folderName)".replacingOccurrences(of: "//", with: "/")
-        
-        Task { @MainActor in
-            self.currentPath = newPath
-            await fetchItems()
+        Task { [weak self] in
+            guard let self = self else { return }
+            await MainActor.run {
+                self.currentPath = newPath
+            }
+            await self.fetchItems()
         }
     }
 
@@ -190,9 +183,12 @@ class FileBrowserViewModel: ObservableObject {
             .joined(separator: "/")
         let newPath = trimmedPath.isEmpty ? basePath : "/" + trimmedPath
 
-        Task { @MainActor in
-            self.currentPath = newPath
-            await fetchItems()
+        Task { [weak self] in
+            guard let self = self else { return }
+            await MainActor.run {
+                self.currentPath = newPath
+            }
+            await self.fetchItems()
         }
     }
 

Throttle 2/DetailsView/TorrentDetailsView.swift

@@ -29,30 +29,34 @@ class SFTPUploadManager: ObservableObject {
         self.uploadHandler = uploadHandler
     }
 
+    deinit {
+        cancelUpload()
+    }
+    
     func uploadFile(from localURL: URL) {
         guard localURL.startAccessingSecurityScopedResource() else {
             error = "Failed to access file"
             return
         }
-        
         isUploading = true
         currentUploadFileName = localURL.lastPathComponent
         uploadProgress = 0
-        
-        // Create a new SSH connection using the server from the handler
         if let server = uploadHandler.getServer() {
             uploadWithSSH(localURL: localURL, server: server)
         } else {
-            Task { @MainActor in
-                self.error = "Server configuration not found"
-                self.isUploading = false
+            Task { [weak self] in
+                await MainActor.run {
+                    self?.error = "Server configuration not found"
+                    self?.isUploading = false
+                }
                 localURL.stopAccessingSecurityScopedResource()
             }
         }
     }
 
     private func uploadWithSSH(localURL: URL, server: ServerEntity) {
-        uploadTask = Task {
+        uploadTask = Task { [weak self] in
+            guard let self = self else { return }
             do {
                 defer { localURL.stopAccessingSecurityScopedResource() }
                 let destinationPath = "\(self.uploadHandler.currentPath)/\(localURL.lastPathComponent)"
@@ -126,17 +130,20 @@ class SFTPUploadManager: ObservableObject {
         if let server = uploadHandler.getServer() {
             uploadFolderWithSSH(localURL: localURL, server: server, enumeratedURLs: enumeratedURLs)
         } else {
-            Task { @MainActor in
-                self.error = "Server configuration not found"
-                self.isUploading = false
+            Task { [weak self] in
+                await MainActor.run {
+                    self?.error = "Server configuration not found"
+                    self?.isUploading = false
+                }
                 localURL.stopAccessingSecurityScopedResource()
             }
         }
     }
 
     // Add enumeratedURLs as a parameter
     private func uploadFolderWithSSH(localURL: URL, server: ServerEntity, enumeratedURLs: [URL]) {
-        uploadTask = Task {
+        uploadTask = Task { [weak self] in
+            guard let self = self else { return }
             do {
                 defer {
                     localURL.stopAccessingSecurityScopedResource()
@@ -207,16 +214,18 @@ class SFTPUploadManager: ObservableObject {
 
         // Also disconnect the SSH connection if one exists
         if let connection = sshConnection {
-            Task {
+            Task { [weak self] in
                 await connection.disconnect()
-                self.sshConnection = nil
+                self?.sshConnection = nil
             }
         }
 
         // Update the UI
-        Task { @MainActor in
-            self.isUploading = false
-            self.error = "Upload cancelled"
+        Task { [weak self] in
+            await MainActor.run {
+                self?.isUploading = false
+                self?.error = "Upload cancelled"
+            }
         }
     }
 }