X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FrebuildImages.php;h=fe3b35c93cb4a84901a536eb3fb691daf5b8ec50;hb=6564620d2ad94ac502ea3b5a45951173e11cca05;hp=14a9578d314c5ccb2f9962957ddea53d169886da;hpb=f31eb18a7ee90b132cb3ecd5d264966c8118a365;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/rebuildImages.php b/maintenance/rebuildImages.php index 14a9578d31..fe3b35c93c 100644 --- a/maintenance/rebuildImages.php +++ b/maintenance/rebuildImages.php @@ -1,5 +1,5 @@ + * Copyright © 2005 Brion Vibber * http://www.mediawiki.org/ * * This program is free software; you can redistribute it and/or modify @@ -25,21 +25,56 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/gpl.html * + * @file * @author Brion Vibber - * @addtogroup maintenance + * @ingroup Maintenance */ -$options = array( 'missing', 'dry-run' ); +require_once( dirname( __FILE__ ) . '/Maintenance.php' ); -require_once( 'commandLine.inc' ); -require_once( 'FiveUpgrade.inc' ); +class ImageBuilder extends Maintenance { -class ImageBuilder extends FiveUpgrade { - function ImageBuilder( $dryrun = false ) { - parent::FiveUpgrade(); + /** + * @var DatabaseBase + */ + protected $dbw; + function __construct() { + parent::__construct(); + + global $wgUpdateCompatibleMetadata; + //make sure to update old, but compatible img_metadata fields. + $wgUpdateCompatibleMetadata = true; + + $this->mDescription = 'Script to update image metadata records'; + + $this->addOption( 'missing', 'Check for files without associated database record' ); + $this->addOption( 'dry-run', 'Only report, don\'t update the database' ); + } + + public function execute() { + $this->dbw = wfGetDB( DB_MASTER ); $this->maxLag = 10; # if slaves are lagged more than 10 secs, wait - $this->dryrun = $dryrun; + $this->dryrun = $this->hasOption( 'dry-run' ); + if ( $this->dryrun ) { + $GLOBALS['wgReadOnly'] = 'Dry run mode, image upgrades are suppressed'; + } + + if ( $this->hasOption( 'missing' ) ) { + $this->crawlMissing(); + } else { + $this->build(); + } + } + + /** + * @return FileRepo + */ + function getRepo() { + if ( !isset( $this->repo ) ) { + $this->repo = RepoGroup::singleton()->getLocalRepo(); + } + return $this->repo; } function build() { @@ -58,7 +93,7 @@ class ImageBuilder extends FiveUpgrade { function progress( $updated ) { $this->updated += $updated; $this->processed++; - if( $this->processed % 100 != 0 ) { + if ( $this->processed % 100 != 0 ) { return; } $portion = $this->processed / $this->count; @@ -68,211 +103,113 @@ class ImageBuilder extends FiveUpgrade { $delta = $now - $this->startTime; $estimatedTotalTime = $delta / $portion; $eta = $this->startTime + $estimatedTotalTime; + $rate = $this->processed / $delta; - printf( "%s: %6.2f%% done on %s; ETA %s [%d/%d] %.2f/sec <%.2f%% updated>\n", + $this->output( sprintf( "%s: %6.2f%% done on %s; ETA %s [%d/%d] %.2f/sec <%.2f%% updated>\n", wfTimestamp( TS_DB, intval( $now ) ), $portion * 100.0, $this->table, wfTimestamp( TS_DB, intval( $eta ) ), - $completed, // $completed does not appear to be defined. + $this->processed, $this->count, - $rate, // $rate does not appear to be defined. - $updateRate * 100.0 ); + $rate, + $updateRate * 100.0 ) ); flush(); } function buildTable( $table, $key, $callback ) { - $fname = 'ImageBuilder::buildTable'; - - $count = $this->dbw->selectField( $table, 'count(*)', '', $fname ); + $count = $this->dbw->selectField( $table, 'count(*)', '', __METHOD__ ); $this->init( $count, $table ); - $this->log( "Processing $table..." ); + $this->output( "Processing $table...\n" ); - $tableName = $this->dbr->tableName( $table ); - $sql = "SELECT * FROM $tableName"; - $result = $this->dbr->query( $sql, $fname ); + $result = wfGetDB( DB_SLAVE )->select( $table, '*', array(), __METHOD__ ); - while( $row = $this->dbr->fetchObject( $result ) ) { - $update = call_user_func( $callback, $row ); - if( is_array( $update ) ) { - if( !$this->dryrun ) { - $this->dbw->update( $table, - $update, - array( $key => $row->$key ), - $fname ); - } + foreach ( $result as $row ) { + $update = call_user_func( $callback, $row, null ); + if ( $update ) { $this->progress( 1 ); } else { $this->progress( 0 ); } } - $this->log( "Finished $table... $this->updated of $this->processed rows updated" ); - $this->dbr->freeResult( $result ); + $this->output( "Finished $table... $this->updated of $this->processed rows updated\n" ); } function buildImage() { - $callback = array( &$this, 'imageCallback' ); + $callback = array( $this, 'imageCallback' ); $this->buildTable( 'image', 'img_name', $callback ); } - function imageCallback( $row ) { - if( $row->img_width ) { - // Already processed - return null; - } - - // Fill in the new image info fields - $info = $this->imageInfo( $row->img_name ); - - global $wgMemc; - $key = wfMemcKey( "Image", md5( $row->img_name ) ); - $wgMemc->delete( $key ); - - return array( - 'img_width' => $info['width'], - 'img_height' => $info['height'], - 'img_bits' => $info['bits'], - 'img_media_type' => $info['media'], - 'img_major_mime' => $info['major'], - 'img_minor_mime' => $info['minor'] ); + function imageCallback( $row, $copy ) { + // Create a File object from the row + // This will also upgrade it + $file = $this->getRepo()->newFileFromRow( $row ); + return $file->getUpgraded(); } - function buildOldImage() { - $this->buildTable( 'oldimage', 'oi_archive_name', - array( &$this, 'oldimageCallback' ) ); + $this->buildTable( 'oldimage', 'oi_archive_name', array( $this, 'oldimageCallback' ) ); } - function oldimageCallback( $row ) { - if( $row->oi_width && $row->oi_media_type ) { - return null; + function oldimageCallback( $row, $copy ) { + // Create a File object from the row + // This will also upgrade it + if ( $row->oi_archive_name == '' ) { + $this->output( "Empty oi_archive_name for oi_name={$row->oi_name}\n" ); + return false; } - - // Fill in the new image info fields - $info = $this->imageInfo( $row->oi_archive_name, 'wfImageArchiveDir', $row->oi_name ); - return array( - 'oi_width' => $info['width' ], - 'oi_height' => $info['height'], - 'oi_bits' => $info['bits' ], - 'oi_metadata' => '', // filled in on-demand - 'oi_media_type' => $info['media'], - 'oi_major_mime' => $info['major'], - 'oi_minor_mime' => $info['minor'] ); + $file = $this->getRepo()->newFileFromRow( $row ); + return $file->getUpgraded(); } function crawlMissing() { - global $wgUploadDirectory, $wgHashedUploadDirectory; - if( $wgHashedUploadDirectory ) { - for( $i = 0; $i < 16; $i++ ) { - for( $j = 0; $j < 16; $j++ ) { - $dir = sprintf( '%s%s%01x%s%02x', - $wgUploadDirectory, - DIRECTORY_SEPARATOR, - $i, - DIRECTORY_SEPARATOR, - $i * 16 + $j ); - $this->crawlDirectory( $dir ); - } - } - } else { - $this->crawlDirectory( $wgUploadDirectory ); - } - } - - function crawlDirectory( $dir ) { - if( !file_exists( $dir ) ) { - return $this->log( "no directory, skipping $dir" ); - } - if( !is_dir( $dir ) ) { - return $this->log( "not a directory?! skipping $dir" ); - } - if( !is_readable( $dir ) ) { - return $this->log( "dir not readable, skipping $dir" ); - } - $source = opendir( $dir ); - if( $source === false ) { - return $this->log( "couldn't open dir, skipping $dir" ); - } - - $this->log( "crawling $dir" ); - while( false !== ( $filename = readdir( $source ) ) ) { - $fullpath = $dir . DIRECTORY_SEPARATOR . $filename; - if( is_dir( $fullpath ) ) { - continue; - } - if( is_link( $fullpath ) ) { - $this->log( "skipping symlink at $fullpath" ); - continue; - } - $this->checkMissingImage( $filename, $fullpath ); - } - closedir( $source ); + $this->getRepo()->enumFiles( array( $this, 'checkMissingImage' ) ); } - function checkMissingImage( $filename, $fullpath ) { - $fname = 'ImageBuilder::checkMissingImage'; + function checkMissingImage( $fullpath ) { + $filename = wfBaseName( $fullpath ); $row = $this->dbw->selectRow( 'image', array( 'img_name' ), array( 'img_name' => $filename ), - $fname ); + __METHOD__ ); - if( $row ) { - // already known, move on - return; - } else { + if ( !$row ) { // file not registered $this->addMissingImage( $filename, $fullpath ); } } function addMissingImage( $filename, $fullpath ) { - $fname = 'ImageBuilder::addMissingImage'; + global $wgContLang; - $size = filesize( $fullpath ); - $info = $this->imageInfo( $filename ); - $timestamp = $this->dbw->timestamp( filemtime( $fullpath ) ); + $timestamp = $this->dbw->timestamp( $this->getRepo()->getFileTimestamp( $fullpath ) ); - global $wgContLang; $altname = $wgContLang->checkTitleEncoding( $filename ); - if( $altname != $filename ) { - if( $this->dryrun ) { + if ( $altname != $filename ) { + if ( $this->dryrun ) { $filename = $altname; - $this->log( "Estimating transcoding... $altname" ); + $this->output( "Estimating transcoding... $altname\n" ); } else { + # @FIXME: create renameFile() $filename = $this->renameFile( $filename ); } } - if( $filename == '' ) { - $this->log( "Empty filename for $fullpath" ); + if ( $filename == '' ) { + $this->output( "Empty filename for $fullpath\n" ); return; } - - $fields = array( - 'img_name' => $filename, - 'img_size' => $size, - 'img_width' => $info['width'], - 'img_height' => $info['height'], - 'img_metadata' => '', // filled in on-demand - 'img_bits' => $info['bits'], - 'img_media_type' => $info['media'], - 'img_major_mime' => $info['major'], - 'img_minor_mime' => $info['minor'], - 'img_description' => '(recovered file, missing upload log entry)', - 'img_user' => 0, - 'img_user_text' => 'Conversion script', - 'img_timestamp' => $timestamp ); - if( !$this->dryrun ) { - $this->dbw->insert( 'image', $fields, $fname ); + if ( !$this->dryrun ) { + $file = wfLocalFile( $filename ); + if ( !$file->recordUpload( '', '(recovered file, missing upload log entry)', '', '', '', + false, $timestamp ) ) + { + $this->output( "Error uploading file $fullpath\n" ); + return; + } } - $this->log( $fullpath ); + $this->output( $fullpath . "\n" ); } } -$builder = new ImageBuilder( isset( $options['dry-run'] ) ); -if( isset( $options['missing'] ) ) { - $builder->crawlMissing(); -} else { - $builder->build(); -} - -?> +$maintClass = 'ImageBuilder'; +require_once( RUN_MAINTENANCE_IF_MAIN );