X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FcleanupWatchlist.php;h=fbab6a3c4f68f0f4fbdc5eeec90c9eb8e3fbff6c;hb=be661ebe7c1017b61c02fb54e14dccba3c511a79;hp=1e97f9b980876468b0dfa9c12ae5e584d874b801;hpb=c771fc9c96aacb44b86ade5ecca68334c5d8213f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/cleanupWatchlist.php b/maintenance/cleanupWatchlist.php
index 1e97f9b980..fbab6a3c4f 100644
--- a/maintenance/cleanupWatchlist.php
+++ b/maintenance/cleanupWatchlist.php
@@ -1,12 +1,12 @@
 <?php
-/*
- * Script to remove broken, unparseable titles in the Watchlist.
+/**
+ * Remove broken, unparseable titles in the watchlist table.
  *
  * Usage: php cleanupWatchlist.php [--fix]
  * Options:
  *   --fix  Actually remove entries; without will only report.
  *
- * Copyright (C) 2005,2006 Brion Vibber <brion@pobox.com>
+ * Copyright © 2005,2006 Brion Vibber <brion@pobox.com>
  * http://www.mediawiki.org/
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,114 +24,70 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  * @author Brion Vibber <brion at pobox.com>
- * @addtogroup maintenance
+ * @ingroup Maintenance
  */
 
-$options = array( 'fix' );
+require_once( __DIR__ . '/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();
+/**
+ * Maintenance script to remove broken, unparseable titles in the watchlist table.
+ *
+ * @ingroup Maintenance
+ */
+class WatchlistCleanup extends TableCleanup {
+	protected $defaultParams = array(
+		'table' => 'watchlist',
+		'index' => array( 'wl_user', 'wl_namespace', 'wl_title' ),
+		'conds' => array(),
+		'callback' => 'processRow'
+	);
+
+	public function __construct() {
+		parent::__construct();
+		$this->mDescription = "Script to remove broken, unparseable titles in the Watchlist";
+		$this->addOption( 'fix', 'Actually remove entries; without will only report.' );
 	}
 
-	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 );
+	function execute() {
+		if ( !$this->hasOption( 'fix' ) ) {
+			$this->output( "Dry run only: use --fix to enable updates\n" );
 		}
-		$this->log( "Finished $table... $this->updated of $this->processed rows updated" );
-		$this->dbr->freeResult( $result );
+		parent::execute();
 	}
 
-	function processEntry( $row ) {
+	protected function processRow( $row ) {
+		global $wgContLang;
 		$current = Title::makeTitle( $row->wl_namespace, $row->wl_title );
 		$display = $current->getPrefixedText();
-
-		$verified = UtfNormal::cleanUp( $display );
-
+		$verified = $wgContLang->normalize( $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->removeWatch( $row );
-			return $this->progress( 1 );
+		if ( $row->wl_user == 0 || is_null( $title ) || !$title->equals( $current ) ) {
+			$this->output( "invalid watch by {$row->wl_user} for ({$row->wl_namespace}, \"{$row->wl_title}\")\n" );
+			$updated = $this->removeWatch( $row );
+			$this->progress( $updated );
+			return;
 		}
-
 		$this->progress( 0 );
 	}
-	
-	function removeWatch( $row ) {
-		if( !$this->dryrun) {
-			$dbw =& wfGetDB( DB_MASTER );
+
+	private function removeWatch( $row ) {
+		if ( !$this->dryrun && $this->hasOption( 'fix' ) ) {
+			$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" );
+			return 1;
+		} else {
+			return 0;
 		}
 	}
 }
 
-$wgUser->setName( 'Conversion script' );
-$caps = new WatchlistCleanup( !isset( $options['fix'] ) );
-$caps->cleanup();
-
-?>
+$maintClass = "WatchlistCleanup";
+require_once( RUN_MAINTENANCE_IF_MAIN );