Added continue functionality to page.get_query() #129

Author: siznax

wptools/core.py

@@ -122,7 +122,7 @@ def _handle_continuations(self, response, cache_key):
         Select continue params and clear cache or last continue params
         """
         rcontinue = response.get('continue')
-        listen = ['blcontinue', 'cmcontinue']
+        listen = ['blcontinue', 'cmcontinue', 'plcontinue']
         cparams = {}
 
         if rcontinue:

wptools/page.py

@@ -173,7 +173,7 @@ def _query(self, action, qobj):
         if action == 'random':
             qstr = qobj.random()
         elif action == 'query':
-            qstr = qobj.query(title, pageid)
+            qstr = qobj.query(title, pageid, self._continue_params())
         elif action == 'querymore':
             qstr = qobj.querymore(title, pageid, self._continue_params())
         elif action == 'parse':
@@ -295,7 +295,7 @@ def _set_query_data(self, action='query'):
         data = self._load_response(action)
         page = data['query']['pages'][0]
 
-        self._handle_continuations(data, 'querymore')
+        self._handle_continuations(data, action)
 
         if action == 'query':
             self.data['random'] = data['query']['random'][0]["title"]
@@ -637,6 +637,9 @@ def get_query(self, show=True, proxy=None, timeout=0):
 
         self._get('query', show, proxy, timeout)
 
+        while self.data.get('continue'):
+            self._get('query', show, proxy, timeout)
+
         return self
 
     def get_querymore(self, show=True, proxy=None, timeout=0):

wptools/query.py

@@ -213,7 +213,7 @@ def parse(self, title, pageid=None):
 
         return qry
 
-    def query(self, titles, pageids=None):
+    def query(self, titles, pageids=None, cparams=None):
         """
         Returns MediaWiki action=query query string
         """
@@ -226,6 +226,10 @@ def query(self, titles, pageids=None):
         if pageids and not titles:
             query = query.replace('&titles=', '&pageids=')
 
+        if cparams:
+            query += cparams
+            status += " (%s)" % cparams
+
         if self.variant:
             query += '&variant=' + self.variant