Remove temp files only on product importer and improve file search (#175

)
webgriffe · Oct 16, 2023 · fba68a7 · fba68a7
1 parent 4dd7360
commit fba68a7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/MessageHandler/ItemImportHandler.php b/src/MessageHandler/ItemImportHandler.php
@@ -8,6 +8,7 @@
 use Webgriffe\SyliusAkeneoPlugin\ImporterInterface;
 use Webgriffe\SyliusAkeneoPlugin\ImporterRegistryInterface;
 use Webgriffe\SyliusAkeneoPlugin\Message\ItemImport;
+use Webgriffe\SyliusAkeneoPlugin\Product\Importer;
 use Webgriffe\SyliusAkeneoPlugin\TemporaryFilesManager;
 use Webgriffe\SyliusAkeneoPlugin\TemporaryFilesManagerInterface;
 
@@ -27,7 +28,9 @@ public function __invoke(ItemImport $message): void
         try {
             $importer->import($akeneoIdentifier);
         } finally {
-            $this->temporaryFilesManager->deleteAllTemporaryFiles(TemporaryFilesManagerInterface::PRODUCT_VARIANT_PREFIX . $akeneoIdentifier);
+            if ($message->getAkeneoEntity() === Importer::AKENEO_ENTITY) {
+                $this->temporaryFilesManager->deleteAllTemporaryFiles(TemporaryFilesManagerInterface::PRODUCT_VARIANT_PREFIX . $akeneoIdentifier);
+            }
         }
     }
 

diff --git a/src/Product/Importer.php b/src/Product/Importer.php
@@ -28,7 +28,7 @@
 
 final class Importer implements ImporterInterface, ReconcilerInterface
 {
-    private const AKENEO_ENTITY = 'Product';
+    public const AKENEO_ENTITY = 'Product';
 
     /**
      * @param FactoryInterface<ProductTaxonInterface> $productTaxonFactory

diff --git a/src/TemporaryFilesManager.php b/src/TemporaryFilesManager.php
@@ -28,7 +28,7 @@ public function generateTemporaryFilePath(string $fileIdentifier): string
     public function deleteAllTemporaryFiles(string $fileIdentifier): void
     {
         $tempFiles = $this->finder->in($this->temporaryDirectory)->depth('== 0')->files()->name(
-            $this->getFilePrefix($fileIdentifier) . '*',
+            '/^' . str_replace('*', '\*', $this->getFilePrefix($fileIdentifier)) . '*/',
         );
         foreach ($tempFiles as $tempFile) {
             $this->filesystem->remove($tempFile->getPathname());