jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update RSM iterator to specify where to look to count result sizes.

Browse Source
This commit is contained in:
Lance Stout 2012-09-25 20:17:37 -07:00
parent a6ca6701a0
commit 94e8b2becf
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sleekxmpp/plugins/xep_0059/rsm.py
View File

@ -25,11 +25,14 @@ class ResultIterator():
An iterator for Result Set Managment An iterator for Result Set Managment
""" """
def __init__(self, query, interface, amount=10, start=None, reverse=False): def __init__(self, query, interface, results='substanzas', amount=10,
start=None, reverse=False):
""" """
Arguments: Arguments:
query -- The template query query -- The template query
interface -- The substanza of the query, for example disco_items interface -- The substanza of the query, for example disco_items
results -- The query stanza's interface which provides a
countable list of query results.
amount -- The max amounts of items to request per iteration amount -- The max amounts of items to request per iteration
start -- From which item id to start start -- From which item id to start
reverse -- If True, page backwards through the results reverse -- If True, page backwards through the results
@ -46,6 +49,7 @@ class ResultIterator():
self.amount = amount self.amount = amount
self.start = start self.start = start
self.interface = interface self.interface = interface
self.results = results
self.reverse = reverse self.reverse = reverse
self._stop = False self._stop = False
@ -85,7 +89,7 @@ class ResultIterator():
r[self.interface]['rsm']['first_index']: r[self.interface]['rsm']['first_index']:
count = int(r[self.interface]['rsm']['count']) count = int(r[self.interface]['rsm']['count'])
first = int(r[self.interface]['rsm']['first_index']) first = int(r[self.interface]['rsm']['first_index'])
num_items = len(r[self.interface]['substanzas']) num_items = len(r[self.interface][self.results])
if first + num_items == count: if first + num_items == count:
self._stop = True self._stop = True
@ -123,7 +127,7 @@ class XEP_0059(BasePlugin):
def session_bind(self, jid): def session_bind(self, jid):
self.xmpp['xep_0030'].add_feature(Set.namespace) self.xmpp['xep_0030'].add_feature(Set.namespace)
def iterate(self, stanza, interface): def iterate(self, stanza, interface, results='substanzas'):
""" """
Create a new result set iterator for a given stanza query. Create a new result set iterator for a given stanza query.
@ -135,5 +139,7 @@ class XEP_0059(BasePlugin):
result set management stanza should be result set management stanza should be
appended. For example, for disco#items queries appended. For example, for disco#items queries
the interface 'disco_items' should be used. the interface 'disco_items' should be used.
results -- The name of the interface containing the
query results (typically just 'substanzas').
""" """
return ResultIterator(stanza, interface) return ResultIterator(stanza, interface, results)