Merge pull request #68 from sherlockode/fix/remove_old_files

Fix remove old files CLI

Author: Vowow

Command/RemoveTemporaryFileCommand.php

@@ -2,8 +2,10 @@
 
 namespace Sherlockode\AdvancedFormBundle\Command;
 
+use Doctrine\ORM\EntityManagerInterface;
 use Sherlockode\AdvancedFormBundle\Storage\FilesystemStorage;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -13,23 +15,42 @@
  */
 class RemoveTemporaryFileCommand extends Command
 {
+    /**
+     * @var EntityManagerInterface
+     */
+    private $em;
+
+    /**
+     * @var FilesystemStorage
+     */
+    private $storage;
+
+    /**
+     * @var string
+     */
+    private $tmpUploadFileClass;
+
     /**
      * RemoveTemporaryFileCommand constructor.
      *
-     * @param FilesystemStorage $storage
+     * @param EntityManagerInterface $em
+     * @param FilesystemStorage      $storage
+     * @param string                 $tmpUploadFileClass
      */
-    public function __construct(FilesystemStorage $storage)
+    public function __construct(EntityManagerInterface $em, FilesystemStorage $storage, $tmpUploadFileClass = null)
     {
         parent::__construct();
+        $this->em = $em;
         $this->storage = $storage;
+        $this->tmpUploadFileClass = $tmpUploadFileClass;
     }
 
     protected function configure()
     {
         $this
             ->setName('sherlockode:afb:cleanup-tmp')
             ->setDescription('Remove all temporary files.')
-            ->addOption('older-than', null, InputOption::VALUE_REQUIRED)
+            ->addOption('older-than', null, InputOption::VALUE_OPTIONAL)
         ;
     }
 
@@ -48,23 +69,29 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $limit->sub(new \DateInterval(sprintf('P%s', strtoupper($olderThan))));
         }
 
-        $files = $this->storage->all();
-        $count = 0;
+        if (!$this->tmpUploadFileClass) {
+            throw new RuntimeException(sprintf('The "tmp_uploaded_file_class" has to be configured for this action.'));
+        }
+
+        $qb = $this->em->createQueryBuilder()
+            ->select('f')
+            ->from($this->tmpUploadFileClass, 'f');
+
+        if ($limit) {
+            $qb
+                ->andWhere('f.createdAt < :createdAt')
+                ->setParameter('createdAt', $limit);
+        }
+
+        $files = $qb->getQuery()->getResult();
 
-        foreach ($this->storage->all() as $filePath) {
-            if ($limit) {
-                $file = $this->storage->getFileObject($filePath);
-                if ($file->getCTime() < $limit->getTimestamp()) {
-                    $this->storage->remove($filePath);
-                    $count++;
-                }
-            } else {
-                $this->storage->remove($filePath);
-                $count++;
-            }
+        foreach ($files as $file) {
+            $this->storage->remove($file->getKey());
+            $this->em->remove($file);
         }
 
-        $output->writeln(sprintf('<info>%s files has been removed</info>', $count));
+        $this->em->flush();
+        $output->writeln(sprintf('<info>%s files has been removed</info>', count($files)));
 
         return 0;
     }

Manager/UploadManager.php

@@ -134,6 +134,7 @@ public function uploadTemporary(UploadedFile $uploadedFile)
         $obj->setKey($key);
         $obj->setToken(rand());
         $obj->setFilename($uploadedFile->getClientOriginalName());
+        $obj->setCreatedAt(new \DateTime());
 
         $this->em->persist($obj);
         $this->em->flush($obj);

Model/TemporaryUploadedFile.php

@@ -3,7 +3,7 @@
 namespace Sherlockode\AdvancedFormBundle\Model;
 
 /**
- * Class UploadedFile
+ * Class TemporaryUploadedFile
  */
 class TemporaryUploadedFile implements TemporaryUploadedFileInterface
 {
@@ -22,6 +22,11 @@ class TemporaryUploadedFile implements TemporaryUploadedFileInterface
      */
     protected $filename;
 
+    /**
+     * @var \DateTime
+     */
+    protected $createdAt;
+
     /**
      * @return string
      */
@@ -79,4 +84,24 @@ public function setFilename($filename)
 
         return $this;
     }
+
+    /**
+     * @return \DateTime
+     */
+    public function getCreatedAt()
+    {
+        return $this->createdAt;
+    }
+
+    /**
+     * @param \DateTime $createdAt
+     *
+     * @return $this
+     */
+    public function setCreatedAt(\DateTime $createdAt)
+    {
+        $this->createdAt = $createdAt;
+
+        return $this;
+    }
 }

Model/TemporaryUploadedFileInterface.php

@@ -33,4 +33,16 @@ public function getFilename();
      * @param string $filename
      */
     public function setFilename($filename);
+
+    /**
+     * @return \DateTime
+     */
+    public function getCreatedAt();
+
+    /**
+     * @param \DateTime $createdAt
+     *
+     * @return $this
+     */
+    public function setCreatedAt(\DateTime $createdAt);
 }

Resources/config/command.yml

@@ -2,5 +2,7 @@ services:
     sherlockode_afb.command.remove_tmp_files:
         class: Sherlockode\AdvancedFormBundle\Command\RemoveTemporaryFileCommand
         arguments:
+            - '@doctrine.orm.entity_manager'
             - '@sherlockode_afb.storage.tmp_storage'
+            - '%sherlockode_afb.tmp_uploaded_file_class%'
         tags: ['console.command']

Storage/FilesystemStorage.php

@@ -2,8 +2,6 @@
 
 namespace Sherlockode\AdvancedFormBundle\Storage;
 
-use Symfony\Component\HttpFoundation\File\File;
-
 class FilesystemStorage implements StorageInterface
 {
     private $dir;
@@ -13,21 +11,6 @@ public function __construct($dir)
         $this->dir = $dir;
     }
 
-    public function all()
-    {
-        $files = [];
-
-        if ($this->dir) {
-            foreach (new \DirectoryIterator($this->dir) as $fileInfo) {
-                if (!$fileInfo->isDot()) {
-                    $files[] = $fileInfo->getFilename();
-                }
-            }
-        }
-
-        return $files;
-    }
-
     public function write($key, $data)
     {
         return file_put_contents($this->dir . '/' . $key, $data);
@@ -40,17 +23,20 @@ public function read($key)
 
     public function remove($key)
     {
-        return unlink($this->dir  .'/' . $key);
+        if ($this->exists($key)) {
+            return unlink($this->getPath($key));
+        }
+
+        return false;
     }
 
-    public function getFileObject($key)
+    private function exists($key)
     {
-        $path = sprintf('%s/%s', $this->dir, $key);
-
-        if (!file_exists($path)) {
-            return null;
-        }
+        return file_exists($this->getPath($key));
+    }
 
-        return new File($path);
+    private function getPath($key)
+    {
+        return $this->dir  .'/' . $key;
     }
 }

Storage/StorageInterface.php

@@ -2,15 +2,8 @@
 
 namespace Sherlockode\AdvancedFormBundle\Storage;
 
-use Symfony\Component\HttpFoundation\File\File;
-
 interface StorageInterface
 {
-    /**
-     * @return array
-     */
-    public function all();
-
     /**
      * @param string $key
      *
@@ -32,11 +25,4 @@ public function write($key, $data);
      * @return bool
      */
     public function remove($key);
-
-    /**
-     * @param string $key
-     *
-     * @return File
-     */
-    public function getFileObject($key);
 }