refactor pdf scan

pimcore · Apr 17, 2024 · c1d4c2a · c1d4c2a
1 parent be56713
commit c1d4c2a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/lib/Messenger/Handler/AssetUpdateTasksHandler.php b/lib/Messenger/Handler/AssetUpdateTasksHandler.php
@@ -64,6 +64,9 @@ private function saveAsset(Asset $asset): void
     private function processDocument(Asset\Document $asset): void
     {
         if ($asset->isPdfScanningEnabled() && $asset->getMimeType() === 'application/pdf' && !$asset->getScanStatus()) {
+            $asset->setCustomSetting($asset::CUSTOM_SETTING_PDF_SCAN_STATUS, PdfScanStatus::IN_PROGRESS->value);
+            $this->saveAsset($asset);
+
             if ($asset->checkIfPdfContainsJS()) {
                 $asset->setCustomSetting($asset::CUSTOM_SETTING_PDF_SCAN_STATUS, PdfScanStatus::SAFE->value);
                 $note = 'safe';

diff --git a/models/Asset.php b/models/Asset.php
@@ -17,6 +17,7 @@
 
 use Doctrine\DBAL\Exception\DeadlockException;
 use Exception;
+use Pimcore\Model\Asset\Enum\PdfScanStatus;
 use function in_array;
 use function is_array;
 use League\Flysystem\FilesystemException;
@@ -498,6 +499,12 @@ public function save(array $parameters = []): static
 
             $parameters['isUpdate'] = $isUpdate; // need for $this->update() for certain types (image, video, document)
 
+            if ($this->getDataChanged()) {
+                if ($this->getType() === 'document') {
+                    $this->setCustomSetting($this::CUSTOM_SETTING_PDF_SCAN_STATUS, null);
+                }
+            }
+
             // we wrap the save actions in a loop here, to restart the database transactions in the case it fails
             // if a transaction fails it gets restarted $maxRetries times, then the exception is thrown out
             // especially useful to avoid problems with deadlocks in multi-threaded environments (forked workers, ...)

diff --git a/models/Asset/Document.php b/models/Asset/Document.php
@@ -167,11 +167,6 @@ public function getText(int $page = null): ?string
 
     public function checkIfPdfContainsJS(): bool
     {
-        $this->setCustomSetting(
-            self::CUSTOM_SETTING_PDF_SCAN_STATUS,
-            Model\Asset\Enum\PdfScanStatus::IN_PROGRESS->value
-        );
-
         $chunkSize = 1024;
         $filePointer = $this->getStream();