mirrors/loro
1
0
Fork 0
mirror of https://github.com/loro-dev/loro.git synced 2025-02-02 11:06:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: unsubscribe

Browse source
This commit is contained in:
leeeon233 2023-01-31 17:57:28 +08:00 committed by Leonzhao
parent 189ea685eb
commit 8545a0aa75
1 changed files with 16 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
crates/loro-internal/src/hierarchy.rs
View file

@ -346,51 +346,17 @@ impl Hierarchy {
event.current_target = target;
};
for sub_id in dispatch.sub_ids.iter() {
{
let mut hierarchy_guard = hierarchy.try_lock().unwrap();
hierarchy_guard.call_before(observers, sub_id)
}
if let Some(observer) = observers.get_mut(sub_id) {
observer.call(&event);
}
{
let mut hierarchy_guard = hierarchy.try_lock().unwrap();
hierarchy_guard.call_after(observers, sub_id)
if observer.once() {
let mut hierarchy_guard = hierarchy.try_lock().unwrap();
hierarchy_guard.deleted_observers.insert(*sub_id);
}
}
}
}
}
#[inline]
fn call_before(
&mut self,
observers: &mut FxHashMap<SubscriptionID, Observer>,
id: &SubscriptionID,
) {
if self.deleted_observers.contains(id) {
self._remove_observer(id, observers);
observers.remove(id);
self.deleted_observers.remove(id);
}
}
#[inline]
fn call_after(
&mut self,
observers: &mut FxHashMap<SubscriptionID, Observer>,
id: &SubscriptionID,
) {
// how to simplify ?
let remove = if let Some(observer) = observers.get(id) {
observer.once()
} else {
false
};
if remove {
self._remove_observer(id, observers);
}
}
#[inline]
fn reset(hierarchy: Arc<Mutex<Hierarchy>>, mut observers: FxHashMap<SubscriptionID, Observer>) {
let mut hierarchy_guard = hierarchy.try_lock().unwrap();
@ -447,18 +413,19 @@ impl Hierarchy {
id: &SubscriptionID,
observers: &mut FxHashMap<SubscriptionID, Observer>,
) {
let observer = observers.get(id).unwrap();
let root = observer.root();
if root {
self.root_observers.remove(id);
} else {
let container = observer.container().as_ref().unwrap();
// Assuming the container must exist if the observer exists
let x = self.nodes.get_mut(container).unwrap();
if observer.deep() {
x.observers.remove(id);
if let Some(observer) = observers.get(id) {
let root = observer.root();
if root {
self.root_observers.remove(id);
} else {
x.deep_observers.remove(id);
let container = observer.container().as_ref().unwrap();
// Assuming the container must exist if the observer exists
let x = self.nodes.get_mut(container).unwrap();
if observer.deep() {
x.observers.remove(id);
} else {
x.deep_observers.remove(id);
}
}
}
observers.remove(id);