mirror of
https://github.com/JohnEstropia/CoreStore.git
synced 2026-01-16 22:16:53 +01:00
Merge branch 'develop' of github.com:JohnEstropia/CoreStore into develop
This commit is contained in:
@@ -215,9 +215,9 @@ let migrationProgress = dataStack.addStorage(
|
||||
completion: { (result) -> Void in
|
||||
switch result {
|
||||
case .success(let storage):
|
||||
print("Successfully added sqlite store: \(storage)"
|
||||
print("Successfully added sqlite store: \(storage)")
|
||||
case .failure(let error):
|
||||
print("Failed adding sqlite store with error: \(error)"
|
||||
print("Failed adding sqlite store with error: \(error)")
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
@@ -796,6 +796,11 @@ public extension DataStack {
|
||||
throw CoreStoreError(error)
|
||||
}
|
||||
|
||||
let externalStorageDirName = "." + fileURL.deletingPathExtension().lastPathComponent + "_SUPPORT"
|
||||
let temporaryExternalStorageURL = temporaryDirectoryURL.appendingPathComponent(
|
||||
externalStorageDirName,
|
||||
isDirectory: true
|
||||
)
|
||||
do {
|
||||
|
||||
try fileManager.replaceItem(
|
||||
@@ -806,11 +811,23 @@ public extension DataStack {
|
||||
resultingItemURL: nil
|
||||
)
|
||||
|
||||
if fileManager.fileExists(atPath: temporaryExternalStorageURL.path) {
|
||||
let extenralStorageURL = fileURL.deletingLastPathComponent().appendingPathComponent(externalStorageDirName, isDirectory: true)
|
||||
try fileManager.replaceItem(
|
||||
at: extenralStorageURL as URL,
|
||||
withItemAt: temporaryExternalStorageURL,
|
||||
backupItemName: nil,
|
||||
options: [],
|
||||
resultingItemURL: nil
|
||||
)
|
||||
}
|
||||
|
||||
progress.completedUnitCount = progress.totalUnitCount
|
||||
}
|
||||
catch {
|
||||
|
||||
_ = try? fileManager.removeItem(at: temporaryFileURL)
|
||||
_ = try? fileManager.removeItem(at: temporaryExternalStorageURL)
|
||||
throw CoreStoreError(error)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user