Revert "Commit of various live hacks"

[lhc/web/wiklou.git] / maintenance / moveBatch.php

diff --git a/maintenance/moveBatch.php b/maintenance/moveBatch.php
index 878b649..a7739c2 100644 (file)
--- a/maintenance/moveBatch.php
+++ b/maintenance/moveBatch.php
@@ -33,7 +33,7 @@
  * e.g. immobile_namespace for namespaces which can't be moved
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class MoveBatch extends Maintenance {
        public function __construct() {
@@ -42,9 +42,9 @@ class MoveBatch extends Maintenance {
                $this->addOption( 'u', "User to perform move", false, true );
                $this->addOption( 'r', "Reason to move page", false, true );
                $this->addOption( 'i', "Interval to sleep between moves" );
-               $this->addArgs( array( 'listfile' ) );
+               $this->addArg( 'listfile', 'List of pages to move, newline delimited', false );
        }
-       
+
        public function execute() {
                global $wgUser;
 
@@ -56,18 +56,21 @@ class MoveBatch extends Maintenance {
                $user = $this->getOption( 'u', 'Move page script' );
                $reason = $this->getOption( 'r', '' );
                $interval = $this->getOption( 'i', 0 );
-               if( $this->hasArg() ) {
+               if ( $this->hasArg() ) {
                        $file = fopen( $this->getArg(), 'r' );
                } else {
                        $file = $this->getStdin();
                }
 
                # Setup
-               if( !$file ) {
+               if ( !$file ) {
                        $this->error( "Unable to read file, exiting", true );
                }
                $wgUser = User::newFromName( $user );
-               
+               if ( !$wgUser ) {
+                       $this->error( "Invalid username", true );
+               }
+
                # Setup complete, now start
                $dbw = wfGetDB( DB_MASTER );
                for ( $linenum = 1; !feof( $file ); $linenum++ ) {
@@ -86,24 +89,25 @@ class MoveBatch extends Maintenance {
                                $this->error( "Invalid title on line $linenum" );
                                continue;
                        }
-       
-       
+
+
                        $this->output( $source->getPrefixedText() . ' --> ' . $dest->getPrefixedText() );
-                       $dbw->begin();
+                       $dbw->begin( __METHOD__ );
                        $err = $source->moveTo( $dest, false, $reason );
-                       if( $err !== true ) {
-                               $this->output( "\nFAILED: $err" );
+                       if ( $err !== true ) {
+                               $msg = array_shift( $err[0] );
+                               $this->output( "\nFAILED: " . wfMsg( $msg, $err[0] ) );
                        }
-                       $dbw->immediateCommit();
+                       $dbw->commit( __METHOD__ );
                        $this->output( "\n" );
-       
+
                        if ( $interval ) {
                                sleep( $interval );
                        }
-                       wfWaitForSlaves( 5 );
+                       wfWaitForSlaves();
                }
        }
 }
 
 $maintClass = "MoveBatch";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );