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

revert Objc method changes

Browse Source
This commit is contained in:
John Estropia
2021-09-22 15:03:46 +09:00
parent a1a04aaf8a
commit bf10f4668c
3 changed files with 19 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
Sources/CSDataStack+Transaction.swift
View File

@@ -37,9 +37,7 @@ extension CSDataStack {
- parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
*/
@objc
public func beginAsynchronous(
_ closure: @escaping (_ transaction: CSAsynchronousDataTransaction) -> Void
) {
public func beginAsynchronous(_ closure: @escaping (_ transaction: CSAsynchronousDataTransaction) -> Void) {
self.bridgeToSwift.perform(
asynchronous: { (transaction) in
@@ -59,37 +57,6 @@ extension CSDataStack {
)
}
/**
Begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
- parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
- parameter sourceIdentifier: an optional value that identifies the source of this transaction. This identifier will be passed to the change notifications and callers can use it for custom handling that depends on the source.
*/
@objc
public func beginAsynchronous(
_ closure: @escaping (_ transaction: CSAsynchronousDataTransaction) -> Void,
_ sourceIdentifier: Any?
) {
self.bridgeToSwift.perform(
asynchronous: { (transaction) in
let csTransaction = transaction.bridgeToObjectiveC
closure(csTransaction)
if !transaction.isCommitted && transaction.hasChanges {
Internals.log(
.warning,
message: "The closure for the \(Internals.typeName(csTransaction)) completed without being committed. All changes made within the transaction were discarded."
)
}
try transaction.cancel()
},
sourceIdentifier: sourceIdentifier,
completion: { _ in }
)
}
/**
Begins a transaction synchronously where `NSManagedObject` creates, updates, and deletes can be made.
@@ -98,9 +65,7 @@ extension CSDataStack {
- returns: `YES` if the commit succeeded, `NO` if the commit failed. If `NO`, the `error` argument will hold error information.
*/
@objc
public func beginSynchronous(
_ closure: @escaping (_ transaction: CSSynchronousDataTransaction) -> Void,
error: NSErrorPointer) -> Bool {
public func beginSynchronous(_ closure: @escaping (_ transaction: CSSynchronousDataTransaction) -> Void, error: NSErrorPointer) -> Bool {
return bridge(error) {
@@ -129,49 +94,6 @@ extension CSDataStack {
}
}
/**
Begins a transaction synchronously where `NSManagedObject` creates, updates, and deletes can be made.
- parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
- parameter sourceIdentifier: an optional value that identifies the source of this transaction. This identifier will be passed to the change notifications and callers can use it for custom handling that depends on the source.
- parameter error: the `CSError` pointer that indicates the reason in case of an failure
- returns: `YES` if the commit succeeded, `NO` if the commit failed. If `NO`, the `error` argument will hold error information.
*/
@objc
public func beginSynchronous(
_ closure: @escaping (_ transaction: CSSynchronousDataTransaction) -> Void,
sourceIdentifier: Any?,
error: NSErrorPointer
) -> Bool {
return bridge(error) {
do {
try self.bridgeToSwift.perform(
synchronous: { (transaction) in
let csTransaction = transaction.bridgeToObjectiveC
closure(csTransaction)
if !transaction.isCommitted && transaction.hasChanges {
Internals.log(
.warning,
message: "The closure for the \(Internals.typeName(csTransaction)) completed without being committed. All changes made within the transaction were discarded."
)
}
try transaction.cancel()
},
sourceIdentifier: sourceIdentifier
)
}
catch CoreStoreError.userCancelled {
return
}
}
}
/**
Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
@@ -190,61 +112,15 @@ extension CSDataStack {
/**
Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
To support "undo" methods such as `-undo`, `-redo`, and `-rollback`, use the `-beginSafeWithSupportsUndo:` method passing `YES` to the argument. Without "undo" support, calling those methods will raise an exception.
- parameter sourceIdentifier: an optional value that identifies the source of this transaction. This identifier will be passed to the change notifications and callers can use it for custom handling that depends on the source.
- prameter supportsUndo: `-undo`, `-redo`, and `-rollback` methods are only available when this parameter is `YES`, otherwise those method will raise an exception. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited.
- returns: a `CSUnsafeDataTransaction` instance where creates, updates, and deletes can be made.
*/
@objc
public func beginUnsafeWithSourceIdentifier(
_ sourceIdentifier: Any?
) -> CSUnsafeDataTransaction {
public func beginUnsafeWithSupportsUndo(_ supportsUndo: Bool) -> CSUnsafeDataTransaction {
return bridge {
self.bridgeToSwift.beginUnsafe(
sourceIdentifier: sourceIdentifier
)
}
}
/**
Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
- parameter supportsUndo: `-undo`, `-redo`, and `-rollback` methods are only available when this parameter is `YES`, otherwise those method will raise an exception. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited.
- returns: a `CSUnsafeDataTransaction` instance where creates, updates, and deletes can be made.
*/
@objc
public func beginUnsafeWithSupportsUndo(
_ supportsUndo: Bool
) -> CSUnsafeDataTransaction {
return bridge {
self.bridgeToSwift.beginUnsafe(
supportsUndo: supportsUndo
)
}
}
/**
Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
- parameter supportsUndo: `-undo`, `-redo`, and `-rollback` methods are only available when this parameter is `YES`, otherwise those method will raise an exception. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited.
- parameter sourceIdentifier: an optional value that identifies the source of this transaction. This identifier will be passed to the change notifications and callers can use it for custom handling that depends on the source.
- returns: a `CSUnsafeDataTransaction` instance where creates, updates, and deletes can be made.
*/
@objc
public func beginUnsafeWithSupportsUndo(
_ supportsUndo: Bool,
sourceIdentifier: Any?
) -> CSUnsafeDataTransaction {
return bridge {
self.bridgeToSwift.beginUnsafe(
supportsUndo: supportsUndo,
sourceIdentifier: sourceIdentifier
)
self.bridgeToSwift.beginUnsafe(supportsUndo: supportsUndo)
}
}

5
Sources/CSSynchronousDataTransaction.swift
View File

@@ -49,10 +49,9 @@ public final class CSSynchronousDataTransaction: CSBaseDataTransaction, CoreStor
return bridge(error) {
let transaction = self.bridgeToSwift
if case (_, let error?) = transaction.context.saveSynchronously(
if case (_, let error?) = self.bridgeToSwift.context.saveSynchronously(
waitForMerge: true,
sourceIdentifier: transaction.sourceIdentifier
sourceIdentifier: nil
) {
throw error

72
Sources/CSUnsafeDataTransaction.swift
View File

@@ -46,21 +46,20 @@ public final class CSUnsafeDataTransaction: CSBaseDataTransaction, CoreStoreObje
@objc
public func commitWithSuccess(_ success: (() -> Void)?, _ failure: ((CSError) -> Void)?) {
let transaction = self.bridgeToSwift
transaction.context.saveAsynchronously(
sourceIdentifier: transaction.sourceIdentifier,
self.bridgeToSwift.context.saveAsynchronously(
sourceIdentifier: nil,
completion: { (_, error) in
defer {
withExtendedLifetime(self, {})
}
if let error = error {
failure?(error.bridgeToObjectiveC)
}
else {
success?()
}
}
@@ -75,13 +74,12 @@ public final class CSUnsafeDataTransaction: CSBaseDataTransaction, CoreStoreObje
*/
@objc
public func commitAndWait(error: NSErrorPointer) -> Bool {
return bridge(error) {
let transaction = self.bridgeToSwift
if case (_, let error?) = transaction.context.saveSynchronously(
if case (_, let error?) = self.bridgeToSwift.context.saveSynchronously(
waitForMerge: true,
sourceIdentifier: transaction.sourceIdentifier
sourceIdentifier: nil
) {
throw error
@@ -160,61 +158,15 @@ public final class CSUnsafeDataTransaction: CSBaseDataTransaction, CoreStoreObje
/**
Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
To support "undo" methods such as `-undo`, `-redo`, and `-rollback`, use the `-beginSafeWithSupportsUndo:` method passing `YES` to the argument. Without "undo" support, calling those methods will raise an exception.
- parameter sourceIdentifier: an optional value that identifies the source of this transaction. This identifier will be passed to the change notifications and callers can use it for custom handling that depends on the source.
- prameter supportsUndo: `-undo`, `-redo`, and `-rollback` methods are only available when this parameter is `YES`, otherwise those method will raise an exception. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited.
- returns: a `CSUnsafeDataTransaction` instance where creates, updates, and deletes can be made.
*/
@objc
public func beginUnsafeWithSourceIdentifier(
_ sourceIdentifier: Any?
) -> CSUnsafeDataTransaction {
public func beginUnsafeWithSupportsUndo(_ supportsUndo: Bool) -> CSUnsafeDataTransaction {
return bridge {
self.bridgeToSwift.beginUnsafe(
sourceIdentifier: sourceIdentifier
)
}
}
/**
Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
- parameter supportsUndo: `-undo`, `-redo`, and `-rollback` methods are only available when this parameter is `YES`, otherwise those method will raise an exception. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited.
- returns: a `CSUnsafeDataTransaction` instance where creates, updates, and deletes can be made.
*/
@objc
public func beginUnsafeWithSupportsUndo(
_ supportsUndo: Bool
) -> CSUnsafeDataTransaction {
return bridge {
self.bridgeToSwift.beginUnsafe(
supportsUndo: supportsUndo
)
}
}
/**
Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
- parameter supportsUndo: `-undo`, `-redo`, and `-rollback` methods are only available when this parameter is `YES`, otherwise those method will raise an exception. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited.
- parameter sourceIdentifier: an optional value that identifies the source of this transaction. This identifier will be passed to the change notifications and callers can use it for custom handling that depends on the source.
- returns: a `CSUnsafeDataTransaction` instance where creates, updates, and deletes can be made.
*/
@objc
public func beginUnsafeWithSupportsUndo(
_ supportsUndo: Bool,
sourceIdentifier: Any?
) -> CSUnsafeDataTransaction {
return bridge {
self.bridgeToSwift.beginUnsafe(
supportsUndo: supportsUndo,
sourceIdentifier: sourceIdentifier
)
self.bridgeToSwift.beginUnsafe(supportsUndo: supportsUndo)
}
}