X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/b237e6295cb93a19ae1c7302ac47faeac5a53fc6..9c86686c71b075082be6d3870266cd929ad67b89:/src/mw/clicommands.py diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py index 9d8b2dc..b0fb8bc 100644 --- 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): @@ -57,6 +59,16 @@ class CommandBase(object): if result['login']['result'] == 'Success': # cookies are saved to a file print 'Login successful! (yay)' + elif result['login']['result'] == 'NeedToken': + print 'Login with token' + result = self.api.call({'action': 'login', + 'lgname': user, + 'lgpassword': passwd, + 'lgtoken': result['login']['token']}) + if result['login']['result'] == 'Success': + print 'Login successful! (yay)' + else: + print 'Login failed: %s' % result['login']['result'] else: print 'Login failed: %s' % result['login']['result'] @@ -66,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): @@ -108,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): @@ -138,10 +180,12 @@ 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) - fd = file(os.path.join(self.metadir.root, filename + '.wiki'), - 'w') - fd.write(response[pageid]['revisions'][0]['*'].encode('utf-8')) + 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]['*'] + data = data.encode('utf-8') + fd.write(data) class StatusCommand(CommandBase): @@ -166,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): @@ -180,6 +224,10 @@ class CommitCommand(CommandBase): self.parser.add_option('-m', '--message', dest='edit_summary', help='don\'t prompt for edit summary and ' 'use this instead') + self.parser.add_option('-b', '--bot', dest='bot', action='store_true', + help='mark actions as a bot (won\'t affect ' + 'anything if you don\'t have the bot right', + default=False) def _do_command(self): self._die_if_no_init() @@ -188,51 +236,65 @@ 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' sys.exit() - print - print 'WARNING: mw does not do collision detection yet.' - print 'Hit ^C now if you haven\'t double checked, otherwise hit Enter' - raw_input() if self.options.edit_summary == None: print 'Edit summary:', 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', + '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] - edittoken = response['query']['pages'][pageid]['edittoken'] - # FIXME use basetimestamp and starttimestamp + 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 = pages[pageid]['edittoken'] filename = os.path.join(self.metadir.root, file) text = codecs.open(filename, 'r', 'utf-8').read() text = text.encode('utf-8') - if text[-1] == '\n': + if (len(text) != 0) and (text[-1] == '\n'): text = text[:-1] md5 = hashlib.md5() md5.update(text) 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, 'summary': edit_summary, } + if self.options.bot: + data['bot'] = 'bot' response = self.api.call(data) if response['edit']['result'] == 'Success': + if 'nochange' in response['edit']: + print 'warning: no changes detected in %s - ' \ + 'skipping and removing ending LF' % file + self.metadir.clean_page(file[:-5]) + continue + if response['edit']['oldrevid'] != revid: + print 'warning: edit conflict detected on %s -- ' \ + 'skipping!' % file + continue data = { 'action': 'query', 'revids': response['edit']['newrevid'], @@ -243,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 'committing %s failed: %s' % \ + print 'error: committing %s failed: %s' % \ (file, response['edit']['result'])