From: Ian Weller Date: Mon, 31 Jan 2011 23:04:29 +0000 (-0700) Subject: Merge git://github.com/esby/mw X-Git-Url: https://projects.mako.cc/source/mw/commitdiff_plain/e20392dd7415616f40ec65b4b5e2f9a2dc6efe4d?ds=sidebyside;hp=-c Merge git://github.com/esby/mw Conflicts: src/mw/clicommands.py --- e20392dd7415616f40ec65b4b5e2f9a2dc6efe4d diff --combined src/mw/clicommands.py index 73322bc,eaadb7c..9efffd4 --- a/src/mw/clicommands.py +++ b/src/mw/clicommands.py @@@ -17,14 -17,14 +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): @@@ -77,10 -77,8 +78,10 @@@ 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): @@@ -120,6 -118,33 +121,33 @@@ class LogoutCommand(CommandBase) except OSError: 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)]: + #http://commons.wikimedia.org/w/api.php?action=query&format=xmlfm&generator=categorymembers&gcmlimit=500&gcmtitle=Category:User:Esby + 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): @@@ -151,7 -176,7 +179,7 @@@ 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]['*'] @@@ -183,7 -208,7 +211,7 @@@ class DiffCommand(CommandBase) for file in status: if status[file] == 'U': print self.metadir.diff_rv_to_working( - mw.api.filename_to_pagename(file[:-5])), + mw.metadir.filename_to_pagename(file[:-5])), class CommitCommand(CommandBase): @@@ -224,7 -249,7 +252,7 @@@ '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] @@@ -247,7 -272,7 +275,7 @@@ 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, @@@ -276,6 -301,8 +304,8 @@@ response = self.api.call(data)['query']['pages'] self.metadir.pages_add_rv(int(pageid), response[pageid]['revisions'][0]) + print 'waiting 10s before processing the next file' + time.sleep(10) else: print 'error: committing %s failed: %s' % \ (file, response['edit']['result'])