Merge branch 'develop' of github.com:JohnEstropia/CoreStore into develop

This commit is contained in:
John Rommel Estropia
2018-01-07 23:25:11 +09:00
2 changed files with 19 additions and 2 deletions

View File

@@ -215,9 +215,9 @@ let migrationProgress = dataStack.addStorage(
completion: { (result) -> Void in completion: { (result) -> Void in
switch result { switch result {
case .success(let storage): case .success(let storage):
print("Successfully added sqlite store: \(storage)" print("Successfully added sqlite store: \(storage)")
case .failure(let error): case .failure(let error):
print("Failed adding sqlite store with error: \(error)" print("Failed adding sqlite store with error: \(error)")
} }
} }
) )

View File

@@ -796,6 +796,11 @@ public extension DataStack {
throw CoreStoreError(error) throw CoreStoreError(error)
} }
let externalStorageDirName = "." + fileURL.deletingPathExtension().lastPathComponent + "_SUPPORT"
let temporaryExternalStorageURL = temporaryDirectoryURL.appendingPathComponent(
externalStorageDirName,
isDirectory: true
)
do { do {
try fileManager.replaceItem( try fileManager.replaceItem(
@@ -806,11 +811,23 @@ public extension DataStack {
resultingItemURL: nil 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 progress.completedUnitCount = progress.totalUnitCount
} }
catch { catch {
_ = try? fileManager.removeItem(at: temporaryFileURL) _ = try? fileManager.removeItem(at: temporaryFileURL)
_ = try? fileManager.removeItem(at: temporaryExternalStorageURL)
throw CoreStoreError(error) throw CoreStoreError(error)
} }
} }