X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/1e4face96bd7aea75ce9b0188d43e7f22ce9df00..6ef083635c4bf8eb46d29de59501da90fe34b994:/src/mw/clicommands.py

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index f4b9813..0fa122a 100644
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -1,6 +1,6 @@
 ###
 # mw - VCS-like nonsense for MediaWiki websites
-# Copyright (C) 2010  Ian Weller <ian@ianweller.org>
+# Copyright (C) 2011  Ian Weller <ian@ianweller.org> and others
 #
 # 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
@@ -17,13 +17,15 @@
 ###
 
 import codecs
+import cookielib
 import getpass
 import hashlib
-import mw.api
 import mw.metadir
 from optparse import OptionParser, OptionGroup
 import os
+import simplemediawiki
 import sys
+import time
 
 
 class CommandBase(object):
@@ -42,7 +44,7 @@ class CommandBase(object):
 
     def main(self):
         (self.options, self.args) = self.parser.parse_args()
-        self.args = self.args[1:] # don't need the first thing
+        self.args = self.args[1:]  # don't need the first thing
         self._do_command()
 
     def _do_command(self):
@@ -76,8 +78,10 @@ class CommandBase(object):
             sys.exit(1)
 
     def _api_setup(self):
+        cookie_filename = os.path.join(self.metadir.location, 'cookies')
         self.api_url = self.metadir.config.get('remote', 'api_url')
-        self.api = mw.api.API(self.api_url, self.metadir)
+        self.api = simplemediawiki.MediaWiki(self.api_url,
+                                             cookie_file=cookie_filename)
 
 
 class InitCommand(CommandBase):
@@ -118,11 +122,12 @@ class LogoutCommand(CommandBase):
             pass
 
 
-class PullCommand(CommandBase):
+class PullCategoryMembersCommand(CommandBase):
 
     def __init__(self):
         usage = '[options] PAGENAME ...'
-        CommandBase.__init__(self, 'pull', 'add remote pages to repo', usage)
+        CommandBase.__init__(self, 'pullcat', 'add remote pages to repo '
+                             'belonging to the given category', usage)
 
     def _do_command(self):
         self._die_if_no_init()
@@ -130,6 +135,46 @@ class PullCommand(CommandBase):
         pages = []
         pages += self.args
         for these_pages in [pages[i:i + 25] for i in range(0, len(pages), 25)]:
+            data = {
+                'action': 'query',
+                'gcmtitle': '|'.join(these_pages),
+                'generator': 'categorymembers',
+                'gcmlimit': 500
+            }
+        response = self.api.call(data)['query']['pages']
+        for pageid in response.keys():
+            pagename = response[pageid]['title']
+            print pagename
+            pullc = PullCommand()
+            pullc.args = [pagename.encode('utf-8')]
+            pullc._do_command()
+
+
+class PullCommand(CommandBase):
+    
+    def __init__(self):
+        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
+
+        # Pull should work with pagename, filename, or working directory
+        converted_pages = []
+        if pages == []:
+            pages = self.metadir.working_dir_status().keys()
+        for pagename in pages:
+            if '.wiki' in pagename:
+                converted_pages.append(
+                    mw.metadir.filename_to_pagename(pagename[:-5]))
+            else:
+                converted_pages.append(pagename)
+        pages = converted_pages
+
+        for these_pages in [pages[i:i + 25] for i in range(0, len(pages), 25)]: # ?
             data = {
                     'action': 'query',
                     'titles': '|'.join(these_pages),
@@ -139,6 +184,14 @@ class PullCommand(CommandBase):
             response = self.api.call(data)['query']['pages']
             for pageid in response.keys():
                 pagename = response[pageid]['title']
+                # if pagename exists as file and its status is 'M' warn not pulled
+                status = self.metadir.working_dir_status()
+                filename = mw.metadir.pagename_to_filename(pagename)
+                if filename + '.wiki' in status and \
+                    status[filename + '.wiki' ] in ['M']:
+                    print('%s: "%s" has uncommitted modifications ' 
+                        '-- skipping!' % (self.me, pagename))
+                    continue
                 if 'missing' in response[pageid].keys():
                     print '%s: %s: page does not exist, file not created' % \
                             (self.me, pagename)
@@ -148,9 +201,12 @@ class PullCommand(CommandBase):
                 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)
-                with file(os.path.join(self.metadir.root, filename + '.wiki'), 'w') as fd:
-                  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):
 
@@ -161,8 +217,8 @@ class StatusCommand(CommandBase):
     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)
+        for filename in status:
+            print '%s %s' % (status[filename], filename)
 
 
 class DiffCommand(CommandBase):
@@ -173,10 +229,10 @@ class DiffCommand(CommandBase):
     def _do_command(self):
         self._die_if_no_init()
         status = self.metadir.working_dir_status()
-        for file in status:
-            if status[file] == 'U':
+        for filename in status:
+            if status[filename] == 'M':
                 print self.metadir.diff_rv_to_working(
-                        mw.api.filename_to_pagename(file[:-5])),
+                        mw.metadir.filename_to_pagename(filename[:-5])),
 
 
 class CommitCommand(CommandBase):
@@ -198,9 +254,9 @@ class CommitCommand(CommandBase):
         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']:
+        for filename in status:
+            print '%s %s' % (status[filename], filename)
+            if status[filename] in ['M']:
                 nothing_to_commit = False
         if nothing_to_commit:
             print 'nothing to commit'
@@ -210,25 +266,27 @@ class CommitCommand(CommandBase):
             edit_summary = raw_input()
         else:
             edit_summary = self.options.edit_summary
-        for file in status:
-            if status[file] in ['U']:
+        for file_num, filename in enumerate(status):
+            if status[filename] in ['M']:
                 # get edit token
                 data = {
                         'action': 'query',
                         'prop': 'info|revisions',
                         'intoken': 'edit',
-                        'titles': mw.api.filename_to_pagename(file[:-5]),
+                        'titles': mw.metadir.filename_to_pagename(filename[:-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 "Ignoring %s - Edition conflict detected %s - %s " % ( file , awaitedrevid, revid)
-                     continue
-                edittoken = response['query']['pages'][pageid]['edittoken']
-                # FIXME use basetimestamp and starttimestamp
-                filename = os.path.join(self.metadir.root, file)
+                pages = response['query']['pages']
+                pageid = pages.keys()[0]
+                revid = 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 = pages[pageid]['edittoken']
+                filename = os.path.join(self.metadir.root, filename)
                 text = codecs.open(filename, 'r', 'utf-8').read()
                 text = text.encode('utf-8')
                 if (len(text) != 0) and (text[-1] == '\n'):
@@ -238,7 +296,7 @@ class CommitCommand(CommandBase):
                 textmd5 = md5.hexdigest()
                 data = {
                         'action': 'edit',
-                        'title': mw.api.filename_to_pagename(file[:-5]),
+                        'title': mw.metadir.filename_to_pagename(filename[:-5]),
                         'token': edittoken,
                         'text': text,
                         'md5': textmd5,
@@ -248,13 +306,15 @@ class CommitCommand(CommandBase):
                     data['bot'] = 'bot'
                 response = self.api.call(data)
                 if response['edit']['result'] == 'Success':
-                    if response['edit'].has_key('nochange') :
-                      print "Ignoring %s - No changes were detected - Removing ending lf" %  file 
-                      self.metadir.clean_page(file[:-5])
-                      continue
-                    if response['edit']['oldrevid'] != revid :
-                      print "Ignoring %s - Colision detected " % file
-                      continue
+                    if 'nochange' in response['edit']:
+                        print 'warning: no changes detected in %s - ' \
+                                'skipping and removing ending LF' % filename
+                        self.metadir.clean_page(filename[:-5])
+                        continue
+                    if response['edit']['oldrevid'] != revid:
+                        print 'warning: edit conflict detected on %s -- ' \
+                                'skipping!' % filename
+                        continue
                     data = {
                             'action': 'query',
                             'revids': response['edit']['newrevid'],
@@ -265,6 +325,9 @@ class CommitCommand(CommandBase):
                     response = self.api.call(data)['query']['pages']
                     self.metadir.pages_add_rv(int(pageid),
                                               response[pageid]['revisions'][0])
+                    if file_num != len(status) - 1:
+                        print 'waiting 3s before processing the next file'
+                        time.sleep(3)
                 else:
-                    print 'committing %s failed: %s' % \
-                            (file, response['edit']['result'])
+                    print 'error: committing %s failed: %s' % \
+                            (filename, response['edit']['result'])