1 files changed, 38 insertions, 35 deletions

diff --git a/maintenance/deleteImageMemcached.php b/maintenance/deleteImageMemcached.php
index 2c3afa86..9becddb8 100644
--- a/maintenance/deleteImageMemcached.php
+++ b/maintenance/deleteImageMemcached.php
@@ -1,33 +1,43 @@
 <?php
 /**
- * This script delete image information from memcached.
+ * This script delete image information from the cache.
  *
  * Usage example:
- * php deleteImageMemcached.php --until "2005-09-05 00:00:00" --sleep 0 --report 10
+ * php deleteImageMemcached.php --until "2005-09-05 00:00:00" --sleep 0
+ *
+ * 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
  *
- * @file
  * @ingroup Maintenance
  */
 
-$optionsWithArgs = array( 'until', 'sleep', 'report' );
-
-require_once 'commandLine.inc';
-
-/**
- * @ingroup Maintenance
- */
-class DeleteImageCache {
-	var $until, $sleep, $report;
+require_once( dirname(__FILE__) . '/Maintenance.php' );
 
-	function DeleteImageCache( $until, $sleep, $report ) {
-		$this->until = $until;
-		$this->sleep = $sleep;
-		$this->report = $report;
+class DeleteImageCache extends Maintenance {
+	public function __construct() {
+		parent::__construct();
+		$this->mDescription = "Delete image information from the cache";
+		$this->addOption( 'sleep', 'How many seconds to sleep between deletions', true, true );
+		$this->addOption( 'until', 'Timestamp to delete all entries prior to', true, true );
 	}
 
-	function main() {
+	public function execute() {
 		global $wgMemc;
-		$fname = 'DeleteImageCache::main';
+
+		$until = preg_replace( "/[^\d]/", '', $this->getOption('until') );
+		$sleep = (int)$this->getOption('sleep') * 1000; // milliseconds
 
 		ini_set( 'display_errors', false );
 
@@ -35,38 +45,31 @@ class DeleteImageCache {
 
 		$res = $dbr->select( 'image',
 			array( 'img_name' ),
-			array( "img_timestamp < {$this->until}" ),
-			$fname
+			array( "img_timestamp < {$until}" ),
+			__METHOD__
 		);
 
 		$i = 0;
 		$total = $this->getImageCount();
 
-		while ( $row = $dbr->fetchObject( $res ) ) {
+		foreach ( $res as $row ) {
 			if ($i % $this->report == 0)
-				printf("%s: %13s done (%s)\n", wfWikiID(), "$i/$total", wfPercent( $i / $total * 100 ));
+				$this->output( sprintf("%s: %13s done (%s)\n", wfWikiID(), "$i/$total", wfPercent( $i / $total * 100 ) ) );
 			$md5 = md5( $row->img_name );
 			$wgMemc->delete( wfMemcKey( 'Image', $md5 ) );
 
-			if ($this->sleep != 0)
-				usleep( $this->sleep );
+			if ($sleep != 0)
+				usleep( $sleep );
 
 			++$i;
 		}
 	}
 
-	function getImageCount() {
-		$fname = 'DeleteImageCache::getImageCount';
-
+	private function getImageCount() {
 		$dbr = wfGetDB( DB_SLAVE );
-		return $dbr->selectField( 'image', 'COUNT(*)', array(), $fname );
+		return $dbr->selectField( 'image', 'COUNT(*)', array(), __METHOD__ );
 	}
 }
 
-$until = preg_replace( "/[^\d]/", '', $options['until'] );
-$sleep = (int)$options['sleep'] * 1000; // milliseconds
-$report = (int)$options['report'];
-
-$dic = new DeleteImageCache( $until, $sleep, $report );
-$dic->main();
-
+$maintClass = "DeleteImageCache";
+require_once( DO_MAINTENANCE );