[File] fixes resource delete

claroline · Jan 20, 2025 · bd71e58 · bd71e58
1 parent e114fe0
commit bd71e58
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 1 deletion.
diff --git a/src/main/core/Listener/Resource/Types/FileListener.php b/src/main/core/Listener/Resource/Types/FileListener.php
@@ -78,7 +78,7 @@ public function download(AbstractResource $resource): ?string
     /** @param File $resource */
     public function delete(AbstractResource $resource, FileBag $fileBag, bool $softDelete = true): bool
     {
-        if ($softDelete && $this->fileManager->exists($resource->getHashName())) {
+        if (!$softDelete && $this->fileManager->exists($resource->getHashName())) {
             $pathName = $this->fileManager->getDirectory().DIRECTORY_SEPARATOR.$resource->getHashName();
             $fileBag->add($resource->getHashName(), $pathName);
         }

diff --git a/src/plugin/image-player/Component/Resource/ImageResource.php b/src/plugin/image-player/Component/Resource/ImageResource.php
@@ -13,6 +13,7 @@
 
 use Claroline\AppBundle\API\Serializer\SerializerInterface;
 use Claroline\AppBundle\API\SerializerProvider;
+use Claroline\AppBundle\API\Utils\FileBag;
 use Claroline\AppBundle\Persistence\ObjectManager;
 use Claroline\CoreBundle\Component\Resource\DownloadableResourceInterface;
 use Claroline\CoreBundle\Component\Resource\FileAdapterInterface;
@@ -93,6 +94,17 @@ public function download(AbstractResource $resource): ?string
         return $resource->getUrl();
     }
 
+    /** @param Image $resource */
+    public function delete(AbstractResource $resource, FileBag $fileBag, bool $softDelete = true): bool
+    {
+        if (!$softDelete && $this->fileManager->exists($resource->getUrl())) {
+            $pathName = $this->fileManager->getDirectory().DIRECTORY_SEPARATOR.$resource->getUrl();
+            $fileBag->add($resource->getUrl(), $pathName);
+        }
+
+        return true;
+    }
+
     public function supportsFile(File $file): int
     {
         if (str_starts_with($file->getMimeType(), 'image')) {

diff --git a/src/plugin/pdf-player/Component/Resource/PdfResource.php b/src/plugin/pdf-player/Component/Resource/PdfResource.php
@@ -13,6 +13,7 @@
 
 use Claroline\AppBundle\API\Serializer\SerializerInterface;
 use Claroline\AppBundle\API\SerializerProvider;
+use Claroline\AppBundle\API\Utils\FileBag;
 use Claroline\AppBundle\Persistence\ObjectManager;
 use Claroline\CoreBundle\Component\Resource\FileAdapterInterface;
 use Claroline\CoreBundle\Component\Resource\ResourceComponent;
@@ -91,6 +92,17 @@ public function download(AbstractResource $resource): ?string
         return $resource->getUrl();
     }
 
+    /** @param Pdf $resource */
+    public function delete(AbstractResource $resource, FileBag $fileBag, bool $softDelete = true): bool
+    {
+        if (!$softDelete && $this->fileManager->exists($resource->getUrl())) {
+            $pathName = $this->fileManager->getDirectory().DIRECTORY_SEPARATOR.$resource->getUrl();
+            $fileBag->add($resource->getUrl(), $pathName);
+        }
+
+        return true;
+    }
+
     public function supportsFile(File $file): int
     {
         if ('application/pdf' === $file->getMimeType()) {

diff --git a/src/plugin/video-player/Component/Resource/VideoResource.php b/src/plugin/video-player/Component/Resource/VideoResource.php
@@ -13,6 +13,7 @@
 
 use Claroline\AppBundle\API\Serializer\SerializerInterface;
 use Claroline\AppBundle\API\SerializerProvider;
+use Claroline\AppBundle\API\Utils\FileBag;
 use Claroline\AppBundle\Persistence\ObjectManager;
 use Claroline\CoreBundle\Component\Resource\DownloadableResourceInterface;
 use Claroline\CoreBundle\Component\Resource\FileAdapterInterface;
@@ -89,6 +90,17 @@ public function download(AbstractResource $resource): ?string
         return $resource->getUrl();
     }
 
+    /** @param Video $resource */
+    public function delete(AbstractResource $resource, FileBag $fileBag, bool $softDelete = true): bool
+    {
+        if (!$softDelete && $this->fileManager->exists($resource->getUrl())) {
+            $pathName = $this->fileManager->getDirectory().DIRECTORY_SEPARATOR.$resource->getUrl();
+            $fileBag->add($resource->getUrl(), $pathName);
+        }
+
+        return true;
+    }
+
     public function supportsFile(File $file): int
     {
         if (str_starts_with($file->getMimeType(), 'video')) {