X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/bc37c596074d390ecfdd3eb746e548bccd0d87aa..e5ac78fd19391a33ca958071fe2011edc5ff9074:/src/mw/clicommands.py diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py index 3657d53..4b62564 100644 --- a/src/mw/clicommands.py +++ b/src/mw/clicommands.py @@ -1,6 +1,6 @@ ### # mw - VCS-like nonsense for MediaWiki websites -# Copyright (C) 2009 Ian Weller +# Copyright (C) 2010 Ian Weller # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -13,8 +13,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# with this program. If not, see . ### import getpass @@ -24,20 +23,24 @@ from optparse import OptionParser, OptionGroup import os import sys + class CommandBase(object): + def __init__(self, name, description, usage=None): self.me = os.path.basename(sys.argv[0]) self.description = description if usage is None: usage = '%prog ' + name + else: + usage = '%%prog %s %s' % (name, usage) 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) + #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): @@ -45,9 +48,20 @@ class CommandBase(object): self.args = self.args[1:] # don't need the first thing self._do_command() + def _do_command(self): + pass + def _login(self): user = raw_input('Username: ') passwd = getpass.getpass() + result = self.api.call({'action': 'login', + 'lgname': user, + 'lgpassword': passwd}) + if result['login']['result'] == 'Success': + # cookies are saved to a file + print 'Login successful! (yay)' + else: + print 'Login failed: %s' % result['login']['result'] def _die_if_no_init(self): if self.metadir.config is None: @@ -56,12 +70,13 @@ 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): + def __init__(self): - usage = '%prog init API_URL' + usage = 'API_URL' CommandBase.__init__(self, 'init', 'start a mw repo', usage) def _do_command(self): @@ -72,18 +87,29 @@ class InitCommand(CommandBase): self.metadir.create(self.args[0]) -class FetchCommand(CommandBase): +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 PullCommand(CommandBase): + def __init__(self): - usage = '%prog fetch [options] PAGENAME ...' - CommandBase.__init__(self, 'fetch', 'fetch remote pages', usage) - self.shortcuts.append('ft') + usage = '[options] PAGENAME ...' + CommandBase.__init__(self, 'pull', 'add remote pages to repo', 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)]: + for these_pages in [pages[i:i + 25] for i in range(0, len(pages), 25)]: data = { 'action': 'query', 'titles': '|'.join(these_pages), @@ -92,12 +118,56 @@ class FetchCommand(CommandBase): } response = self.api.call(data)['query']['pages'] for pageid in response.keys(): - revid = [x['revid'] for x in response[pageid]['revisions']] - self.metadir.add_page_info(int(pageid), - response[pageid]['title'], - revid) - self.metadir.add_rv_info(response[pageid]['revisions'][0]) - fd = file(os.path.join(self.metadir.root, \ - response[pageid]['title'].replace(' ', '_') + \ - '.wiki'), 'w') + pagename = response[pageid]['title'] + if 'missing' in response[pageid].keys(): + print '%s: %s: page does not exist, file not created' % \ + (self.me, pagename) + continue + revids = [x['revid'] for x in response[pageid]['revisions']] + revids.sort() + 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')) + + +class StatusCommand(CommandBase): + + def __init__(self): + CommandBase.__init__(self, 'status', 'check repo status') + self.shortcuts.append('st') + + def _do_command(self): + self._die_if_no_init() + status = self.metadir.working_dir_status() + for file in status: + print '%s %s' % (status[file], file) + + +class DiffCommand(CommandBase): + + def __init__(self): + CommandBase.__init__(self, 'diff', 'diff wiki to working directory') + + def _do_command(self): + self._die_if_no_init() + status = self.metadir.working_dir_status() + for file in status: + if status[file] == 'U': + print self.metadir.diff_rv_to_working( + mw.api.filename_to_pagename(file[:-5]) + ), + + +class CommitCommand(CommandBase): + + def __init__(self): + CommandBase.__init__(self, 'commit', 'commit changes to wiki') + self.shortcuts.append('ci') + + def _do_command(self): + self._die_if_no_init() + self._api_setup()