experimental --uploads option on importDump

diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index 2071a31..c1071f6 100644 (file)
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -32,6 +32,7 @@ class BackupReader {
        var $revCount  = 0;
        var $dryRun    = false;
        var $debug     = false;
+       var $uploads   = false;
 
        function BackupReader() {
                $this->stderr = fopen( "php://stderr", "wt" );
@@ -59,13 +60,18 @@ class BackupReader {
                }
        }
        
-       function handleUpload( $data ) {
-               $this->uploadCount++;
-               //$this->report();
-               $this->progress( "upload: " . $data->getFilename() );
-               
-               if( !$this->dryRun ) {
-                       call_user_func( $this->uploadCallback, $data );
+       function handleUpload( $revision ) {
+               if( $this->uploads ) {
+                       $this->uploadCount++;
+                       //$this->report();
+                       $this->progress( "upload: " . $revision->getFilename() );
+                       
+                       if( !$this->dryRun ) {
+                               // bluuuh hack
+                               //call_user_func( $this->uploadCallback, $revision );
+                               $dbw = wfGetDB( DB_MASTER );
+                               return $dbw->deadlockLoop( array( $revision, 'importUpload' ) );
+                       }
                }
        }
 
@@ -140,6 +146,9 @@ if( isset( $options['dry-run'] ) ) {
 if( isset( $options['debug'] ) ) {
        $reader->debug = true;
 }
+if( isset( $options['uploads'] ) ) {
+       $reader->uploads = true; // experimental!
+}
 
 if( isset( $args[0] ) ) {
        $result = $reader->importFromFile( $args[0] );