* 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>
- * @package MediaWiki
- * @subpackage maintenance
+ * @ingrouo maintenance
*/
$options = array( 'missing', 'dry-run' );
-require_once( 'commandLine.inc' );
+require_once( dirname( __FILE__ ) . '/commandLine.inc' );
require_once( 'FiveUpgrade.inc' );
class ImageBuilder extends FiveUpgrade {
$this->maxLag = 10; # if slaves are lagged more than 10 secs, wait
$this->dryrun = $dryrun;
+ if ( $dryrun ) {
+ $GLOBALS['wgReadOnly'] = 'Dry run mode, image upgrades are suppressed';
+ }
+ }
+
+ function getRepo() {
+ if ( !isset( $this->repo ) ) {
+ $this->repo = RepoGroup::singleton()->getLocalRepo();
+ }
+ return $this->repo;
}
function build() {
function progress( $updated ) {
$this->updated += $updated;
$this->processed++;
- if( $this->processed % 100 != 0 ) {
+ if ( $this->processed % 100 != 0 ) {
return;
}
$portion = $this->processed / $this->count;
$portion * 100.0,
$this->table,
wfTimestamp( TS_DB, intval( $eta ) ),
- $completed,
+ $completed, // $completed does not appear to be defined.
$this->count,
- $rate,
+ $rate, // $rate does not appear to be defined.
$updateRate * 100.0 );
flush();
}
$sql = "SELECT * FROM $tableName";
$result = $this->dbr->query( $sql, $fname );
- 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 );
- }
+ while ( $row = $this->dbr->fetchObject( $result ) ) {
+ $update = call_user_func( $callback, $row, null );
+ if ( $update ) {
$this->progress( 1 );
} else {
$this->progress( 0 );
$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' ) );
}
- function oldimageCallback( $row ) {
- if( $row->oi_width ) {
- return null;
+ function oldimageCallback( $row, $copy ) {
+ // Create a File object from the row
+ // This will also upgrade it
+ if ( $row->oi_archive_name == '' ) {
+ $this->log( "Empty oi_archive_name for oi_name={$row->oi_name}" );
+ 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' ] );
+ $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 );
- }
+ $repo = RepoGroup::singleton()->getLocalRepo();
+ $repo->enumFilesInFS( array( $this, 'checkMissingImage' ) );
}
- 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" );
+ function checkMissingImage( $fullpath ) {
+ $fname = 'ImageBuilder::checkMissingImage';
+ $filename = wfBaseName( $fullpath );
+ if ( is_dir( $fullpath ) ) {
+ return;
}
-
- $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 );
+ if ( is_link( $fullpath ) ) {
+ $this->log( "skipping symlink at $fullpath" );
+ return;
}
- closedir( $source );
- }
-
- function checkMissingImage( $filename, $fullpath ) {
- $fname = 'ImageBuilder::checkMissingImage';
$row = $this->dbw->selectRow( 'image',
array( 'img_name' ),
array( 'img_name' => $filename ),
$fname );
- if( $row ) {
+ if ( $row ) {
// already known, move on
return;
} else {
function addMissingImage( $filename, $fullpath ) {
$fname = 'ImageBuilder::addMissingImage';
- $size = filesize( $fullpath );
- $info = $this->imageInfo( $filename );
$timestamp = $this->dbw->timestamp( filemtime( $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" );
} else {
}
}
- if( $filename == '' ) {
+ if ( $filename == '' ) {
$this->log( "Empty filename for $fullpath" );
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->log( "Error uploading file $fullpath" );
+ return;
+ }
}
$this->log( $fullpath );
}
}
$builder = new ImageBuilder( isset( $options['dry-run'] ) );
-if( isset( $options['missing'] ) ) {
+if ( isset( $options['missing'] ) ) {
$builder->crawlMissing();
} else {
$builder->build();
}
-?>
+
dépôts / lhc / web / wiklou.git / blobdiff