Replace CLI import/export progress display

- Remove per-row dot output. renderProgressDescription() now writes a
  single update line to STDERR every ~5s.
- Print a final summary to STDOUT.

Author: sbreker

lib/QubitFlatfileImport.class.php

@@ -41,6 +41,7 @@ class QubitFlatfileImport
     public $limitToId = 0;     // id of repository or TLD to limit our update matching under
     public $status = []; // place to store data related to overall import
     public $rowStatusVars = []; // place to store data related to current row
+    public $progressLineActive = false; // track if a progress line is currently shown on STDERR
 
     public $columnNames = []; // column names from first row of imported CSV
     public $ignoreColumns = []; // columns in CSV to ignore
@@ -281,6 +282,14 @@ public function logError($message, $includeCurrentRowNumber = true)
     {
         $message = ($includeCurrentRowNumber) ? sprintf("Row %d: %s\n", $this->getStatus('rows') + 1, $message) : $message;
 
+        // If a carriage-return progress line is active on STDERR, break it so
+        // subsequent STDOUT messages start on a new line.
+        if ($this->displayProgress && $this->progressLineActive) {
+            fwrite(STDERR, "\n");
+            fflush(STDERR);
+            $this->progressLineActive = false;
+        }
+
         if ($this->errorLog) {
             file_put_contents($this->errorLog, $message, FILE_APPEND);
         }
@@ -413,7 +422,7 @@ public function csv($fh, $skipRows = 0)
                 ++$this->status['rows'];
 
                 if ($this->displayProgress) {
-                    echo $this->renderProgressDescription();
+                    $this->renderProgressDescription();
                 }
             } else {
                 ++$this->status['rows'];
@@ -424,6 +433,26 @@ public function csv($fh, $skipRows = 0)
             $this->stopTimer();
         }
 
+        // If a carriage-return progress line is active on STDERR, break it before summaries
+        if ($this->displayProgress && $this->progressLineActive) {
+            fwrite(STDERR, "\n");
+            fflush(STDERR);
+            $this->progressLineActive = false;
+        }
+
+        // Final summary to STDOUT for logs
+        $rowsProcessed = $this->getStatus('rows') - $this->getStatus('skippedRows');
+        $totalDuration = $this->getTimeElapsed();
+        // Ensure total duration is never zero (avoid div by zero in rate calc below)
+        $finalRate = $rowsProcessed / max($totalDuration, 1e-9);
+        $msg = sprintf(
+            "Processed %d rows total in %.2fs (%.1f/s)\n",
+            $rowsProcessed,
+            $totalDuration,
+            $finalRate
+        );
+        echo $this->logError($msg, false);
+
         if ($this->status['duplicates']) {
             $msg = sprintf('Duplicates found: %d', $this->status['duplicates']);
             echo $this->logError($msg, false);
@@ -547,30 +576,31 @@ public function isUpdating()
      */
     public function renderProgressDescription()
     {
-        $output = '.';
+        // Periodic single-line summaries to STDERR.
+        static $startTime = null;
+        static $lastLogTime = null;
+        static $processedCount = 0;
 
-        // return empty string if no intermittant progress display
-        if (
-            !isset($this->rowsUntilProgressDisplay)
-            || !$this->rowsUntilProgressDisplay
-        ) {
-            return $output;
+        if (null === $startTime) {
+            $startTime = microtime(true);
+            $lastLogTime = $startTime;
         }
-        // row count isn't incremented until after this is displayed, so add one to reflect reality
-        $rowsProcessed = $this->getStatus('rows') - $this->getStatus('skippedRows');
-        $memoryUsageMB = round(memory_get_usage() / (1024 * 1024), 2);
 
-        // if this show should be displayed, display it
-        if (!($rowsProcessed % $this->rowsUntilProgressDisplay)) {
-            $elapsed = $this->getTimeElapsed();
-            $elapsedMinutes = round($elapsed / 60, 2);
-            $averageTime = round($elapsed / $rowsProcessed, 2);
+        ++$processedCount;
 
-            $output .= "\n".$rowsProcessed.' rows processed in '.$elapsedMinutes
-                .' minutes ('.$averageTime.' second/row average, '.$memoryUsageMB." MB used).\n";
+        $now = microtime(true);
+        if ($now - $lastLogTime >= 5) {
+            // Ensure elapsed is never zero (avoid div by zero in rate calc below)
+            $elapsed = max($now - $startTime, 1e-9);
+            $rate = $processedCount / $elapsed;
+            $memoryUsageMB = round(memory_get_usage() / (1024 * 1024), 2);
+            fwrite(STDERR, sprintf("\rProcessed %d rows (%.1f/s, %.2f MB)", $processedCount, $rate, $memoryUsageMB));
+            fflush(STDERR);
+            $lastLogTime = $now;
+            $this->progressLineActive = true;
         }
 
-        return $output;
+        return '';
     }
 
     /*
@@ -1498,7 +1528,8 @@ protected function startTimer()
      */
     protected function stopTimer()
     {
-        $this->timer->stop();
+        // Record elapsed time into the timer's total so elapsed() reports correctly.
+        $this->timer->add(false);
     }
 
     /**