libervia-pubsub: idavoll/memory_storage.py comparison

Change semantics of Node.is_subscribed() to match all subscriptions for an entity (all resources).

comparison

equal deleted inserted replaced

-:f393bccec4bc
+:b4490bdc77e5
 in self._subscriptions.iteritems()
 if subscription.state == 'subscribed']
 return defer.succeed(subscribers)
-def is_subscribed(self, subscriber):
+def is_subscribed(self, entity):
-try:
+for subscriber, subscription in self._subscriptions.iteritems():
-subscription = self._subscriptions[subscriber.full()]
+if jid.JID(subscriber).userhost() == entity.userhost() and \
-except KeyError:
+subscription.state == 'subscribed':
-return defer.succeed(False)
+return defer.succeed(True)
-return defer.succeed(subscription.state == 'subscribed')
+return defer.succeed(False)
 def get_affiliations(self):
 affiliations = [(jid.JID(entity), affiliation) for entity, affiliation
 in self._affiliations.iteritems()]
 return defer.succeed(affiliations)
-class LeafNode(Node):
+class LeafNodeMixin:
-implements(storage.ILeafNode)
 type = 'leaf'
-def __init__(self, node_id, owner, config):
+def __init__(self):
-Node.__init__(self, node_id, owner, config)
 self._items = {}
 self._itemlist = []
 def store_items(self, items, publisher):
 for data in items:
 self._items = {}
 self._itemlist = []
 return defer.succeed(None)
+class LeafNode(Node, LeafNodeMixin):
+implements(storage.ILeafNode)
+def __init__(self, node_id, owner, config):
+Node.__init__(self, node_id, owner, config)
+LeafNodeMixin.__init__(self)
 class Subscription:
 implements(storage.ISubscription)
 def __init__(self, state):

Mercurial > libervia-pubsub