Fixes for r45514 and r45516:

[lhc/web/wiklou.git] / maintenance / cleanupImages.php

diff --git a/maintenance/cleanupImages.php b/maintenance/cleanupImages.php
index 389ec30..00903f2 100644 (file)
--- a/maintenance/cleanupImages.php
+++ b/maintenance/cleanupImages.php
@@ -24,14 +24,17 @@
  * 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
+ * @ingroup Maintenance
  */
 
 require_once( 'commandLine.inc' );
 require_once( 'cleanupTable.inc' );
 
+/**
+ * @ingroup Maintenance
+ */
 class ImageCleanup extends TableCleanup {
        function __construct( $dryrun = false ) {
                parent::__construct( 'image', $dryrun );
@@ -50,7 +53,10 @@ class ImageCleanup extends TableCleanup {
                $cleaned = $source;
                
                // About half of old bad image names have percent-codes
-               $cleaned = urldecode( $cleaned );
+               $cleaned = rawurldecode( $cleaned );
+
+               // We also have some HTML entities there
+               $cleaned = Sanitizer::decodeCharReferences( $cleaned );
                
                // Some are old latin-1
                $cleaned = $wgContLang->checkTitleEncoding( $cleaned );
@@ -58,17 +64,19 @@ class ImageCleanup extends TableCleanup {
                // Many of remainder look like non-normalized unicode
                $cleaned = UtfNormal::cleanUp( $cleaned );
                
-               $title = Title::makeTitleSafe( NS_IMAGE, $cleaned );
+               $title = Title::makeTitleSafe( NS_FILE, $cleaned );
                
                if( is_null( $title ) ) {
                        $this->log( "page $source ($cleaned) is illegal." );
                        $safe = $this->buildSafeTitle( $cleaned );
+                       if( $safe === false )
+                               return $this->progress( 0 );
                        $this->pokeFile( $source, $safe );
                        return $this->progress( 1 );
                }
 
-               if( $title->getDbKey() !== $source ) {
-                       $munged = $title->getDbKey();
+               if( $title->getDBkey() !== $source ) {
+                       $munged = $title->getDBkey();
                        $this->log( "page $source ($munged) doesn't match self." );
                        $this->pokeFile( $source, $munged );
                        return $this->progress( 1 );
@@ -89,42 +97,82 @@ class ImageCleanup extends TableCleanup {
                }
        }
        
+       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 ) {
+               $path = $this->filePath( $orig );
+               if( !file_exists( $path ) ) {
+                       $this->log( "missing file: $path" );
+                       return $this->killRow( $orig );
+               }
+               
                $db = wfGetDB( DB_MASTER );
                $version = 0;
                $final = $new;
                
-               while( $db->selectField( 'image', 'img_name',
-                       array( 'img_name' => $final ), __METHOD__ ) ) {
+               while( $db->selectField( 'image', 'img_name', array( 'img_name' => $final ), __METHOD__ ) ||
+                       Title::makeTitle( NS_FILE, $final )->exists() ) {
                        $this->log( "Rename conflicts with '$final'..." );
                        $version++;
-                       $final = $this->appendTitle( $new, $final );
+                       $final = $this->appendTitle( $new, "_$version" );
                }
                
+               $finalPath = $this->filePath( $final );
+               
                if( $this->dryrun ) {
-                       $this->log( "DRY RUN: would rename '$orig' to '$final'" );
+                       $this->log( "DRY RUN: would rename $path to $finalPath" );
                } else {
-                       $this->log( "renaming '$orig' to '$final'" );
+                       $this->log( "renaming $path to $finalPath" );
+                       // XXX: should this use File::move()?  FIXME?
+                       $db->begin();
                        $db->update( 'image',
                                array( 'img_name' => $final ),
                                array( 'img_name' => $orig ),
                                __METHOD__ );
+                       $db->update( 'oldimage',
+                               array( 'oi_name' => $final ),
+                               array( 'oi_name' => $orig ),
+                               __METHOD__ );
+                       $db->update( 'page',
+                               array( 'page_title' => $final ),
+                               array( 'page_title' => $orig, 'page_namespace' => NS_FILE ),
+                               __METHOD__ );
+                       $dir = dirname( $finalPath );
+                       if( !file_exists( $dir ) ) {
+                               if( !wfMkdirParents( $dir ) ) {
+                                       $this->log( "RENAME FAILED, COULD NOT CREATE $dir" );
+                                       $db->rollback();
+                                       return;
+                               }
+                       }
+                       if( rename( $path, $finalPath ) ) {
+                               $db->commit();
+                       } else {
+                               $this->log( "RENAME FAILED" );
+                               $db->rollback();
+                       }
                }
        }
        
        function appendTitle( $name, $suffix ) {
                return preg_replace( '/^(.*)(\..*?)$/',
-                       "\1$suffix\2", $name );
+                       "\\1$suffix\\2", $name );
        }
        
        function buildSafeTitle( $name ) {
+               global $wgLegalTitleChars;
                $x = preg_replace_callback(
-                       "/([^$wgLegalTitleChars])/",
-                       $name,
-                       array( $this, 'hexChar' ) );
+                       "/([^$wgLegalTitleChars]|~)/",
+                       array( $this, 'hexChar' ),
+                       $name );
                
-               $test = Title::makeTitleSafe( NS_IMAGE, $x );
-               if( is_null( $test ) || $test->getDbKey() !== $x ) {
+               $test = Title::makeTitleSafe( NS_FILE, $x );
+               if( is_null( $test ) || $test->getDBkey() !== $x ) {
                        $this->log( "Unable to generate safe title from '$name', got '$x'" );
                        return false;
                }
@@ -137,4 +185,4 @@ $wgUser->setName( 'Conversion script' );
 $caps = new ImageCleanup( !isset( $options['fix'] ) );
 $caps->cleanup();
 
-?>
+