Skip to content

Ignore the value of object if darwinNotify. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 21, 2023
Merged

Ignore the value of object if darwinNotify. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c837be
Ignore the value of `object` if `darwinNotify`.
p-x9 Jan 21, 2023
07bd3ff
limit observer and object types to class types
p-x9 Jan 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Sources/SCFNotification/Extension/Array+.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,16 @@ extension Array where Element == Observation {
$0.observer != nil
}
}

func notifyNeededOnly(observer: UnsafeMutableRawPointer?, object: UnsafeRawPointer?) -> Array<Element> {
filter {
guard observer == $0.observerPtr else {
return false
}
if let objectPtr = $0.objectPtr {
return object == objectPtr
}
return true
}
}
}
17 changes: 12 additions & 5 deletions Sources/SCFNotification/Observation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,22 @@ struct Observation {
weak var object: AnyObject?

var observerPtr: UnsafeMutableRawPointer? {
unsafeBitCast(observer, to: UnsafeMutableRawPointer?.self)
guard let observer = self.observer else {
return nil
}
return unsafeBitCast(observer, to: UnsafeMutableRawPointer?.self)
}

var objectPtr: UnsafeRawPointer? {
unsafeBitCast(object, to: UnsafeRawPointer?.self)
guard let object = self.object else {
return nil
}
return unsafeBitCast(object, to: UnsafeRawPointer?.self)
}

let notify: SCFNotificationCallbackObjC
init<Observer, Object>(name: CFString, observer: Observer, object: Object?, notify: SCFNotificationCallback<Observer, Object>?) {

init<Observer: AnyObject, Object: AnyObject>(name: CFString, observer: Observer, object: Object?, notify: SCFNotificationCallback<Observer, Object>?) {
self.name = name as CFString
self.observer = observer as AnyObject?
self.object = object as AnyObject?
Expand All @@ -40,7 +46,8 @@ struct Observation {
observer = unsafeBitCast(observerPtr, to: Observer?.self)
}
var object: Object?
if let objectPtr {
if let objectPtr,
center?.centerType != .darwinNotify {
object = unsafeBitCast(objectPtr, to: Object?.self)
}
notify?(center, observer, name, object, userInfo)
Expand Down
2 changes: 1 addition & 1 deletion Sources/SCFNotification/ObservationStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class ObservationStore {
}

observations
.filterWith(observer: observer, object: object)
.notifyNeededOnly(observer: observer, object: object)
.forEach {
$0.notify(center.cfNotificationCenter, observer, name, object, userInfo)
}
Expand Down
56 changes: 30 additions & 26 deletions Sources/SCFNotification/SCFNotificationCenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation

public typealias SCFNotificationCallback<Observer, Object> = (CFNotificationCenter?, Observer?, CFNotificationName?, Object?, CFDictionary?) -> Void
public typealias SCFNotificationCallback<Observer: AnyObject, Object: AnyObject> = (CFNotificationCenter?, Observer?, CFNotificationName?, Object?, CFDictionary?) -> Void


public class SCFNotificationCenter {
Expand All @@ -17,11 +17,11 @@ public class SCFNotificationCenter {
self.center = center
}

public func addObserver<Observer>(observer: Observer,
name: CFNotificationName,
object: Any? = nil,
suspensionBehavior: CFNotificationSuspensionBehavior,
callback: @escaping SCFNotificationCallback<Observer, Any>) {
public func addObserver<Observer: AnyObject>(observer: Observer,
name: CFNotificationName,
object: AnyObject? = nil,
suspensionBehavior: CFNotificationSuspensionBehavior,
callback: @escaping SCFNotificationCallback<Observer, AnyObject>) {
Self.addObserver(center: center,
observer: observer,
name: name,
Expand All @@ -30,22 +30,22 @@ public class SCFNotificationCenter {
callback: callback)
}

public func removeObserver<Observer>(observer: Observer,
name: CFNotificationName,
object: Any? = nil) {
public func removeObserver<Observer: AnyObject>(observer: Observer,
name: CFNotificationName,
object: AnyObject? = nil) {
Self.removeObserver(center: center,
observer: observer,
name: name,
object: object)
}

public func removeEveryObserver<Observer>(observer: Observer) {
public func removeEveryObserver<Observer: AnyObject>(observer: Observer) {
Self.removeEveryObserver(center: center,
observer: observer)
}

public func postNotification(name: CFNotificationName?,
object: Any? = nil,
object: AnyObject? = nil,
userInfo: CFDictionary,
deliverImmediately: Bool) {
Self.postNotification(center: center,
Expand All @@ -58,18 +58,22 @@ public class SCFNotificationCenter {


extension SCFNotificationCenter {
public static func addObserver<Observer>(center: CenterType,
observer: Observer,
name: CFNotificationName,
object: Any? = nil,
suspensionBehavior: CFNotificationSuspensionBehavior,
callback: @escaping SCFNotificationCallback<Observer, Any>) {

let observation = Observation(name: name.rawValue,
public static func addObserver<Observer: AnyObject>(center: CenterType,
observer: Observer,
name: CFNotificationName,
object: AnyObject? = nil,
suspensionBehavior: CFNotificationSuspensionBehavior,
callback: @escaping SCFNotificationCallback<Observer, AnyObject>) {

var observation = Observation(name: name.rawValue,
observer: observer,
object: object,
notify: callback)

if center == .darwinNotify {
observation.object = nil
}

ObservationStore.shared.add(observation, center: center)

CFNotificationCenterAddObserver(center.cfNotificationCenter, observation.observerPtr, { center, observer, name, object, userInfo in
Expand All @@ -83,10 +87,10 @@ extension SCFNotificationCenter {
}, observation.name, observation.objectPtr, suspensionBehavior)
}

public static func removeObserver<Observer>(center: CenterType,
observer: Observer,
name: CFNotificationName,
object: Any? = nil) {
public static func removeObserver<Observer: AnyObject>(center: CenterType,
observer: Observer,
name: CFNotificationName,
object: AnyObject? = nil) {
let observer = unsafeBitCast(observer, to: UnsafeMutableRawPointer.self)

var objectPtr: UnsafeRawPointer?
Expand All @@ -99,8 +103,8 @@ extension SCFNotificationCenter {
CFNotificationCenterRemoveObserver(center.cfNotificationCenter, observer, name, objectPtr)
}

public static func removeEveryObserver<Observer>(center: CenterType,
observer: Observer) {
public static func removeEveryObserver<Observer: AnyObject>(center: CenterType,
observer: Observer) {
let observer = unsafeBitCast(observer, to: UnsafeMutableRawPointer.self)

ObservationStore.shared.removeEvery(center: center, observer: observer)
Expand All @@ -109,7 +113,7 @@ extension SCFNotificationCenter {

public static func postNotification(center: CenterType,
name: CFNotificationName?,
object: Any? = nil,
object: AnyObject? = nil,
userInfo: CFDictionary,
deliverImmediately: Bool) {
var objectPtr: UnsafeRawPointer?
Expand Down