patch

www/controllers/Logging/SubStep.php

@@ -7,6 +7,9 @@
 
 class SubStep extends Logging
 {
+    /**
+     *  Add a new sub step to the latest step
+     */
     public function new(string $identifier, array $data)
     {
         $content = $this->getContent();
@@ -17,7 +20,7 @@ public function new(string $identifier, array $data)
         $content['steps'][$name]['substeps'][$identifier] = [
             'title' => '',
             'note' => '',
-            'status' => '',
+            'status' => 'running',
             'start' => microtime(true),
             'end' => '',
             'duration' => '',
@@ -42,7 +45,7 @@ public function new(string $identifier, array $data)
     /**
      *  Set latest sub step as completed
      */
-    public function completed(string|null $message = '')
+    public function completed(string|null $message = '', string|null $identifier = '')
     {
         // Add message to output
         $this->output($message);
@@ -52,8 +55,12 @@ public function completed(string|null $message = '')
         // Get latest step key name
         $name = array_key_last($content['steps']);
 
-        // Get latest sub step key name
-        $subName = array_key_last($content['steps'][$name]['substeps']);
+        // If no identifier is provided, get latest sub step key name, otherwise use the provided identifier
+        if (!empty($identifier)) {
+            $subName = $identifier;
+        } else {
+            $subName = array_key_last($content['steps'][$name]['substeps']);
+        }
 
         // Set status to completed
         $content['steps'][$name]['substeps'][$subName]['status'] = 'completed';

www/controllers/Repo/Mirror/Deb.php

@@ -790,9 +790,12 @@ private function downloadDebPackages($url)
             /**
              *  Print OK if package has been downloaded and verified successfully
              */
-            $this->loggingSubStepController->completed('Done');
+            $this->loggingSubStepController->completed();
         }
 
+        // Set the main substep as completed
+        $this->loggingSubStepController->completed('', 'downloading-packages');
+
         unset($this->debPackagesLocation, $totalPackages, $packageCounter);
     }
 
@@ -887,7 +890,7 @@ private function downloadDebSourcesPackages($url)
             /**
              *  Print OK if source package has been downloaded and verified successfully
              */
-            $this->loggingSubStepController->completed('Done');
+            $this->loggingSubStepController->completed();
         }
 
         unset($this->sourcesPackagesLocation, $totalPackages, $packageCounter);
@@ -945,7 +948,7 @@ private function downloadTranslation()
             /**
              *  Print OK if package has been downloaded and verified successfully
              */
-            $this->loggingSubStepController->completed('Done');
+            $this->loggingSubStepController->completed();
         }
 
         unset($this->translationsLocation);

www/controllers/Repo/Mirror/Rpm.php

@@ -935,11 +935,14 @@ private function downloadRpmPackages(string $url)
             /**
              *  Print OK if package has been downloaded and verified successfully
              */
-            $this->loggingSubStepController->completed('Done');
+            $this->loggingSubStepController->completed();
 
             unset($myprocess, $content, $keyId, $matches);
         }
 
+        // Set the main substep as completed
+        $this->loggingStepController->completed('', 'downloading-packages');
+
         unset($this->rpmPackagesLocation, $totalPackages, $packageCounter);
     }