Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix crash when importing missing backing files for existing books #1159

Merged
merged 2 commits into from
Aug 1, 2024
Merged

Fix crash when importing missing backing files for existing books #1159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13580d0
Fix importing existing books
GianniCarlo Jul 30, 2024
19b5c1b
Fix events on main thread
GianniCarlo Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions BookPlayer/Import/Models/ImportOperation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,16 @@ public class ImportOperation: Operation {
}

private func hasExistingBook(_ fileURL: URL) -> Bool {
guard let existingBook = self.libraryService.findBooks(containing: fileURL)?.first,
let existingFileURL = existingBook.fileURL,
!FileManager.default.fileExists(atPath: existingFileURL.path) else { return false }
guard
let existingBook = self.libraryService.findBooks(containing: fileURL)?.first,
let existingFileURL = existingBook.fileURL,
!FileManager.default.fileExists(atPath: existingFileURL.path)
else { return false }

// Add support for iCloud documents
let accessGranted = fileURL.startAccessingSecurityScopedResource()

defer { fileURL.stopAccessingSecurityScopedResource() }

do {
// create parent folder if it doesn't exist
Expand All @@ -177,10 +184,15 @@ public class ImportOperation: Operation {
try FileManager.default.createDirectory(at: parentFolder, withIntermediateDirectories: true, attributes: nil)
}

try FileManager.default.moveItem(at: fileURL, to: existingFileURL)
try (existingFileURL as NSURL).setResourceValue(URLFileProtection.none, forKey: .fileProtectionKey)
if accessGranted {
try FileManager.default.copyItem(at: fileURL, to: existingFileURL)
} else {
try FileManager.default.moveItem(at: fileURL, to: existingFileURL)
}

existingFileURL.disableFileProtection()
} catch {
fatalError("Fail to move file from \(fileURL) to \(existingFileURL)")
fatalError("Existing book, fail to move file from \(fileURL) to \(existingFileURL). Error: \(error.localizedDescription)")
}

return true
Expand Down
8 changes: 6 additions & 2 deletions BookPlayer/Settings/Storage/StorageViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ final class StorageViewModel: StorageViewModelProtocol {

@Published var publishedFiles = [StorageItem]() {
didSet {
self.showFixAllButton = self.publishedFiles.contains { $0.showWarning }
DispatchQueue.main.async {
self.showFixAllButton = self.publishedFiles.contains { $0.showWarning }
}
}
}
@Published var showFixAllButton = false
Expand Down Expand Up @@ -402,7 +404,9 @@ final class StorageViewModel: StorageViewModelProtocol {
))
}
} else {
completionHandler()
await MainActor.run {
completionHandler()
}
}
}
}
Expand Down