PapaTutuWawa/mira
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fix: Fix inconsistencies in the SubscriptionManager's data model

Browse Source
This commit is contained in:
PapaTutuWawa 2021-06-13 00:10:17 +02:00
parent 6bfa10a4e2
commit dfba2a26df
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
mira/subscription.py
View File

@ -21,17 +21,11 @@ import json
from mira.storage import StorageManager from mira.storage import StorageManager
def append_or_insert(dict_, key, value): def append_or_insert(dict_, key, value):
if key in dict_ or dict_[key]: if key in dict_:
dict_[key].append(value) dict_[key].append(value)
else: else:
dict_[key] = [value] dict_[key] = [value]
def remove_or_delete(dict_, key, value):
if value in dict_[key] and len(dict_[key]) == 1:
del dict_[key]
else:
dict_[key].remove(value)
class SubscriptionManager: class SubscriptionManager:
''' '''
This class is tasked with providing functions that simplify dealing This class is tasked with providing functions that simplify dealing
@ -58,6 +52,10 @@ class SubscriptionManager:
SubscriptionManager.__instance = self SubscriptionManager.__instance = self
def get_subscriptions_for(self, module, jid): def get_subscriptions_for(self, module, jid):
'''
Returns a dictionary keyword -> data which represents
every subscription a jid has in the context of @module.
'''
if not module in self._subscriptions: if not module in self._subscriptions:
return [] return []
if not jid in self._subscriptions[module]: if not jid in self._subscriptions[module]:
@ -81,6 +79,24 @@ class SubscriptionManager:
tmp.append((jid, data)) tmp.append((jid, data))
return tmp return tmp
def get_subscriptions_for_keywords(self, module, keywords):
'''
Returns an array of JIDs that are subscribed to at least one of the keywords
of module
'''
if not module in self._subscriptions:
return []
tmp = []
keyword_set = set(keywords)
for jid in self._subscriptions[module]:
if set(self._subscriptions[module][jid].keys()) & keyword_set:
continue
data = self._subscriptions[module][jid][keyword]['data']
tmp.append((jid, data))
return tmp
def get_subscription_keywords(self, module): def get_subscription_keywords(self, module):
'''Returns a list of subscribed keywords in module''' '''Returns a list of subscribed keywords in module'''
if not module in self._subscriptions: if not module in self._subscriptions:
@ -118,11 +134,12 @@ class SubscriptionManager:
''' '''
if not module in self._subscriptions: if not module in self._subscriptions:
self._subscriptions[module] = {} self._subscriptions[module] = {}
if not jid in self._subscriptions[module]:
self._subscriptions[module][jid] = {}
append_or_insert(self._subscriptions[module], jid, { self._subscriptions[module][jid][keyword] = {
'keyword': keyword,
'data': data 'data': data
}) }
self.__flush() self.__flush()
def append_data_for_subscription(self, module, jid, keyword, item): def append_data_for_subscription(self, module, jid, keyword, item):
@ -156,7 +173,13 @@ class SubscriptionManager:
Removes a subscription to @keyword for @jid within the context Removes a subscription to @keyword for @jid within the context
of @module of @module
''' '''
remove_or_delete(self._subscriptions[module], jid, keyword) del self._subscriptions[module][jid][keyword]
if not self._subscriptions[module][jid]:
del self._subscriptions[module][jid]
if not self._subscriptions[module]:
del self._subscriptions[module]
self.__flush() self.__flush()
def remove_item_for_subscription(self, module, jid, keyword, item): def remove_item_for_subscription(self, module, jid, keyword, item):
@ -179,4 +202,4 @@ class SubscriptionManager:
''' '''
Write subscription data to disk. Just an interface to StorageManager Write subscription data to disk. Just an interface to StorageManager
''' '''
self._sm.set_data('_StorageManager', 'subscriptions', self._subscriptions) self._sm.set_data('_SubscriptionManager', 'subscriptions', self._subscriptions)