MediaWiki 1.16.0

[autoinstallsdev/mediawiki.git] / maintenance / cleanupWatchlist.php

diff --git a/maintenance/cleanupWatchlist.php b/maintenance/cleanupWatchlist.php
index bcf05730ebe29d4e3d3173372e069f1c00f6c032..ed84b268cd7a4df998747264ec0c80b65aa4556b 100644 (file)
--- a/maintenance/cleanupWatchlist.php
+++ b/maintenance/cleanupWatchlist.php
@@ -25,113 +25,63 @@
  * 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 TableCleanup {
+       protected $defaultParams = array(
+               'table' => 'watchlist',
+               'index' => array( 'wl_user', 'wl_namespace', 'wl_title' ),
+               'conds' => array(),
+               'callback' => 'processRow'
+       );
 
-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' ) );
+       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 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;
+       function execute() {
+               if ( !$this->hasOption( 'fix' ) ) {
+                       $this->output( "Dry run only: use --fix to enable updates\n" );
                }
-               $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();
+               parent::execute();
        }
 
-       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 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 );
+                       $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) {
+
+       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( DO_MAINTENANCE );