X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcleanupImages.php;h=b25b9bbe7d4c3f22e3787256829d0186c0877c2c;hb=8775ac3b20b03b1b446217d637b3aad3019f1cad;hp=df765d816fdc877c41bde9592f431e01f52dddb5;hpb=d64452ffe1a6027f67e2e98ae800bb97cb070222;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/cleanupImages.php b/maintenance/cleanupImages.php index df765d816f..b25b9bbe7d 100644 --- a/maintenance/cleanupImages.php +++ b/maintenance/cleanupImages.php @@ -1,5 +1,5 @@ 'image', + 'conds' => array(), + 'index' => 'img_name', + 'callback' => 'processRow', + ); + + public function __construct() { + parent::__construct(); + $this->mDescription = "Script to clean up broken, unparseable upload filenames"; } - function processPage( $row ) { + protected function processRow( $row ) { global $wgContLang; $source = $row->img_name; - if( $source == '' ) { + if ( $source == '' ) { // Ye olde empty rows. Just kill them. $this->killRow( $source ); return $this->progress( 1 ); } - + $cleaned = $source; - + // About half of old bad image names have percent-codes $cleaned = rawurldecode( $cleaned ); // We also have some HTML entities there $cleaned = Sanitizer::decodeCharReferences( $cleaned ); - + // Some are old latin-1 $cleaned = $wgContLang->checkTitleEncoding( $cleaned ); - + // Many of remainder look like non-normalized unicode - $cleaned = UtfNormal::cleanUp( $cleaned ); - - $title = Title::makeTitleSafe( NS_IMAGE, $cleaned ); - - if( is_null( $title ) ) { - $this->log( "page $source ($cleaned) is illegal." ); + $cleaned = $wgContLang->normalize( $cleaned ); + + $title = Title::makeTitleSafe( NS_FILE, $cleaned ); + + if ( is_null( $title ) ) { + $this->output( "page $source ($cleaned) is illegal.\n" ); $safe = $this->buildSafeTitle( $cleaned ); - if( $safe === false ) + if ( $safe === false ) return $this->progress( 0 ); $this->pokeFile( $source, $safe ); return $this->progress( 1 ); } - if( $title->getDBkey() !== $source ) { + if ( $title->getDBkey() !== $source ) { $munged = $title->getDBkey(); - $this->log( "page $source ($munged) doesn't match self." ); + $this->output( "page $source ($munged) doesn't match self.\n" ); $this->pokeFile( $source, $munged ); return $this->progress( 1 ); } $this->progress( 0 ); } - - function killRow( $name ) { - if( $this->dryrun ) { - $this->log( "DRY RUN: would delete bogus row '$name'" ); + + private function killRow( $name ) { + if ( $this->dryrun ) { + $this->output( "DRY RUN: would delete bogus row '$name'\n" ); } else { - $this->log( "deleting bogus row '$name'" ); + $this->output( "deleting bogus row '$name'\n" ); $db = wfGetDB( DB_MASTER ); $db->delete( 'image', array( 'img_name' => $name ), __METHOD__ ); } } - - function filePath( $name ) { + + private function filePath( $name ) { if ( !isset( $this->repo ) ) { $this->repo = RepoGroup::singleton()->getLocalRepo(); } return $this->repo->getRootDirectory() . '/' . $this->repo->getHashPath( $name ) . $name; } - - function pokeFile( $orig, $new ) { + + private function imageExists( $name, $db ) { + return $db->selectField( 'image', '1', array( 'img_name' => $name ), __METHOD__ ); + } + + private function pageExists( $name, $db ) { + return $db->selectField( 'page', '1', array( 'page_namespace' => NS_FILE, 'page_title' => $name ), __METHOD__ ); + } + + private function pokeFile( $orig, $new ) { $path = $this->filePath( $orig ); - if( !file_exists( $path ) ) { - $this->log( "missing file: $path" ); + if ( !file_exists( $path ) ) { + $this->output( "missing file: $path\n" ); return $this->killRow( $orig ); } - + $db = wfGetDB( DB_MASTER ); + + /* + * To prevent key collisions in the update() statements below, + * if the target title exists in the image table, or if both the + * original and target titles exist in the page table, append + * increasing version numbers until the target title exists in + * neither. (See also bug 16916.) + */ $version = 0; $final = $new; - - while( $db->selectField( 'image', 'img_name', array( 'img_name' => $final ), __METHOD__ ) || - Title::makeTitle( NS_IMAGE, $final )->exists() ) { - $this->log( "Rename conflicts with '$final'..." ); + $conflict = ( $this->imageExists( $final, $db ) || + ( $this->pageExists( $orig, $db ) && $this->pageExists( $final, $db ) ) ); + + while ( $conflict ) { + $this->output( "Rename conflicts with '$final'...\n" ); $version++; $final = $this->appendTitle( $new, "_$version" ); + $conflict = ( $this->imageExists( $final, $db ) || $this->pageExists( $final, $db ) ); } - + $finalPath = $this->filePath( $final ); - - if( $this->dryrun ) { - $this->log( "DRY RUN: would rename $path to $finalPath" ); + + if ( $this->dryrun ) { + $this->output( "DRY RUN: would rename $path to $finalPath\n" ); } else { - $this->log( "renaming $path to $finalPath" ); + $this->output( "renaming $path to $finalPath\n" ); // XXX: should this use File::move()? FIXME? $db->begin(); $db->update( 'image', @@ -140,49 +162,46 @@ class ImageCleanup extends TableCleanup { __METHOD__ ); $db->update( 'page', array( 'page_title' => $final ), - array( 'page_title' => $orig, 'page_namespace' => NS_IMAGE ), + array( 'page_title' => $orig, 'page_namespace' => NS_FILE ), __METHOD__ ); $dir = dirname( $finalPath ); - if( !file_exists( $dir ) ) { - if( !mkdir( $dir, 0777, true ) ) { + if ( !file_exists( $dir ) ) { + if ( !wfMkdirParents( $dir ) ) { $this->log( "RENAME FAILED, COULD NOT CREATE $dir" ); $db->rollback(); return; } } - if( rename( $path, $finalPath ) ) { + if ( rename( $path, $finalPath ) ) { $db->commit(); } else { - $this->log( "RENAME FAILED" ); + $this->error( "RENAME FAILED" ); $db->rollback(); } } } - - function appendTitle( $name, $suffix ) { + + private function appendTitle( $name, $suffix ) { return preg_replace( '/^(.*)(\..*?)$/', "\\1$suffix\\2", $name ); } - - function buildSafeTitle( $name ) { + + private function buildSafeTitle( $name ) { global $wgLegalTitleChars; $x = preg_replace_callback( - "/([^$wgLegalTitleChars])/", + "/([^$wgLegalTitleChars]|~)/", array( $this, 'hexChar' ), $name ); - - $test = Title::makeTitleSafe( NS_IMAGE, $x ); - if( is_null( $test ) || $test->getDBkey() !== $x ) { - $this->log( "Unable to generate safe title from '$name', got '$x'" ); + + $test = Title::makeTitleSafe( NS_FILE, $x ); + if ( is_null( $test ) || $test->getDBkey() !== $x ) { + $this->error( "Unable to generate safe title from '$name', got '$x'" ); return false; } - + return $x; } } -$wgUser->setName( 'Conversion script' ); -$caps = new ImageCleanup( !isset( $options['fix'] ) ); -$caps->cleanup(); - - +$maintClass = "ImageCleanup"; +require_once( RUN_MAINTENANCE_IF_MAIN );