1 files changed, 93 insertions, 79 deletions

diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php
index 5aeea781..56afd86c 100644
--- a/maintenance/deleteBatch.php
+++ b/maintenance/deleteBatch.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Deletes a batch of pages
  * Usage: php deleteBatch.php [-u <user>] [-r <reason>] [-i <interval>] [listfile]
@@ -10,89 +9,104 @@
  *	<reason> is the delete reason
  *	<interval> is the number of seconds to sleep for after each delete
  *
- * @file
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @ingroup Maintenance
  */
-
-$oldCwd = getcwd();
-$optionsWithArgs = array( 'u', 'r', 'i' );
-require_once( 'commandLine.inc' );
-
-chdir( $oldCwd );
-
-# Options processing
-
-$filename = 'php://stdin';
-$user = 'Delete page script';
-$reason = '';
-$interval = 0;
-
-if ( isset( $args[0] ) ) {
-	$filename = $args[0];
-}
-if ( isset( $options['u'] ) ) {
-	$user = $options['u'];
-}
-if ( isset( $options['r'] ) ) {
-	$reason = $options['r'];
-}
-if ( isset( $options['i'] ) ) {
-	$interval = $options['i'];
-}
-
-$wgUser = User::newFromName( $user );
-
-
-# Setup complete, now start
-
-$file = fopen( $filename, 'r' );
-if ( !$file ) {
-	print "Unable to read file, exiting\n";
-	exit;
-}
-
-$dbw = wfGetDB( DB_MASTER );
-
-for ( $linenum = 1; !feof( $file ); $linenum++ ) {
-	$line = trim( fgets( $file ) );
-	if ( $line == '' ) {
-		continue;
-	}
-	$page = Title::newFromText( $line );
-	if ( is_null( $page ) ) {
-		print "Invalid title '$line' on line $linenum\n";
-		continue;
+ 
+require_once( dirname(__FILE__) . '/Maintenance.php' );
+
+class DeleteBatch extends Maintenance {
+	
+	public function __construct() {
+		parent::__construct();
+		$this->mDescription = "Deletes a batch of pages";
+		$this->addOption( 'u', "User to perform deletion", false, true );
+		$this->addOption( 'r', "Reason to delete page", false, true );
+		$this->addOption( 'i', "Interval to sleep between deletions" );
+		$this->addArg( 'listfile', 'File with titles to delete, separated by newlines', false );
 	}
-	if( !$page->exists() ) {
-		print "Skipping nonexistent page '$line'\n";
-		continue;
-	}
-
-
-	print $page->getPrefixedText();
-	$dbw->begin();
-	if( $page->getNamespace() == NS_FILE ) {
-		$art = new ImagePage( $page );
-		$img = wfFindFile( $art->mTitle );
-		if( !$img || !$img->delete( $reason ) ) {
-			print "FAILED to delete image file... ";
+	
+	public function execute() {
+		global $wgUser;
+
+		# Change to current working directory
+		$oldCwd = getcwd();
+		chdir( $oldCwd );
+	
+		# Options processing
+		$user = $this->getOption( 'u', 'Delete page script' );
+		$reason = $this->getOption( 'r', '' );
+		$interval = $this->getOption( 'i', 0 );
+		if( $this->hasArg() ) {
+			$file = fopen( $this->getArg(), 'r' );
+		} else {
+			$file = $this->getStdin();
 		}
-	} else {
-		$art = new Article( $page );
-	}
-	$success = $art->doDeleteArticle( $reason );
-	$dbw->immediateCommit();
-	if ( $success ) {
-		print "\n";
-	} else {
-		print " FAILED to delete image page\n";
-	}
 
-	if ( $interval ) {
-		sleep( $interval );
+		# Setup
+		if( !$file ) {
+			$this->error( "Unable to read file, exiting", true );
+		}
+		$wgUser = User::newFromName( $user );
+		$dbw = wfGetDB( DB_MASTER );
+
+		# Handle each entry
+		for ( $linenum = 1; !feof( $file ); $linenum++ ) {
+			$line = trim( fgets( $file ) );
+			if ( $line == '' ) {
+				continue;
+			}
+			$page = Title::newFromText( $line );
+			if ( is_null( $page ) ) {
+				$this->output( "Invalid title '$line' on line $linenum\n" );
+				continue;
+			}
+			if( !$page->exists() ) {
+				$this->output( "Skipping nonexistent page '$line'\n" );
+				continue;
+			}
+	
+	
+			$this->output( $page->getPrefixedText() );
+			$dbw->begin();
+			if( $page->getNamespace() == NS_FILE ) {
+				$art = new ImagePage( $page );
+				$img = wfFindFile( $art->mTitle );
+				if( !$img || !$img->delete( $reason ) ) {
+					$this->output( "FAILED to delete image file... " );
+				}
+			} else {
+				$art = new Article( $page );
+			}
+			$success = $art->doDeleteArticle( $reason );
+			$dbw->commit();
+			if ( $success ) {
+				$this->output( "\n" );
+			} else {
+				$this->output( " FAILED to delete article\n" );
+			}
+	
+			if ( $interval ) {
+				sleep( $interval );
+			}
+			wfWaitForSlaves( 5 );
+}
 	}
-	wfWaitForSlaves( 5 );
 }
 
-
-
+$maintClass = "DeleteBatch";
+require_once( DO_MAINTENANCE );