Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make refreshImageMetadata not fail completely if it doesn't like a single file

Browse source 
Change-Id: I1170cf91ba6dea08d35457c9859b8c18482d4aa6
This commit is contained in:
Reedy 2016-12-09 19:23:28 +00:00
parent cffd52beee
commit 0200a1c113
1 changed files with 39 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
maintenance/refreshImageMetadata.php
View file

@ -139,45 +139,53 @@ class RefreshImageMetadata extends Maintenance {
}
foreach ( $res as $row ) {
// LocalFile will upgrade immediately here if obsolete
$file = $repo->newFileFromRow( $row );
if ( $file->getUpgraded() ) {
// File was upgraded.
$upgraded++;
$newLength = strlen( $file->getMetadata() );
$oldLength = strlen( $row->img_metadata );
if ( $newLength < $oldLength - 5 ) {
// If after updating, the metadata is smaller then
// what it was before, that's probably not a good thing
// because we extract more data with time, not less.
// Thus this probably indicates an error of some sort,
// or at the very least is suspicious. Have the - 5 just
// to weed out any inconsequential changes.
$error++;
$this->output( "Warning: File:{$row->img_name} used to have " .
"$oldLength bytes of metadata but now has $newLength bytes.\n" );
} elseif ( $verbose ) {
$this->output( "Refreshed File:{$row->img_name}.\n" );
}
} else {
$leftAlone++;
if ( $force ) {
$file->upgradeRow();
try {
// LocalFile will upgrade immediately here if obsolete
$file = $repo->newFileFromRow( $row );
if ( $file->getUpgraded() ) {
// File was upgraded.
$upgraded++;
$newLength = strlen( $file->getMetadata() );
$oldLength = strlen( $row->img_metadata );
if ( $newLength < $oldLength - 5 ) {
// If after updating, the metadata is smaller then
// what it was before, that's probably not a good thing
// because we extract more data with time, not less.
// Thus this probably indicates an error of some sort,
// or at the very least is suspicious. Have the - 5 just
// to weed out any inconsequential changes.
$error++;
$this->output( "Warning: File:{$row->img_name} used to have " .
"$oldLength bytes of metadata but now has $newLength bytes. (forced)\n" );
}
if ( $verbose ) {
$this->output( "Forcibly refreshed File:{$row->img_name}.\n" );
$this->output(
"Warning: File:{$row->img_name} used to have " .
"$oldLength bytes of metadata but now has $newLength bytes.\n"
);
} elseif ( $verbose ) {
$this->output( "Refreshed File:{$row->img_name}.\n" );
}
} else {
if ( $verbose ) {
$this->output( "Skipping File:{$row->img_name}.\n" );
$leftAlone++;
if ( $force ) {
$file->upgradeRow();
$newLength = strlen( $file->getMetadata() );
$oldLength = strlen( $row->img_metadata );
if ( $newLength < $oldLength - 5 ) {
$error++;
$this->output(
"Warning: File:{$row->img_name} used to have " .
"$oldLength bytes of metadata but now has $newLength bytes. (forced)\n"
);
}
if ( $verbose ) {
$this->output( "Forcibly refreshed File:{$row->img_name}.\n" );
}
} else {
if ( $verbose ) {
$this->output( "Skipping File:{$row->img_name}.\n" );
}
}
}
} catch ( Exception $e ) {
$this->output( "{$row->img_name} failed. {$e->getMessage()}\n" );
}
}
$conds2 = [ 'img_name > ' . $dbw->addQuotes( $row->img_name ) ];