starred/CoreStore-JohnEstropia
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-04-23 17:18:35 +02:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

minor code cleanup

Browse Source
This commit is contained in:
John Rommel Estropia
2017-11-19 13:49:21 +09:00
parent 18b933957e
commit 583c6b7249
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Sources/DataStack+Migration.swift
View File

@@ -682,6 +682,15 @@ public extension DataStack {
private func startMigrationForStorage<T: LocalStorage>(_ storage: T, sourceModel: NSManagedObjectModel, destinationModel: NSManagedObjectModel, mappingModel: NSMappingModel, migrationType: MigrationType, progress: Progress) throws { private func startMigrationForStorage<T: LocalStorage>(_ storage: T, sourceModel: NSManagedObjectModel, destinationModel: NSManagedObjectModel, mappingModel: NSMappingModel, migrationType: MigrationType, progress: Progress) throws {
do {
try storage.cs_finalizeStorageAndWait(soureModelHint: sourceModel)
}
catch {
throw CoreStoreError(error)
}
let fileURL = storage.fileURL let fileURL = storage.fileURL
if case .lightweight = migrationType { if case .lightweight = migrationType {
@@ -714,7 +723,6 @@ public extension DataStack {
} }
timerQueue.async(execute: recursiveCheck) timerQueue.async(execute: recursiveCheck)
_ = try storage.cs_finalizeStorageAndWait(soureModelHint: sourceModel)
_ = try withExtendedLifetime(NSPersistentStoreCoordinator(managedObjectModel: destinationModel)) { (coordinator: NSPersistentStoreCoordinator) in _ = try withExtendedLifetime(NSPersistentStoreCoordinator(managedObjectModel: destinationModel)) { (coordinator: NSPersistentStoreCoordinator) in
try coordinator.addPersistentStoreSynchronously( try coordinator.addPersistentStoreSynchronously(
@@ -730,13 +738,13 @@ public extension DataStack {
fakeProgress = 1 fakeProgress = 1
} }
_ = try? storage.cs_finalizeStorageAndWait(soureModelHint: destinationModel) try storage.cs_finalizeStorageAndWait(soureModelHint: destinationModel)
progress.completedUnitCount = progress.totalUnitCount progress.completedUnitCount = progress.totalUnitCount
return return
} }
catch { catch {
// try manual migration throw CoreStoreError(error)
} }
} }
@@ -764,7 +772,6 @@ public extension DataStack {
do { do {
try storage.cs_finalizeStorageAndWait(soureModelHint: sourceModel)
try migrationManager.migrateStore( try migrationManager.migrateStore(
from: fileURL, from: fileURL,
sourceType: type(of: storage).storeType, sourceType: type(of: storage).storeType,