X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/29ba1dd35ffcafe1cbd2842fbca15f2ad30238ff..e31cbf92b32521b46527e9b2a2bfecca408d05d1:/src/mw/clicommands.py

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index c4b016a..a42bcfb 100644
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -57,6 +57,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']
 
@@ -174,19 +184,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('--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,12 +206,16 @@ class CommitCommand(CommandBase):
                 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:
-            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
@@ -229,6 +245,8 @@ 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':
                     data = {