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

Fix sig abort error

Browse Source
This commit is contained in:
John Estropia
2021-03-07 17:02:09 +09:00
parent bfb1df3c40
commit 338e4ddc9f
3 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Sources/DataStack.AddStoragePublisher.swift
View File

@@ -50,7 +50,7 @@ extension DataStack {
// MARK: Publisher
public typealias Output = Progress
public typealias Output = MigrationProgress
public typealias Failure = CoreStoreError
public func receive<S: Subscriber>(subscriber: S) where S.Input == Output, S.Failure == Failure {
@@ -64,19 +64,19 @@ extension DataStack {
)
}
// MARK: - Progress
// MARK: - MigrationProgress
/**
A `Progress` contains info on a `LocalStorage`'s setup progress.
A `MigrationProgress` contains info on a `LocalStorage`'s setup progress.
- SeeAlso: DataStack.reactive.addStorage(_:)
*/
public enum Progress {
public enum MigrationProgress {
/**
The `LocalStorage` is currently being migrated
*/
case migrating(storage: Storage, progressObject: Foundation.Progress)
case migrating(storage: Storage, progressObject: Progress)
/**
The `LocalStorage` has been added to the `DataStack` and is ready for reading and writing
@@ -143,7 +143,7 @@ extension DataStack {
// MARK: FilePrivate
init(
fileprivate init(
dataStack: DataStack,
storage: Storage,
subscriber: S
@@ -163,11 +163,13 @@ extension DataStack {
return
}
var progress: Foundation.Progress?
var progress: Progress? = nil
progress = self.dataStack.addStorage(
self.storage,
completion: { [weak self] result in
progress?.setProgressHandler(nil)
guard
let self = self,
let subscriber = self.subscriber
@@ -195,25 +197,24 @@ extension DataStack {
}
}
)
guard let progress = progress else {
if let progress = progress {
return
}
progress.cs_setProgressHandler { [weak self] progress in
guard
let self = self,
let subscriber = self.subscriber
else {
progress.cs_setProgressHandler { [weak self] progress in
return
}
_ = subscriber.receive(
.migrating(
storage: self.storage,
progressObject: progress
guard
let self = self,
let subscriber = self.subscriber
else {
return
}
_ = subscriber.receive(
.migrating(
storage: self.storage,
progressObject: progress
)
)
)
}
}
}