Merge pull request #1096 from TortugaPower/fix-file-references

Fix file references checks
TortugaPower · Feb 12, 2024 · bf8a95f · bf8a95f
2 parents 046a70f + 3c6fa47
commit bf8a95f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/BookPlayer/Coordinators/ItemListCoordinator.swift b/BookPlayer/Coordinators/ItemListCoordinator.swift
@@ -44,6 +44,7 @@ class ItemListCoordinator: NSObject, Coordinator, AlertPresenter, BPLogger {
     fatalError("ItemListCoordinator is an abstract class, override this function in the subclass")
   }
 
+  @MainActor
   func getMainCoordinator() -> MainCoordinator? {
     return AppDelegate.shared?.activeSceneDelegate?.mainCoordinator
   }
@@ -117,7 +118,9 @@ class ItemListCoordinator: NSObject, Coordinator, AlertPresenter, BPLogger {
   }
 
   func showMiniPlayer(flag: Bool) {
-    getMainCoordinator()?.showMiniPlayer(flag)
+    Task { @MainActor in
+      getMainCoordinator()?.showMiniPlayer(flag)
+    }
   }
 
   func syncList() {

diff --git a/BookPlayer/Coordinators/LibraryListCoordinator.swift b/BookPlayer/Coordinators/LibraryListCoordinator.swift
@@ -148,6 +148,7 @@ class LibraryListCoordinator: ItemListCoordinator, UINavigationControllerDelegat
         $0.lastPathComponent != DataManager.processedFolderName
         && $0.lastPathComponent != DataManager.inboxFolderName
         && $0.lastPathComponent != DataManager.backupFolderName
+        && $0.lastPathComponent != DataManager.trashFolderName
       }
 
     let sharedURLs = (try? FileManager.default.contentsOfDirectory(

diff --git a/BookPlayer/Import/ImportManager.swift b/BookPlayer/Import/ImportManager.swift
@@ -44,7 +44,8 @@ final class ImportManager {
   }
 
   public func removeFile(_ item: URL, updateCollection: Bool = true) throws {
-    if FileManager.default.fileExists(atPath: item.path) {
+    if FileManager.default.fileExists(atPath: item.path),
+       FileManager.default.isDeletableFile(atPath: item.path) {
       try FileManager.default.removeItem(at: item)
     }
 

diff --git a/BookPlayer/Import/Models/ImportOperation.swift b/BookPlayer/Import/Models/ImportOperation.swift
@@ -212,12 +212,13 @@ public class ImportOperation: Operation {
     // Add support for iCloud documents
     let accessGranted = currentFile.startAccessingSecurityScopedResource()
 
+    defer { currentFile.stopAccessingSecurityScopedResource() }
+
     let destinationURL = self.getNextAvailableURL(for: currentFile)
 
     do {
       if accessGranted {
         try FileManager.default.copyItem(at: currentFile, to: destinationURL)
-        currentFile.stopAccessingSecurityScopedResource()
       } else {
         try FileManager.default.moveItem(at: currentFile, to: destinationURL)
       }

diff --git a/Shared/CoreData/DataManager.swift b/Shared/CoreData/DataManager.swift
@@ -14,6 +14,7 @@ public class DataManager {
   public static let backupFolderName = "BPBackup"
   public static let inboxFolderName = "Inbox"
   public static let sharedFolderName = "SharedBP"
+  public static let trashFolderName = ".Trash"
   public static var loadingDataError: Error?
   private let coreDataStack: CoreDataStack
   private var pendingSaveContext: DispatchWorkItem?