Partial unpacking (#98)

Author: liquetsoft

composer.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "require": {
     "php": ">=8.2",
-    "liquetsoft/fias-component": "^13.1",
+    "liquetsoft/fias-component": "^14.0",
     "illuminate/database": "^8.0|^9.0|^10.0|^11.0",
     "illuminate/http": "^8.0|^9.0|^10.0|^11.0",
     "laravel/framework": "^8.0|^9.0|^10.0|^11.0"

src/Command/DownloadCommand.php

@@ -9,7 +9,7 @@
 use Liquetsoft\Fias\Component\FiasInformer\FiasInformer;
 use Liquetsoft\Fias\Component\FiasInformer\FiasInformerResponse;
 use Liquetsoft\Fias\Component\Unpacker\Unpacker;
-use Marvin255\FileSystemHelper\FileSystemHelperInterface;
+use Marvin255\FileSystemHelper\FileSystemHelper;
 
 /**
  * Консольная команда, которая загружает указанную версию ФИАС в указанную папку.
@@ -26,7 +26,7 @@ public function __construct(
         private readonly Downloader $downloader,
         private readonly Unpacker $unpacker,
         private readonly FiasInformer $informer,
-        private readonly FileSystemHelperInterface $fs,
+        private readonly FileSystemHelper $fs,
     ) {
         parent::__construct();
     }

src/Command/InstallFromFolderCommand.php

@@ -41,8 +41,11 @@ public function handle(): void
         $this->info("Installing full version of FIAS from '{$folder}' folder");
         $start = microtime(true);
 
-        $state = new ArrayState();
-        $state->setAndLockParameter(StateParameter::PATH_TO_EXTRACT_FOLDER, $folder);
+        $state = new ArrayState(
+            [
+                StateParameter::PATH_TO_SOURCE->value => $folder,
+            ]
+        );
 
         try {
             $this->pipeline->run($state);

src/Command/InstallParallelRunningCommand.php

@@ -7,50 +7,44 @@
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Application;
 use Liquetsoft\Fias\Component\Pipeline\Pipe\Pipe;
-use Liquetsoft\Fias\Component\Pipeline\State\ArrayState;
-use Liquetsoft\Fias\Component\Pipeline\State\StateParameter;
+use Liquetsoft\Fias\Component\Pipeline\State\State;
+use Symfony\Component\Serializer\SerializerInterface;
 
 /**
  * Консольная команда, которая является одним из параллельных процессов установки ФИАС.
  */
 final class InstallParallelRunningCommand extends Command
 {
-    protected $signature = 'liquetsoft:fias:install_parallel_running {files?}';
+    protected $signature = 'liquetsoft:fias:install_parallel_running';
 
     protected $description = 'Command for running parallel installation.';
 
     private readonly Pipe $pipeline;
 
+    private readonly SerializerInterface $serializer;
+
     /**
      * В конструкторе передаем ссылку на пайплайн установки.
      */
     public function __construct(Application $app)
     {
         parent::__construct();
         $this->pipeline = $app->get('liquetsoft_fias.pipe.install_parallel_running');
+        $this->serializer = $app->get('liquetsoft_fias.serializer.serializer');
     }
 
     /**
      * Запуск команды на исполнение.
      */
     public function handle(): void
     {
-        $files = $this->argument('files');
-        if (\is_array($files)) {
-            $files = reset($files);
+        $stdIn = file_get_contents('php://stdin');
+        if ($stdIn === false || $stdIn === '') {
+            return;
         }
 
-        if ($files !== false && $files !== null && $files !== '') {
-            $files = json_decode((string) $files, true);
-        } else {
-            $stdIn = file_get_contents('php://stdin');
-            if ($stdIn !== false && $stdIn !== '') {
-                $files = json_decode($stdIn, true);
-            }
-        }
+        $state = $this->serializer->deserialize($stdIn, State::class, 'json');
 
-        $state = new ArrayState();
-        $state->setAndLockParameter(StateParameter::FILES_TO_PROCEED, $files);
         $this->pipeline->run($state);
     }
 }

src/Command/UpdateFromFolderCommand.php

@@ -41,8 +41,11 @@ public function handle(): void
         $this->info("Updating FIAS version from '{$folder}' folder");
         $start = microtime(true);
 
-        $state = new ArrayState();
-        $state->setAndLockParameter(StateParameter::PATH_TO_EXTRACT_FOLDER, $folder);
+        $state = new ArrayState(
+            [
+                StateParameter::PATH_TO_SOURCE->value => $folder,
+            ]
+        );
 
         try {
             $this->pipeline->run($state);

src/Command/UpdateParallelRunningCommand.php

@@ -8,27 +8,30 @@
 use Illuminate\Foundation\Application;
 use Liquetsoft\Fias\Component\Exception\PipeException;
 use Liquetsoft\Fias\Component\Pipeline\Pipe\Pipe;
-use Liquetsoft\Fias\Component\Pipeline\State\ArrayState;
-use Liquetsoft\Fias\Component\Pipeline\State\StateParameter;
+use Liquetsoft\Fias\Component\Pipeline\State\State;
+use Symfony\Component\Serializer\SerializerInterface;
 
 /**
  * Консольная команда, которая является одним из параллельных процессов обновления ФИАС.
  */
 final class UpdateParallelRunningCommand extends Command
 {
-    protected $signature = 'liquetsoft:fias:update_parallel_running {files?}';
+    protected $signature = 'liquetsoft:fias:update_parallel_running';
 
     protected $description = 'Command for running parallel update.';
 
     private readonly Pipe $pipeline;
 
+    private readonly SerializerInterface $serializer;
+
     /**
      * В конструкторе передаем ссылку на пайплайн установки.
      */
     public function __construct(Application $app)
     {
         parent::__construct();
         $this->pipeline = $app->get('liquetsoft_fias.pipe.update_parallel_running');
+        $this->serializer = $app->get('liquetsoft_fias.serializer.serializer');
     }
 
     /**
@@ -38,22 +41,13 @@ public function __construct(Application $app)
      */
     public function handle(): void
     {
-        $files = $this->argument('files');
-        if (\is_array($files)) {
-            $files = reset($files);
+        $stdIn = file_get_contents('php://stdin');
+        if ($stdIn === false || $stdIn === '') {
+            return;
         }
 
-        if ($files !== false && $files !== null && $files !== '') {
-            $files = json_decode((string) $files, true);
-        } else {
-            $stdIn = file_get_contents('php://stdin');
-            if ($stdIn !== false && $stdIn !== '') {
-                $files = json_decode($stdIn, true);
-            }
-        }
+        $state = $this->serializer->deserialize($stdIn, State::class, 'json');
 
-        $state = new ArrayState();
-        $state->setAndLockParameter(StateParameter::FILES_TO_PROCEED, $files);
         $this->pipeline->run($state);
     }
 }