feat: Show download progress on updater.phar

Signed-off-by: Marcel Müller <marcel-mueller@gmx.de>

Author: SystemKeeper

index.php

@@ -27,6 +27,7 @@ class LogException extends \Exception {
 }
 
 
+use Closure;
 use CurlHandle;
 
 class Updater {
@@ -38,6 +39,7 @@ class Updater {
 	private ?string $requestID = null;
 	private bool $disabled = false;
 	private int $previousProgress = 0;
+	private ?Closure $downloadProgress = null;
 
 	/**
 	 * Updater constructor
@@ -555,8 +557,9 @@ private function getUpdateServerResponse(): array {
 	 *
 	 * @throws \Exception
 	 */
-	public function downloadUpdate(?string $url = null): void {
+	public function downloadUpdate(?string $url = null, ?Closure $downloadProgress = null): void {
 		$this->silentLog('[info] downloadUpdate()');
+		$this->downloadProgress = $downloadProgress;
 
 		if ($url) {
 			// If a URL is provided, use it directly
@@ -716,6 +719,10 @@ private function downloadProgressCallback(\CurlHandle $resource, int $download_s
 				// log every 2% increment for the first 10% then only log every 10% increment after that
 				if ($progress % 10 === 0 || ($progress < 10 && $progress % 2 === 0)) {
 					$this->silentLog("[info] download progress: $progress% (" . $this->formatBytes($downloaded) . ' of ' . $this->formatBytes($download_size) . ')');
+
+					if ($this->downloadProgress) {
+						($this->downloadProgress)($progress, $this->formatBytes($downloaded), $this->formatBytes($download_size));
+					}
 				}
 			}
 		}

lib/UpdateCommand.php

@@ -229,7 +229,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 
 			$output->write('[ ] ' . $this->checkTexts[$i] . ' ...');
 
-			$result = $this->executeStep($i);
+			$result = $this->executeStep($i, $output);
 
 			// Move the cursor to the beginning of the line
 			$output->write("\x0D");
@@ -380,7 +380,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 	/**
 	 * @return array{proceed:bool,response:string|list<string>} with options 'proceed' which is a boolean and defines if the step succeeded and an optional 'response' string or array
 	 */
-	protected function executeStep(int $step): array {
+	protected function executeStep(int $step, OutputInterface $output): array {
 		if ($this->updater === null) {
 			return ['proceed' => false, 'response' => 'Initialization problem'];
 		}
@@ -404,7 +404,14 @@ protected function executeStep(int $step): array {
 					}
 					break;
 				case 4:
-					$this->updater->downloadUpdate($this->urlOverride);
+					// Ensure that we have the same number of characters, that we want to override in the progress method
+					$output->write(str_pad(' 0%', 5, ' ', STR_PAD_LEFT));
+
+					$this->updater->downloadUpdate($this->urlOverride, function (int $progress, string $downloaded, string $download_size) use ($output) {
+						// Move cursor 5 to the left and write the new progress
+						$output->write("\x1B[5D");
+						$output->write(str_pad(' ' . $progress . '%', 5, ' ', STR_PAD_LEFT));
+					});
 					break;
 				case 5:
 					$this->updater->verifyIntegrity($this->urlOverride);

lib/Updater.php

@@ -9,6 +9,7 @@
 
 namespace NC\Updater;
 
+use Closure;
 use CurlHandle;
 
 class Updater {
@@ -20,6 +21,7 @@ class Updater {
 	private ?string $requestID = null;
 	private bool $disabled = false;
 	private int $previousProgress = 0;
+	private ?Closure $downloadProgress = null;
 
 	/**
 	 * Updater constructor
@@ -537,8 +539,9 @@ private function getUpdateServerResponse(): array {
 	 *
 	 * @throws \Exception
 	 */
-	public function downloadUpdate(?string $url = null): void {
+	public function downloadUpdate(?string $url = null, ?Closure $downloadProgress = null): void {
 		$this->silentLog('[info] downloadUpdate()');
+		$this->downloadProgress = $downloadProgress;
 
 		if ($url) {
 			// If a URL is provided, use it directly
@@ -698,6 +701,10 @@ private function downloadProgressCallback(\CurlHandle $resource, int $download_s
 				// log every 2% increment for the first 10% then only log every 10% increment after that
 				if ($progress % 10 === 0 || ($progress < 10 && $progress % 2 === 0)) {
 					$this->silentLog("[info] download progress: $progress% (" . $this->formatBytes($downloaded) . ' of ' . $this->formatBytes($download_size) . ')');
+
+					if ($this->downloadProgress) {
+						($this->downloadProgress)($progress, $this->formatBytes($downloaded), $this->formatBytes($download_size));
+					}
 				}
 			}
 		}

updater.phar

@@ -14,7 +14,10 @@
             echo $err;
         }
     }
-    throw new RuntimeException($err);
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
 }
 
 require_once __DIR__ . '/composer/autoload_real.php';