Made download process a little more error-prone.

Author: BluePsyduck

src/Command/DownloadFactorioCommand.php

@@ -63,31 +63,63 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $version = strval($input->getArgument('version'));
         $archiveFileFull = $this->tempDirectory . "/factorio_${version}_full.tar.xz";
         $archiveFileHeadless = $this->tempDirectory . "/factorio_${version}_headless.tar.xz";
+        $tempDirectoryFull = $this->tempDirectory . "/factorio_${version}_full";
+        $tempDirectoryHeadless = $this->tempDirectory . "/factorio_${version}_headless";
 
         $this->console->writeHeadline("Downloading and installing Factorio version {$version}");
 
         $this->console->writeAction('Downloading full variant of Factorio');
-        $fullProcess = $this->factorioDownloadService->createFactorioDownloadProcess(
+        $downloadFullProcess = $this->factorioDownloadService->createFactorioDownloadProcess(
             FactorioDownloadService::VARIANT_FULL,
             $version,
             $archiveFileFull,
         );
-        $fullProcess->start();
+        $downloadFullProcess->start();
 
         $this->console->writeAction('Downloading headless variant of Factorio');
-        $headlessProcess = $this->factorioDownloadService->createFactorioDownloadProcess(
+        $downloadHeadlessProcess = $this->factorioDownloadService->createFactorioDownloadProcess(
             FactorioDownloadService::VARIANT_HEADLESS,
             $version,
             $archiveFileHeadless,
         );
-        $headlessProcess->run();
-
+        $downloadHeadlessProcess->run();
+        if ($downloadHeadlessProcess->getExitCode() !== 0) {
+            $this->console->writeMessage('<fg=red>Download of headless version failed!</>');
+            return 1;
+        }
         $this->console->writeAction('Extracting headless variant of Factorio');
-        $this->factorioDownloadService->extractFactorio($archiveFileHeadless, $this->headlessFactorioDirectory);
+        $extractHeadlessProcess = $this->factorioDownloadService->createFactorioExtractProcess(
+            $archiveFileHeadless,
+            $tempDirectoryHeadless,
+        );
+        $extractHeadlessProcess->run();
+        if ($extractHeadlessProcess->getExitCode() !== 0) {
+            $this->console->writeMessage('<fg=red>Extracting headless version failed!</>');
+            return 1;
+        }
+
+        $downloadFullProcess->wait();
+        if ($downloadFullProcess->getExitCode() !== 0) {
+            $this->console->writeMessage('<fg=red>Download of full version failed!</>');
+            return 1;
+        }
 
-        $fullProcess->wait();
         $this->console->writeAction('Extracting full variant of Factorio');
-        $this->factorioDownloadService->extractFactorio($archiveFileFull, $this->fullFactorioDirectory);
+        $extractFullProcess = $this->factorioDownloadService->createFactorioExtractProcess(
+            $archiveFileFull,
+            $tempDirectoryFull,
+        );
+        $extractFullProcess->run();
+        if ($extractFullProcess->getExitCode() !== 0) {
+            $this->console->writeMessage('<fg=red>Extracting full version failed!</>');
+            return 1;
+        }
+
+        $this->console->writeAction('Switching Factorio releases');
+        $this->fileSystem->remove($this->headlessFactorioDirectory);
+        $this->fileSystem->rename($tempDirectoryHeadless, $this->headlessFactorioDirectory);
+        $this->fileSystem->remove($this->fullFactorioDirectory);
+        $this->fileSystem->rename($tempDirectoryFull, $this->fullFactorioDirectory);
 
         $this->console->writeAction('Cleaning up');
         $this->fileSystem->remove($archiveFileHeadless);

src/Service/FactorioDownloadService.php

@@ -29,18 +29,15 @@ class FactorioDownloadService
     private Filesystem $fileSystem;
     private string $factorioApiUsername;
     private string $factorioApiToken;
-    private string $tempDirectory;
 
     public function __construct(
         Filesystem $filesystem,
         string $factorioApiUsername,
         string $factorioApiToken,
-        string $tempDirectory
     ) {
         $this->fileSystem = $filesystem;
         $this->factorioApiUsername = $factorioApiUsername;
         $this->factorioApiToken = $factorioApiToken;
-        $this->tempDirectory = (string) realpath($tempDirectory);
     }
 
     /**
@@ -61,28 +58,12 @@ public function createFactorioDownloadProcess(
         );
     }
 
-    /**
-     * Extracts the specified archive file and replaces the current Factorio instance with its contents.
-     * @param string $archiveFile
-     * @param string $destinationDirectory
-     */
-    public function extractFactorio(string $archiveFile, string $destinationDirectory): void
-    {
-        $tempDirectory = $this->tempDirectory . '/factorio_temp';
-
-        $process = $this->createExtractArchiveProcess($archiveFile, $tempDirectory);
-        $process->run();
-
-        $this->fileSystem->remove($destinationDirectory);
-        $this->fileSystem->rename($tempDirectory, $destinationDirectory);
-    }
-
     /**
      * @param string $archiveFile
      * @param string $destinationDirectory
      * @return Process<string>
      */
-    protected function createExtractArchiveProcess(string $archiveFile, string $destinationDirectory): Process
+    public function createFactorioExtractProcess(string $archiveFile, string $destinationDirectory): Process
     {
         $this->fileSystem->remove($destinationDirectory);
         $this->fileSystem->mkdir($destinationDirectory);