X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcleanupWatchlist.php;h=7be48107f65c2a32945d9fba1822bd80ab10c2f3;hb=11c921c459dd8a2bc4da585cfea1555712fbc778;hp=161a9846657247a04449304efa45b876258b127e;hpb=f88c771756c580442fe7ca2f84bcbb8067b77f57;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/cleanupWatchlist.php b/maintenance/cleanupWatchlist.php
index 161a984665..7be48107f6 100644
--- a/maintenance/cleanupWatchlist.php
+++ b/maintenance/cleanupWatchlist.php
@@ -25,113 +25,44 @@
  * http://www.gnu.org/copyleft/gpl.html
  *
  * @author Brion Vibber <brion at pobox.com>
- * @addtogroup maintenance
+ * @ingroup Maintenance
  */
 
-$options = array( 'fix' );
+require_once( dirname(__FILE__) . '/cleanupTable.inc' );
 
-require_once( 'commandLine.inc' );
-require_once( 'FiveUpgrade.inc' );
-
-class WatchlistCleanup extends FiveUpgrade {
-	function WatchlistCleanup( $dryrun = false ) {
-		parent::FiveUpgrade();
-
-		$this->maxLag = 10; # if slaves are lagged more than 10 secs, wait
-		$this->dryrun = $dryrun;
-	}
-
-	function cleanup() {
-		$this->runTable( 'watchlist',
-			'',
-			array( &$this, 'processEntry' ) );
-	}
-
-	function init( $count, $table ) {
-		$this->processed = 0;
-		$this->updated = 0;
-		$this->count = $count;
-		$this->startTime = wfTime();
-		$this->table = $table;
-	}
-
-	function progress( $updated ) {
-		$this->updated += $updated;
-		$this->processed++;
-		if( $this->processed % 100 != 0 ) {
-			return;
-		}
-		$portion = $this->processed / $this->count;
-		$updateRate = $this->updated / $this->processed;
-
-		$now = wfTime();
-		$delta = $now - $this->startTime;
-		$estimatedTotalTime = $delta / $portion;
-		$eta = $this->startTime + $estimatedTotalTime;
-
-		printf( "%s %s: %6.2f%% done on %s; ETA %s [%d/%d] %.2f/sec <%.2f%% updated>\n",
-			wfWikiID(),
-			wfTimestamp( TS_DB, intval( $now ) ),
-			$portion * 100.0,
-			$this->table,
-			wfTimestamp( TS_DB, intval( $eta ) ),
-			$this->processed,
-			$this->count,
-			$this->processed / $delta,
-			$updateRate * 100.0 );
-		flush();
+class WatchlistCleanup extends TableCleanup {
+	protected $targetTable = 'watchlist';
+	public function __construct() {
+		parent::__construct();
+		$this->mDescription = "Script to remove broken, unparseable titles in the Watchlist";
 	}
 
-	function runTable( $table, $where, $callback ) {
-		$fname = 'WatchlistCleanup::runTable';
-
-		$count = $this->dbw->selectField( $table, 'count(*)', '', $fname );
-		$this->init( $count, 'watchlist' );
-		$this->log( "Processing $table..." );
-
-		$tableName = $this->dbr->tableName( $table );
-		$sql = "SELECT * FROM $tableName $where";
-		$result = $this->dbr->query( $sql, $fname );
-
-		while( $row = $this->dbr->fetchObject( $result ) ) {
-			call_user_func( $callback, $row );
-		}
-		$this->log( "Finished $table... $this->updated of $this->processed rows updated" );
-		$this->dbr->freeResult( $result );
-	}
-
-	function processEntry( $row ) {
+	protected function processPage( $row ) {
 		$current = Title::makeTitle( $row->wl_namespace, $row->wl_title );
 		$display = $current->getPrefixedText();
-
 		$verified = UtfNormal::cleanUp( $display );
-
 		$title = Title::newFromText( $verified );
 
 		if( $row->wl_user == 0 || is_null( $title ) || !$title->equals( $current ) ) {
-			$this->log( "invalid watch by {$row->wl_user} for ({$row->wl_namespace}, \"{$row->wl_title}\")" );
+			$this->output( "invalid watch by {$row->wl_user} for ({$row->wl_namespace}, \"{$row->wl_title}\")\n" );
 			$this->removeWatch( $row );
 			return $this->progress( 1 );
 		}
-
 		$this->progress( 0 );
 	}
-	
-	function removeWatch( $row ) {
-		if( !$this->dryrun) {
+
+	private function removeWatch( $row ) {
+		if( !$this->dryrun ) {
 			$dbw = wfGetDB( DB_MASTER );
 			$dbw->delete( 'watchlist', array(
 				'wl_user'      => $row->wl_user,
 				'wl_namespace' => $row->wl_namespace,
 				'wl_title'     => $row->wl_title ),
-			'WatchlistCleanup::removeWatch' );
-			$this->log( '- removed' );
+			__METHOD__ );
+			$this->output( "- removed\n" );
 		}
 	}
 }
 
-$wgUser->setName( 'Conversion script' );
-$caps = new WatchlistCleanup( !isset( $options['fix'] ) );
-$caps->cleanup();
-
-?>
+$maintClass = "WatchlistCleanup";
+require_once( DO_MAINTENANCE );