starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-01-15 13:43:43 +01:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

Use InferredMappingModel in case lightweight migration fails for some reason

Browse Source
This commit is contained in:
John Estropia
2018-08-09 02:09:54 +09:00
parent 7152962026
commit 30685d4355
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Sources/DataStack+Migration.swift
View File

@@ -739,13 +739,13 @@ public extension DataStack {
fakeProgress = 1
}
try storage.cs_finalizeStorageAndWait(soureModelHint: destinationModel)
_ = try? storage.cs_finalizeStorageAndWait(soureModelHint: destinationModel)
progress.completedUnitCount = progress.totalUnitCount
return
}
catch {
throw CoreStoreError(error)
// Lightweight migration failed somehow. Proceed using InferedMappingModel below
}
}
@@ -760,6 +760,11 @@ public extension DataStack {
attributes: nil
)
let externalStorageFolderName = ".\(fileURL.deletingPathExtension().lastPathComponent)_SUPPORT"
let temporaryExternalStorageURL = temporaryDirectoryURL.appendingPathComponent(
externalStorageFolderName,
isDirectory: true
)
let temporaryFileURL = temporaryDirectoryURL.appendingPathComponent(
fileURL.lastPathComponent,
isDirectory: false
@@ -796,25 +801,22 @@ public extension DataStack {
throw CoreStoreError(error)
}
let externalStorageDirName = "." + fileURL.deletingPathExtension().lastPathComponent + "_SUPPORT"
let temporaryExternalStorageURL = temporaryDirectoryURL.appendingPathComponent(
externalStorageDirName,
isDirectory: true
)
do {
try fileManager.replaceItem(
at: fileURL as URL,
at: fileURL,
withItemAt: temporaryFileURL,
backupItemName: nil,
options: [],
resultingItemURL: nil
)
if fileManager.fileExists(atPath: temporaryExternalStorageURL.path) {
let extenralStorageURL = fileURL.deletingLastPathComponent().appendingPathComponent(externalStorageDirName, isDirectory: true)
let externalStorageURL = fileURL
.deletingLastPathComponent()
.appendingPathComponent(externalStorageFolderName, isDirectory: true)
try fileManager.replaceItem(
at: extenralStorageURL as URL,
at: externalStorageURL,
withItemAt: temporaryExternalStorageURL,
backupItemName: nil,
options: [],