Use service locator as registry instead of MountManager

Author: clever-age-gtonon

config/services/task.yaml

@@ -6,17 +6,23 @@ services:
 
     cleverage_flysystem_process.task.file_fetch:
         class: CleverAge\FlysystemProcessBundle\Task\FileFetchTask
+        arguments: [!tagged_locator { tag: 'flysystem.storage', index_by: 'storage' }]
     CleverAge\FlysystemProcessBundle\Task\FileFetchTask:
         alias: cleverage_flysystem_process.task.file_fetch
+        public: true
 
     cleverage_flysystem_process.task.list_content:
         class: CleverAge\FlysystemProcessBundle\Task\ListContentTask
+        arguments: [!tagged_locator { tag: 'flysystem.storage', index_by: 'storage' }]
     CleverAge\FlysystemProcessBundle\Task\ListContentTask:
         alias: cleverage_flysystem_process.task.list_content
+        public: true
 
     cleverage_flysystem_process.task.remove_file:
         class: CleverAge\FlysystemProcessBundle\Task\RemoveFileTask
         arguments:
-            - '@monolog.logger'
+            - '@logger'
+            - !tagged_locator { tag: 'flysystem.storage', index_by: 'storage' }
     CleverAge\FlysystemProcessBundle\Task\RemoveFileTask:
         alias: cleverage_flysystem_process.task.remove_file
+        public: true

src/Task/FileFetchTask.php

@@ -19,6 +19,7 @@
 use League\Flysystem\Filesystem;
 use League\Flysystem\FilesystemException;
 use League\Flysystem\FilesystemOperator;
+use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -33,6 +34,13 @@ class FileFetchTask extends AbstractConfigurableTask implements IterableTaskInte
 
     protected array $matchingFiles = [];
 
+    /**
+     * @param MountManager|null $mountManager
+     */
+    public function __construct(protected readonly ServiceLocator $storages)
+    {
+    }
+
     /**
      * @throws \InvalidArgumentException
      */
@@ -41,8 +49,8 @@ public function initialize(ProcessState $state): void
         // Configure options
         parent::initialize($state);
 
-        $this->sourceFS = new Filesystem($this->getOption($state, 'source_filesystem'));
-        $this->destinationFS = new Filesystem($this->getOption($state, 'destination_filesystem'));
+        $this->sourceFS = $this->storages->get($this->getOption($state, 'source_filesystem'));
+        $this->destinationFS = $this->storages->get($this->getOption($state, 'destination_filesystem'));
     }
 
     /**
@@ -74,7 +82,7 @@ public function next(ProcessState $state): bool
     {
         $this->findMatchingFiles($state);
 
-        return next($this->matchingFiles);
+        return false === next($this->matchingFiles) ? false : true;
     }
 
     /**
@@ -116,8 +124,6 @@ protected function findMatchingFiles(ProcessState $state): void
      */
     protected function doFileCopy(ProcessState $state, string $filename, bool $removeSource): bool|string|null
     {
-        $prefixFrom = $this->getOption($state, 'source_filesystem');
-
         $buffer = $this->sourceFS->readStream($filename);
 
         try {
@@ -132,7 +138,7 @@ protected function doFileCopy(ProcessState $state, string $filename, bool $remov
         }
 
         if ($removeSource) {
-            $this->sourceFS->delete(\sprintf('%s://%s', $prefixFrom, $filename));
+            $this->sourceFS->delete($filename);
         }
 
         return $result ? $filename : null;

src/Task/FilesystemOptionTrait.php

@@ -18,21 +18,26 @@
 use CleverAge\ProcessBundle\Model\ProcessState;
 use League\Flysystem\FilesystemException;
 use League\Flysystem\FilesystemOperator;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * Iterate over the content of a filesystem.
  */
 class ListContentTask extends AbstractConfigurableTask implements IterableTaskInterface
 {
-    use FilesystemOptionTrait;
-
     protected ?array $fsContent = null;
 
-    protected function configureOptions(OptionsResolver $resolver): void
+    public function __construct(protected readonly ServiceLocator $storages)
     {
-        $this->configureFilesystemOption($resolver, 'filesystem');
+    }
 
+
+    protected function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setRequired('filesystem');
+        $resolver->setAllowedTypes('filesystem', 'string');
         $resolver->setDefault('file_pattern', null);
         $resolver->setAllowedTypes('file_pattern', ['null', 'string']);
     }
@@ -44,7 +49,7 @@ protected function configureOptions(OptionsResolver $resolver): void
     public function execute(ProcessState $state): void
     {
         if (null === $this->fsContent || null === key($this->fsContent)) {
-            $filesystem = $this->getFilesystem($state, 'filesystem');
+            $filesystem = $this->storages->get($this->getOption($state, 'filesystem'));
             $pattern = $this->getOption($state, 'file_pattern');
 
             $this->fsContent = $this->getFilteredFilesystemContents($filesystem, $pattern);

src/Task/ListContentTask.php

@@ -17,27 +17,27 @@
 use CleverAge\ProcessBundle\Model\ProcessState;
 use League\Flysystem\FilesystemException;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * Remove a file from a filesystem.
  */
 class RemoveFileTask extends AbstractConfigurableTask
 {
-    use FilesystemOptionTrait;
-
-    public function __construct(protected LoggerInterface $logger)
+    public function __construct(protected LoggerInterface $logger, protected readonly ServiceLocator $storages)
     {
     }
 
     protected function configureOptions(OptionsResolver $resolver): void
     {
-        $this->configureFilesystemOption($resolver, 'filesystem');
+        $resolver->setRequired('filesystem');
+        $resolver->setAllowedTypes('filesystem', 'string');
     }
 
     public function execute(ProcessState $state): void
     {
-        $filesystem = $this->getFilesystem($state, 'filesystem');
+        $filesystem = $this->storages->get($this->getOption($state, 'filesystem'));
         $filePath = $state->getInput();
 
         try {