X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/29ba1dd35ffcafe1cbd2842fbca15f2ad30238ff..9a2566b262128695551d61f56f0eb3564a2b0fe5:/src/mw/clicommands.py diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py index c4b016a..eaadb7c 100644 --- a/src/mw/clicommands.py +++ b/src/mw/clicommands.py @@ -24,6 +24,7 @@ import mw.metadir from optparse import OptionParser, OptionGroup import os import sys +import time class CommandBase(object): @@ -57,6 +58,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'] @@ -107,6 +118,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): @@ -139,9 +177,11 @@ class PullCommand(CommandBase): 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')) + 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): @@ -174,19 +214,21 @@ class DiffCommand(CommandBase): class CommitCommand(CommandBase): def __init__(self): - CommandBase.__init__(self, 'commit', 'commit changes to wiki') + usage = '[FILES]' + CommandBase.__init__(self, 'commit', 'commit changes to wiki', usage) self.shortcuts.append('ci') 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() self._api_setup() - print 'WARNING: mw does not do collision detection yet.' - print 'Hit ^C now if you haven\'t double checked, otherwise hit Enter' - raw_input() - status = self.metadir.working_dir_status() + status = self.metadir.working_dir_status(files=self.args) nothing_to_commit = True for file in status: print '%s %s' % (status[file], file) @@ -194,29 +236,36 @@ class CommitCommand(CommandBase): nothing_to_commit = False if nothing_to_commit: print 'nothing to commit' + sys.exit() + if self.options.edit_summary == None: + print 'Edit summary:', + edit_summary = raw_input() else: - if self.options.edit_summary == None: - print 'Edit summary:', - edit_summary = raw_input() - else: - edit_summary = self.options.edit_summary + edit_summary = self.options.edit_summary for file in status: if status[file] in ['U']: # get edit token data = { 'action': 'query', - 'prop': 'info', + 'prop': 'info|revisions', 'intoken': 'edit', 'titles': mw.api.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] + if revid != awaitedrevid: + print 'warning: edit conflict detected on %s (%s -> %s) ' \ + '-- skipping!' % (file, awaitedrevid, revid) + continue edittoken = response['query']['pages'][pageid]['edittoken'] - # FIXME use basetimestamp and starttimestamp 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) @@ -229,8 +278,19 @@ class CommitCommand(CommandBase): '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'], @@ -241,6 +301,8 @@ class CommitCommand(CommandBase): 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 'committing %s failed: %s' % \ + print 'error: committing %s failed: %s' % \ (file, response['edit']['result'])