Remove deb in database model since it should manage removal

danpashin · Jun 16, 2024 · c5f23c3 · c5f23c3
1 parent 969d44e
commit c5f23c3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/twackup-gui/Twackup/Sources/Models/Database/Database.swift b/twackup-gui/Twackup/Sources/Models/Database/Database.swift
@@ -69,7 +69,7 @@ actor Database {
 
  func fetchPackages() throws -> [DebPackage] {
  let request = DebPackageObject.fetchRequest()
- return try backroundContext.fetch(request).map({ DebPackage(object: $0) })
+ return try backroundContext.fetch(request).map { DebPackage(object: $0) }
  }
 
  func fetch(package: Package) throws -> DebPackage? {
@@ -81,21 +81,25 @@ actor Database {
  return DebPackage(object: object)
  }
 
- func delete(package: DebPackage) async {
- await delete(packages: [package])
+ func delete(package: DebPackage) async throws {
+ try await delete(packages: [package])
  }
 
- func delete(packages: [DebPackage]) async {
+ func delete(packages: [DebPackage]) async throws {
  if packages.isEmpty {
  return
  }
 
+ for pkg in packages {
+ try FileManager.default.removeItem(at: pkg.fileURL)
+ }
+
  let request = NSBatchDeleteRequest(objectIDs: packages.map { $0.databaseID })
  _ = await execute(request: request, context: backroundContext)
  }
 
- func delete(packages: [Package]) async {
- await delete(packages: packages.compactMap { $0.asDEB })
+ func delete(packages: [Package]) async throws {
+ try await delete(packages: packages.compactMap { $0.asDEB })
  }
 
  func packagesSize() -> Int64 {

diff --git a/twackup-gui/Twackup/Sources/Models/Database/DatabasePackage.swift b/twackup-gui/Twackup/Sources/Models/Database/DatabasePackage.swift
@@ -8,7 +8,6 @@
 import CoreData
 
 final class DebPackage: Package, Sendable {
-
  let databaseID: NSManagedObjectID
 
  let id: String

diff --git a/twackup-gui/Twackup/Sources/Models/Packages/Data Providers/DatabasePackageProvider.swift b/twackup-gui/Twackup/Sources/Models/Packages/Data Providers/DatabasePackageProvider.swift
@@ -29,16 +29,13 @@ class DatabasePackageProvider: PackageDataProvider, @unchecked Sendable {
  !toDelete.contains { $0.isEqualTo(package) }
  }
 
- for package in toDelete {
- guard let dbPackage = package.asDEB else { continue }
- do {
- try FileManager.default.removeItem(at: dbPackage.fileURL)
- } catch {
- await FFILogger.shared.log(error.localizedDescription, level: .warning)
- }
+ do {
+ try await database.delete(packages: toDelete)
+ } catch {
+ await FFILogger.shared.log(error.localizedDescription, level: .warning)
+ return false
  }
 
- await database.delete(packages: toDelete)
  applyFilter(currentFilter)
 
  return true