X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/aaf7335e5cc3ad7a54311fd2f6aec76d6f42584c..0975deb337c03e986718bf2cbbb54377e2e67882:/src/mw/clicommands.py

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index fd5e69c..4b4d3e5 100644
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -16,7 +16,9 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
+import codecs
 import getpass
+import hashlib
 import mw.api
 import mw.metadir
 from optparse import OptionParser, OptionGroup
@@ -57,8 +59,11 @@ 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)'
+        else:
+            print 'Login failed: %s' % result['login']['result']
 
     def _die_if_no_init(self):
         if self.metadir.config is None:
@@ -67,7 +72,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 +80,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):
@@ -154,7 +181,72 @@ class CommitCommand(CommandBase):
 
     def __init__(self):
         CommandBase.__init__(self, 'commit', 'commit changes to wiki')
+        self.shortcuts.append('ci')
+        self.parser.add_option('-m', '--message', dest='edit_summary',
+                               help='don\'t prompt for edit summary and '
+                               'use this instead')
 
     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()
+        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'
+        else:
+            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',
+                        'intoken': 'edit',
+                        'titles': mw.api.filename_to_pagename(file[:-5]),
+                }
+                response = self.api.call(data)
+                pageid = response['query']['pages'].keys()[0]
+                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':
+                    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,
+                }
+                response = self.api.call(data)
+                if response['edit']['result'] == 'Success':
+                    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 'committing %s failed: %s' % \
+                            (file, response['edit']['result'])