This commit is contained in:
Михаил Капелько
2023-12-25 18:27:24 +03:00
parent a77e1c82b4
commit 06c143efb4
4 changed files with 105 additions and 106 deletions

View File

@@ -17,6 +17,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate
window?.backgroundColor = UIColor.white
window?.makeKeyAndVisible()
Bus.processSyncG(
MeetupId.shouldFormat, MeetupId.K.meetupIdTextUI.rawValue, MeetupId.K.meetupIdTextApp.rawValue
)
return true
}
}

30
src/Bus.Aux.swift Normal file
View File

@@ -0,0 +1,30 @@
extension Bus {
/// Пропускаем далее предоставленные ключи.
static func convertKeyValue<T>(
_ keys: Set<String>,
_ v: (key: String, value: Any)
) -> (String, T)? {
guard
keys.contains(v.key),
let value = v.value as? T
else {
return nil
}
return (v.key, value)
}
/// Обрабатываем.
static func processKeyValue<Src, Dst>(
_ v: (key: String, value: Any),
_ keyIn: String,
_ handler: @escaping ((Src) -> Dst?)
) -> Dst? {
guard
v.key == keyIn,
let vIn = v.value as? Src
else {
return nil
}
return handler(vIn)
}
}

View File

@@ -6,12 +6,12 @@ public enum Bus { }
extension Bus {
final class Service {
static let singleton = Service()
let broadcaster = PassthroughSubject<(key: String, value: Any), Never>()
let events = PassthroughSubject<(key: String, value: Any), Never>()
var subscriptions = Set<AnyCancellable>()
func send(_ key: String, _ value: Any) {
/**/print("ИГР BusS.send key/value: '\(key)'/'\(value)'")
broadcaster.send((key, value))
events.send((key, value))
}
}
}
@@ -22,16 +22,8 @@ public extension Bus {
_ keys: Set<String>,
_ handler: @escaping ((String, T) -> Void)
) {
Service.singleton.broadcaster
.compactMap { v -> (String, T)? in
guard
keys.contains(v.key),
let value = v.value as? T
else {
return nil
}
return (v.key, value)
}
Service.singleton.events
.compactMap { convertKeyValue(keys, $0) }
.receive(on: DispatchQueue.main)
.sink { v in handler(v.0, v.1) }
.store(in: &subscriptions)
@@ -42,16 +34,8 @@ public extension Bus {
_ keys: Set<String>,
_ handler: @escaping ((String, T) -> Void)
) {
Service.singleton.broadcaster
.compactMap { v -> (String, T)? in
guard
keys.contains(v.key),
let value = v.value as? T
else {
return nil
}
return (v.key, value)
}
Service.singleton.events
.compactMap { convertKeyValue(keys, $0) }
.sink { v in handler(v.0, v.1) }
.store(in: &subscriptions)
}
@@ -77,7 +61,7 @@ public extension Bus {
.store(in: &subscriptions)
}
static func sendOnce(_ key: String, _ value: Any) {
static func send(_ key: String, _ value: Any) {
Service.singleton.send(key, value)
}
}
@@ -89,16 +73,8 @@ public extension Bus {
_ keyIn: String,
_ keyOut: String
) {
Service.singleton.broadcaster
.compactMap {
guard
$0.key == keyIn,
let vIn = $0.value as? Src
else {
return nil
}
return handler(vIn)
}
Service.singleton.events
.compactMap { processKeyValue($0, keyIn, handler) }
.sink { vOut in Service.singleton.send(keyOut, vOut) }
.store(in: &subscriptions)
}
@@ -108,16 +84,8 @@ public extension Bus {
_ keyIn: String,
_ keyOut: String
) {
Service.singleton.broadcaster
.compactMap {
guard
$0.key == keyIn,
let vIn = $0.value as? Src
else {
return nil
}
return handler(vIn)
}
Service.singleton.events
.compactMap { processKeyValue($0, keyIn, handler) }
.sink { vOut in Service.singleton.send(keyOut, vOut) }
.store(in: &Service.singleton.subscriptions)
}

View File

@@ -23,10 +23,6 @@ enum MeetupId {
}
return r
}
Bus.processSyncG(
shouldFormat, K.meetupIdTextUI.rawValue, K.meetupIdTextApp.rawValue
)
}