X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/4a2642fa810e9b20e20d0b41029c2521bc6752eb..b30dcd7f4a701370778956d4e1b60947a853f639:/src/mw/clicommands.py diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py index 5eab8bd..4f5fc48 100644 --- a/src/mw/clicommands.py +++ b/src/mw/clicommands.py @@ -16,7 +16,9 @@ # with this program. If not, see . ### +import codecs import getpass +import hashlib import mw.api import mw.metadir from optparse import OptionParser, OptionGroup @@ -36,11 +38,6 @@ class CommandBase(object): self.parser = OptionParser(usage=usage, description=description) self.name = name self.metadir = mw.metadir.Metadir() - #global_options = OptionGroup(self.parser, "Global Options") - #global_options.add_option('-u', '--use-auth', action='store_true', - # dest='use_auth', help='force authentication ' - # 'even if not required') - #self.parser.add_option_group(global_options) self.shortcuts = [] def main(self): @@ -57,8 +54,21 @@ class CommandBase(object): result = self.api.call({'action': 'login', 'lgname': user, 'lgpassword': passwd}) - if result['login']['result'] != 'Success': - raise Exception('Login error: %s' % result['login']['result']) + 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'] def _die_if_no_init(self): if self.metadir.config is None: @@ -67,7 +77,7 @@ class CommandBase(object): def _api_setup(self): self.api_url = self.metadir.config.get('remote', 'api_url') - self.api = mw.api.API(self.api_url) + self.api = mw.api.API(self.api_url, self.metadir) class InitCommand(CommandBase): @@ -75,15 +85,37 @@ class InitCommand(CommandBase): def __init__(self): usage = 'API_URL' CommandBase.__init__(self, 'init', 'start a mw repo', usage) - self.parser.add_option('-u', '--username', dest='username', - help='use wiki with login') def _do_command(self): if len(self.args) < 1: self.parser.error('must have URL to remote api.php') elif len(self.args) > 1: self.parser.error('too many arguments') - self.metadir.create(self.args[0], self.options.username) + self.metadir.create(self.args[0]) + + +class LoginCommand(CommandBase): + + def __init__(self): + CommandBase.__init__(self, 'login', 'authenticate with wiki') + + def _do_command(self): + self._die_if_no_init() + self._api_setup() + self._login() + + +class LogoutCommand(CommandBase): + + def __init__(self): + CommandBase.__init__(self, 'logout', 'forget authentication') + + def _do_command(self): + self._die_if_no_init() + try: + os.unlink(os.path.join(self.metadir.location, 'cookies')) + except OSError: + pass class PullCommand(CommandBase): @@ -117,9 +149,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): @@ -146,16 +180,99 @@ 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.api.filename_to_pagename(file[:-5])), 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() + status = self.metadir.working_dir_status(files=self.args) + nothing_to_commit = True + for file in status: + print '%s %s' % (status[file], file) + if status[file] in ['U']: + 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: + edit_summary = self.options.edit_summary + for file in status: + if status[file] in ['U']: + # get edit token + data = { + 'action': 'query', + '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'] + filename = os.path.join(self.metadir.root, file) + text = codecs.open(filename, 'r', 'utf-8').read() + text = text.encode('utf-8') + 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]), + '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'], + 'prop': 'info|revisions', + 'rvprop': + 'ids|flags|timestamp|user|comment|content', + } + response = self.api.call(data)['query']['pages'] + self.metadir.pages_add_rv(int(pageid), + response[pageid]['revisions'][0]) + else: + print 'error: committing %s failed: %s' % \ + (file, response['edit']['result'])