Change copyright year

[mw] / src / mw / clicommands.py

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index 9efffd4a2883a68476d1723befe4f446170b81b3..dc11a095d8f080f6d1e2d57b7742cf4d6b189048 100644 (file)
--- 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
@@ -44,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):
@@ -121,11 +121,13 @@ class LogoutCommand(CommandBase):
         except OSError:
             pass
 
+
 class PullCategoryMembersCommand(CommandBase):
 
     def __init__(self):
         usage = '[options] PAGENAME ...'
-        CommandBase.__init__(self, 'pullcat', 'add remote pages to repo belonging to the given category', 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()
@@ -133,20 +135,19 @@ class PullCategoryMembersCommand(CommandBase):
         pages = []
         pages += self.args
         for these_pages in [pages[i:i + 25] for i in range(0, len(pages), 25)]:
-#http://commons.wikimedia.org/w/api.php?action=query&format=xmlfm&generator=categorymembers&gcmlimit=500&gcmtitle=Category:User:Esby
-              data = {
-                      'action': 'query',
-                      'gcmtitle': '|'.join(these_pages),
-                      'generator' : 'categorymembers',
-                      'gcmlimit' : 500
-              }
+            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()
+            pagename = response[pageid]['title']
+            print pagename
+            pullc = PullCommand()
+            pullc.args = [pagename.encode('utf-8')]
+            pullc._do_command()
 
 
 class PullCommand(CommandBase):
@@ -209,7 +210,7 @@ class DiffCommand(CommandBase):
         self._die_if_no_init()
         status = self.metadir.working_dir_status()
         for file in status:
-            if status[file] == 'U':
+            if status[file] == 'M':
                 print self.metadir.diff_rv_to_working(
                         mw.metadir.filename_to_pagename(file[:-5])),
 
@@ -235,7 +236,7 @@ class CommitCommand(CommandBase):
         nothing_to_commit = True
         for file in status:
             print '%s %s' % (status[file], file)
-            if status[file] in ['U']:
+            if status[file] in ['M']:
                 nothing_to_commit = False
         if nothing_to_commit:
             print 'nothing to commit'
@@ -245,8 +246,8 @@ 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, file in enumerate(status):
+            if status[file] in ['M']:
                 # get edit token
                 data = {
                         'action': 'query',
@@ -255,16 +256,16 @@ class CommitCommand(CommandBase):
                         'titles': mw.metadir.filename_to_pagename(file[:-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]
+                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 = response['query']['pages'][pageid]['edittoken']
+                edittoken = pages[pageid]['edittoken']
                 filename = os.path.join(self.metadir.root, file)
                 text = codecs.open(filename, 'r', 'utf-8').read()
                 text = text.encode('utf-8')
@@ -304,8 +305,9 @@ class CommitCommand(CommandBase):
                     response = self.api.call(data)['query']['pages']
                     self.metadir.pages_add_rv(int(pageid),
                                               response[pageid]['revisions'][0])
-                    print 'waiting 10s before processing the next file'
-                    time.sleep(10)
+                    if file_num != len(status) - 1:
+                        print 'waiting 10s before processing the next file'
+                        time.sleep(10)
                 else:
                     print 'error: committing %s failed: %s' % \
                             (file, response['edit']['result'])