alpixel / AlpixelMediaBundle

Services/MediaManager.php

Indentation +49 added lines, -49 removed lines

@@ -35,40 +35,40 @@ 
         $this->allowedMimetypes = $allowedMimetypes;
     }
 
-  /**
-   * $current_uri String actual uri of the file
-   * $dest_folder String future uri of the file starting from web/upload folder
-   * $lifetime DateTime lifetime of the file. If time goes over this limit, the file will be deleted.
-   **/
-  public function upload(UploadedFile $file, $dest_folder = '', \DateTime $lifetime = null)
-  {
-      //preparing dir name
+    /**
+     * $current_uri String actual uri of the file
+     * $dest_folder String future uri of the file starting from web/upload folder
+     * $lifetime DateTime lifetime of the file. If time goes over this limit, the file will be deleted.
+     **/
+    public function upload(UploadedFile $file, $dest_folder = '', \DateTime $lifetime = null)
+    {
+        //preparing dir name
     $dest_folder = date('Ymd').'/'.date('G').'/'.$dest_folder;
 
     //checking mimetypes
     $mimeTypePassed = false;
-      foreach ($this->allowedMimetypes as $mimeType) {
-          if (preg_match('@'.$mimeType.'@', $file->getMimeType())) {
-              $mimeTypePassed = true;
-          }
-      }
+        foreach ($this->allowedMimetypes as $mimeType) {
+            if (preg_match('@'.$mimeType.'@', $file->getMimeType())) {
+                $mimeTypePassed = true;
+            }
+        }
 
-      if (!$mimeTypePassed) {
-          throw new InvalidMimeTypeException('Only following filetypes are allowed : '.implode(', ', $this->allowedMimetypes));
-      }
+        if (!$mimeTypePassed) {
+            throw new InvalidMimeTypeException('Only following filetypes are allowed : '.implode(', ', $this->allowedMimetypes));
+        }
 
-      $fs = new Filesystem();
-      if (!$fs->exists($this->uploadDir.$dest_folder)) {
-          $fs->mkdir($this->uploadDir.$dest_folder);
-      }
+        $fs = new Filesystem();
+        if (!$fs->exists($this->uploadDir.$dest_folder)) {
+            $fs->mkdir($this->uploadDir.$dest_folder);
+        }
 
-      $em = $this->entityManager;
-      $media = new Media();
-      $media->setMime($file->getMimeType());
+        $em = $this->entityManager;
+        $media = new Media();
+        $media->setMime($file->getMimeType());
 
     // Sanitizing the filename
     $slugify = new Slugify();
-      $filename = $slugify->slugify($file->getClientOriginalName());
+        $filename = $slugify->slugify($file->getClientOriginalName());
 
     // A media can have a lifetime and will be deleted with the cleanup function
     if (!empty($lifetime)) {
@@ -77,43 +77,43 @@ 
 
     // Checking for a media with the same name
     $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($dest_folder.$filename);
-      if (count($mediaExists) === 0) {
-          $mediaExists = $fs->exists($this->uploadDir.$dest_folder.$filename);
-      }
+        if (count($mediaExists) === 0) {
+            $mediaExists = $fs->exists($this->uploadDir.$dest_folder.$filename);
+        }
 
     // If there's one, we try to generate a new name
     $extension = $file->getExtension();
-      if (empty($extension)) {
-          $extension = $file->guessExtension();
-      }
+        if (empty($extension)) {
+            $extension = $file->guessExtension();
+        }
 
-      if (count($mediaExists) > 0) {
-          $filename = basename($filename, '.'.$extension);
+        if (count($mediaExists) > 0) {
+            $filename = basename($filename, '.'.$extension);
 
-          $i = 1;
-          do {
-              $media->setName($filename.'-'.$i++.'.'.$extension);
-              $media->setUri($dest_folder.$media->getName());
-              $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($media->getUri());
-          } while (count($mediaExists) > 0);
-      } else {
-          $media->setName($filename.'.'.$extension);
-          $media->setUri($dest_folder.$media->getName());
-      }
+            $i = 1;
+            do {
+                $media->setName($filename.'-'.$i++.'.'.$extension);
+                $media->setUri($dest_folder.$media->getName());
+                $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($media->getUri());
+            } while (count($mediaExists) > 0);
+        } else {
+            $media->setName($filename.'.'.$extension);
+            $media->setUri($dest_folder.$media->getName());
+        }
 
-      $file->move($this->uploadDir.$dest_folder, $media->getName());
+        $file->move($this->uploadDir.$dest_folder, $media->getName());
 
-      chmod($this->uploadDir.$dest_folder.$media->getName(), 0664);
+        chmod($this->uploadDir.$dest_folder.$media->getName(), 0664);
 
     // Getting the salt defined in parameters.yml
     $secret = $this->container->getParameter('secret');
-      $media->setSecretKey(hash('sha256', $secret.$media->getName().$media->getUri()));
+        $media->setSecretKey(hash('sha256', $secret.$media->getName().$media->getUri()));
 
-      $em->persist($media);
-      $em->flush();
+        $em->persist($media);
+        $em->flush();
 
-      return $media;
-  }
+        return $media;
+    }
 
     public function cleanup()
     {

Controller/MediaController.php

Indentation +5 added lines, -5 removed lines

@@ -38,10 +38,10 @@ 
                 $media = $this->get('alpixel_media.manager')->upload($file, $this->get('request')->get('folder'), $lifetime);
                 $path = $mediaPreview->generatePathFromSecretKey($media->getSecretKey());
                 $returnData[] = [
-                  'id'   => $media->getSecretKey(),
-                  'path' => $path,
-                  'name' => $media->getName(),
-              ];
+                    'id'   => $media->getSecretKey(),
+                    'path' => $path,
+                    'name' => $media->getName(),
+                ];
             }
         }
 
@@ -97,7 +97,7 @@ 
 
                     $path = 'upload/'.$media->getUri();
 
-                     // find the image and determine its type
+                        // find the image and determine its type
                     $image = $dataManager->find($filter, $path);
 
                     // run the filter

Command/MediaCleanupCommand.php

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     public function configure()
     {
         $this->setName('alpixel:media:cleanup')
-             ->setDescription('Cleaning unused media');
+                ->setDescription('Cleaning unused media');
     }
 
     public function execute(InputInterface $input, OutputInterface $output)

Command/LiipImagineCleanupCommand.php

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     {
         parent::configure();
         $this->setName('alpixel:media:liip_cleanup')
-             ->setDescription('Cleaning liip cache folders');
+                ->setDescription('Cleaning liip cache folders');
     }
 
     public function execute(InputInterface $input, OutputInterface $output)