PEP 8 and code cleanup

[mw] / src / mw / clicommands.py

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index c180c6ada2f43af5c1b11e7dbda88ad2ca549989..bc9683cdc1dd8902b8a1dcbdc9cd45f27e2ecdf1 100644 (file)
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -24,7 +24,9 @@ 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
@@ -45,9 +47,17 @@ 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':
+            raise Exception('Login error: %s' % result['login']['result'])
 
     def _die_if_no_init(self):
         if self.metadir.config is None:
@@ -60,6 +70,7 @@ class CommandBase(object):
 
 
 class InitCommand(CommandBase):
+
     def __init__(self):
         usage = '%prog init API_URL'
         CommandBase.__init__(self, 'init', 'start a mw repo', usage)
@@ -73,6 +84,7 @@ class InitCommand(CommandBase):
 
 
 class PullCommand(CommandBase):
+
     def __init__(self):
         usage = '%prog fetch [options] PAGENAME ...'
         CommandBase.__init__(self, 'pull', 'add remote pages to repo', usage)
@@ -82,7 +94,7 @@ class PullCommand(CommandBase):
         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),
@@ -96,8 +108,9 @@ class PullCommand(CommandBase):
                     print '%s: %s: page does not exist, file not created' % \
                             (self.me, pagename)
                     continue
-                revid = [x['revid'] for x in response[pageid]['revisions']]
-                self.metadir.pagedict_add(pagename, int(pageid))
+                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)
@@ -107,6 +120,7 @@ class PullCommand(CommandBase):
 
 
 class StatusCommand(CommandBase):
+
     def __init__(self):
         CommandBase.__init__(self, 'status', 'check repo status')
         self.shortcuts.append('st')