Merge "Add hint to OT_* defines"

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

diff --git a/maintenance/rebuildImages.php b/maintenance/rebuildImages.php
index f5d06e4..5a14967 100644 (file)
--- a/maintenance/rebuildImages.php
+++ b/maintenance/rebuildImages.php
@@ -8,7 +8,7 @@
  *              add them only.
  *
  * Copyright © 2005 Brion Vibber <brion@pobox.com>
- * http://www.mediawiki.org/
+ * https://www.mediawiki.org/
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
  * @ingroup Maintenance
  */
 
-require_once( __DIR__ . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
 /**
  * Maintenance script to update image metadata records.
@@ -79,6 +79,7 @@ class ImageBuilder extends Maintenance {
                if ( !isset( $this->repo ) ) {
                        $this->repo = RepoGroup::singleton()->getLocalRepo();
                }
+
                return $this->repo;
        }
 
@@ -91,7 +92,7 @@ class ImageBuilder extends Maintenance {
                $this->processed = 0;
                $this->updated = 0;
                $this->count = $count;
-               $this->startTime = wfTime();
+               $this->startTime = microtime( true );
                $this->table = $table;
        }
 
@@ -104,7 +105,7 @@ class ImageBuilder extends Maintenance {
                $portion = $this->processed / $this->count;
                $updateRate = $this->updated / $this->processed;
 
-               $now = wfTime();
+               $now = microtime( true );
                $delta = $now - $this->startTime;
                $estimatedTotalTime = $delta / $portion;
                $eta = $this->startTime + $estimatedTotalTime;
@@ -149,6 +150,7 @@ class ImageBuilder extends Maintenance {
                // Create a File object from the row
                // This will also upgrade it
                $file = $this->getRepo()->newFileFromRow( $row );
+
                return $file->getUpgraded();
        }
 
@@ -161,9 +163,11 @@ class ImageBuilder extends Maintenance {
                // This will also upgrade it
                if ( $row->oi_archive_name == '' ) {
                        $this->output( "Empty oi_archive_name for oi_name={$row->oi_name}\n" );
+
                        return false;
                }
                $file = $this->getRepo()->newFileFromRow( $row );
+
                return $file->getUpgraded();
        }
 
@@ -201,14 +205,22 @@ class ImageBuilder extends Maintenance {
 
                if ( $filename == '' ) {
                        $this->output( "Empty filename for $fullpath\n" );
+
                        return;
                }
                if ( !$this->dryrun ) {
                        $file = wfLocalFile( $filename );
-                       if ( !$file->recordUpload( '', '(recovered file, missing upload log entry)', '', '', '',
-                               false, $timestamp ) )
-                       {
+                       if ( !$file->recordUpload(
+                               '',
+                               '(recovered file, missing upload log entry)',
+                               '',
+                               '',
+                               '',
+                               false,
+                               $timestamp
+                       ) ) {
                                $this->output( "Error uploading file $fullpath\n" );
+
                                return;
                        }
                }
@@ -217,4 +229,4 @@ class ImageBuilder extends Maintenance {
 }
 
 $maintClass = 'ImageBuilder';
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;