Fixes a bug, a performance issue, and use 'M' instead of 'U' to be consistent with...

[mw] / src / mw / clicommands.py

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index 4f5fc48ab7c2ea060701e00a6fb57bff89ab2c7e..b0fb8bc1f2235aadf85f45975ec16bcb442e7c64 100644 (file)
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -17,13 +17,15 @@
 ###
 
 import codecs
+import cookielib
 import getpass
 import hashlib
-import mw.api
 import mw.metadir
 from optparse import OptionParser, OptionGroup
 import os
+import simplemediawiki
 import sys
+import time
 
 
 class CommandBase(object):
@@ -42,7 +44,7 @@ class CommandBase(object):
 
     def main(self):
         (self.options, self.args) = self.parser.parse_args()
-        self.args = self.args[1:] # don't need the first thing
+        self.args = self.args[1:]  # don't need the first thing
         self._do_command()
 
     def _do_command(self):
@@ -76,8 +78,10 @@ class CommandBase(object):
             sys.exit(1)
 
     def _api_setup(self):
+        cookie_file = os.path.join(self.metadir.location, 'cookies')
         self.api_url = self.metadir.config.get('remote', 'api_url')
-        self.api = mw.api.API(self.api_url, self.metadir)
+        self.api = simplemediawiki.MediaWiki(self.api_url,
+                                             cookie_file=cookie_file)
 
 
 class InitCommand(CommandBase):
@@ -118,6 +122,34 @@ class LogoutCommand(CommandBase):
             pass
 
 
+class PullCategoryMembersCommand(CommandBase):
+
+    def __init__(self):
+        usage = '[options] PAGENAME ...'
+        CommandBase.__init__(self, 'pullcat', 'add remote pages to repo '
+                             'belonging to the given category', usage)
+
+    def _do_command(self):
+        self._die_if_no_init()
+        self._api_setup()
+        pages = []
+        pages += self.args
+        for these_pages in [pages[i:i + 25] for i in range(0, len(pages), 25)]:
+            data = {
+                'action': 'query',
+                'gcmtitle': '|'.join(these_pages),
+                'generator': 'categorymembers',
+                'gcmlimit': 500
+            }
+        response = self.api.call(data)['query']['pages']
+        for pageid in response.keys():
+            pagename = response[pageid]['title']
+            print pagename
+            pullc = PullCommand()
+            pullc.args = [pagename.encode('utf-8')]
+            pullc._do_command()
+
+
 class PullCommand(CommandBase):
 
     def __init__(self):
@@ -148,7 +180,7 @@ class PullCommand(CommandBase):
                 self.metadir.pagedict_add(pagename, pageid, revids[-1])
                 self.metadir.pages_add_rv(int(pageid),
                                           response[pageid]['revisions'][0])
-                filename = mw.api.pagename_to_filename(pagename)
+                filename = mw.metadir.pagename_to_filename(pagename)
                 with file(os.path.join(self.metadir.root, filename + '.wiki'),
                           'w') as fd:
                     data = response[pageid]['revisions'][0]['*']
@@ -178,9 +210,9 @@ class DiffCommand(CommandBase):
         self._die_if_no_init()
         status = self.metadir.working_dir_status()
         for file in status:
-            if status[file] == 'U':
+            if status[file] == 'M':
                 print self.metadir.diff_rv_to_working(
-                        mw.api.filename_to_pagename(file[:-5])),
+                        mw.metadir.filename_to_pagename(file[:-5])),
 
 
 class CommitCommand(CommandBase):
@@ -204,7 +236,7 @@ class CommitCommand(CommandBase):
         nothing_to_commit = True
         for file in status:
             print '%s %s' % (status[file], file)
-            if status[file] in ['U']:
+            if status[file] in ['M']:
                 nothing_to_commit = False
         if nothing_to_commit:
             print 'nothing to commit'
@@ -214,26 +246,26 @@ class CommitCommand(CommandBase):
             edit_summary = raw_input()
         else:
             edit_summary = self.options.edit_summary
-        for file in status:
-            if status[file] in ['U']:
+        for file_num, file in enumerate(status):
+            if status[file] in ['M']:
                 # get edit token
                 data = {
                         'action': 'query',
                         'prop': 'info|revisions',
                         'intoken': 'edit',
-                        'titles': mw.api.filename_to_pagename(file[:-5]),
+                        'titles': mw.metadir.filename_to_pagename(file[:-5]),
                 }
                 response = self.api.call(data)
-                pageid = response['query']['pages'].keys()[0]
-                revid = response['query']['pages'][pageid]['revisions'][0]\
-                        ['revid']
-                awaitedrevid = self.metadir.pages_get_rv_list({'id': pageid})\
-                        [0]
+                pages = response['query']['pages']
+                pageid = pages.keys()[0]
+                revid = pages[pageid]['revisions'][0]['revid']
+                awaitedrevid = \
+                        self.metadir.pages_get_rv_list({'id': pageid})[0]
                 if revid != awaitedrevid:
                     print 'warning: edit conflict detected on %s (%s -> %s) ' \
                             '-- skipping!' % (file, awaitedrevid, revid)
                     continue
-                edittoken = response['query']['pages'][pageid]['edittoken']
+                edittoken = pages[pageid]['edittoken']
                 filename = os.path.join(self.metadir.root, file)
                 text = codecs.open(filename, 'r', 'utf-8').read()
                 text = text.encode('utf-8')
@@ -244,7 +276,7 @@ class CommitCommand(CommandBase):
                 textmd5 = md5.hexdigest()
                 data = {
                         'action': 'edit',
-                        'title': mw.api.filename_to_pagename(file[:-5]),
+                        'title': mw.metadir.filename_to_pagename(file[:-5]),
                         'token': edittoken,
                         'text': text,
                         'md5': textmd5,
@@ -273,6 +305,9 @@ class CommitCommand(CommandBase):
                     response = self.api.call(data)['query']['pages']
                     self.metadir.pages_add_rv(int(pageid),
                                               response[pageid]['revisions'][0])
+                    if file_num != len(status) - 1:
+                        print 'waiting 10s before processing the next file'
+                        time.sleep(10)
                 else:
                     print 'error: committing %s failed: %s' % \
                             (file, response['edit']['result'])