@@ -38,10 +38,10 @@ discard block |
||
38 | 38 | $media = $this->get('alpixel_media.manager')->upload($file, $this->get('request')->get('folder'), $lifetime); |
39 | 39 | $path = $mediaPreview->generatePathFromSecretKey($media->getSecretKey()); |
40 | 40 | $returnData[] = [ |
41 | - 'id' => $media->getSecretKey(), |
|
42 | - 'path' => $path, |
|
43 | - 'name' => $media->getName(), |
|
44 | - ]; |
|
41 | + 'id' => $media->getSecretKey(), |
|
42 | + 'path' => $path, |
|
43 | + 'name' => $media->getName(), |
|
44 | + ]; |
|
45 | 45 | } |
46 | 46 | } |
47 | 47 | |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | |
98 | 98 | $path = 'upload/'.$media->getUri(); |
99 | 99 | |
100 | - // find the image and determine its type |
|
100 | + // find the image and determine its type |
|
101 | 101 | $image = $dataManager->find($filter, $path); |
102 | 102 | |
103 | 103 | // run the filter |
@@ -15,7 +15,7 @@ |
||
15 | 15 | public function configure() |
16 | 16 | { |
17 | 17 | $this->setName('alpixel:media:cleanup') |
18 | - ->setDescription('Cleaning unused media'); |
|
18 | + ->setDescription('Cleaning unused media'); |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | public function execute(InputInterface $input, OutputInterface $output) |
@@ -16,7 +16,7 @@ |
||
16 | 16 | { |
17 | 17 | parent::configure(); |
18 | 18 | $this->setName('alpixel:media:liip_cleanup') |
19 | - ->setDescription('Cleaning liip cache folders'); |
|
19 | + ->setDescription('Cleaning liip cache folders'); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | public function execute(InputInterface $input, OutputInterface $output) |
@@ -38,31 +38,31 @@ discard block |
||
38 | 38 | $this->allowedMimetypes = $allowedMimetypes; |
39 | 39 | } |
40 | 40 | |
41 | - /** |
|
42 | - * $current_uri String actual uri of the file |
|
43 | - * $dest_folder String future uri of the file starting from web/upload folder |
|
44 | - * $lifetime DateTime lifetime of the file. If time goes over this limit, the file will be deleted. |
|
45 | - **/ |
|
46 | - public function upload(File $file, $dest_folder = '', \DateTime $lifetime = null) |
|
47 | - { |
|
41 | + /** |
|
42 | + * $current_uri String actual uri of the file |
|
43 | + * $dest_folder String future uri of the file starting from web/upload folder |
|
44 | + * $lifetime DateTime lifetime of the file. If time goes over this limit, the file will be deleted. |
|
45 | + **/ |
|
46 | + public function upload(File $file, $dest_folder = '', \DateTime $lifetime = null) |
|
47 | + { |
|
48 | 48 | //preparing dir name |
49 | 49 | $dest_folder = date('Ymd').'/'.date('G').'/'.$dest_folder; |
50 | 50 | |
51 | 51 | //checking mimetypes |
52 | 52 | $mimeTypePassed = false; |
53 | 53 | foreach ($this->allowedMimetypes as $mimeType) { |
54 | - if (preg_match('@'.$mimeType.'@', $file->getMimeType())) { |
|
55 | - $mimeTypePassed = true; |
|
56 | - } |
|
54 | + if (preg_match('@'.$mimeType.'@', $file->getMimeType())) { |
|
55 | + $mimeTypePassed = true; |
|
56 | + } |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | if (!$mimeTypePassed) { |
60 | - throw new InvalidMimeTypeException('Only following filetypes are allowed : '.implode(', ', $this->allowedMimetypes)); |
|
60 | + throw new InvalidMimeTypeException('Only following filetypes are allowed : '.implode(', ', $this->allowedMimetypes)); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | $fs = new Filesystem(); |
64 | 64 | if (!$fs->exists($this->uploadDir.$dest_folder)) { |
65 | - $fs->mkdir($this->uploadDir.$dest_folder); |
|
65 | + $fs->mkdir($this->uploadDir.$dest_folder); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | $em = $this->entityManager; |
@@ -85,27 +85,27 @@ discard block |
||
85 | 85 | // Checking for a media with the same name |
86 | 86 | $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($dest_folder.$filename); |
87 | 87 | if (count($mediaExists) === 0) { |
88 | - $mediaExists = $fs->exists($this->uploadDir.$dest_folder.$filename); |
|
88 | + $mediaExists = $fs->exists($this->uploadDir.$dest_folder.$filename); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | // If there's one, we try to generate a new name |
92 | 92 | $extension = $file->getExtension(); |
93 | 93 | if (empty($extension)) { |
94 | - $extension = $file->guessExtension(); |
|
94 | + $extension = $file->guessExtension(); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | if (count($mediaExists) > 0) { |
98 | - $filename = basename($filename, '.'.$extension); |
|
99 | - |
|
100 | - $i = 1; |
|
101 | - do { |
|
102 | - $media->setName($filename.'-'.$i++.'.'.$extension); |
|
103 | - $media->setUri($dest_folder.$media->getName()); |
|
104 | - $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($media->getUri()); |
|
105 | - } while (count($mediaExists) > 0); |
|
98 | + $filename = basename($filename, '.'.$extension); |
|
99 | + |
|
100 | + $i = 1; |
|
101 | + do { |
|
102 | + $media->setName($filename.'-'.$i++.'.'.$extension); |
|
103 | + $media->setUri($dest_folder.$media->getName()); |
|
104 | + $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($media->getUri()); |
|
105 | + } while (count($mediaExists) > 0); |
|
106 | 106 | } else { |
107 | - $media->setName($filename.'.'.$extension); |
|
108 | - $media->setUri($dest_folder.$media->getName()); |
|
107 | + $media->setName($filename.'.'.$extension); |
|
108 | + $media->setUri($dest_folder.$media->getName()); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | $file->move($this->uploadDir.$dest_folder, $media->getName()); |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | $em->flush(); |
120 | 120 | |
121 | 121 | return $media; |
122 | - } |
|
122 | + } |
|
123 | 123 | |
124 | 124 | public function cleanup() |
125 | 125 | { |
@@ -8,54 +8,54 @@ |
||
8 | 8 | |
9 | 9 | class MediaProvider extends BaseProvider |
10 | 10 | { |
11 | - protected $mediaManager; |
|
12 | - |
|
13 | - public function __construct(MediaManager $mediaManager) |
|
14 | - { |
|
15 | - $this->mediaManager = $mediaManager; |
|
16 | - } |
|
17 | - |
|
18 | - public function randomMedia ($width = null, $height = null, $type = "color") |
|
19 | - { |
|
20 | - $file = $this->downloadMedia($this->generateUrl($width, $height, $type)); |
|
21 | - $media = $this->mediaManager->upload($file); |
|
22 | - return $media; |
|
23 | - } |
|
24 | - |
|
25 | - protected function generateUrl ($width = null, $height = null, $type = "color") |
|
26 | - { |
|
27 | - $url = "http://loremflickr.com/"; |
|
28 | - |
|
29 | - if ($type !== 'color') { |
|
30 | - $url .= 'g/'; |
|
31 | - } |
|
32 | - |
|
33 | - if($width === null && $height !== null) { |
|
34 | - $width = round($height * 4 / 3); |
|
35 | - } elseif ($width !== null && $height === null) { |
|
36 | - $height = round($width * 3 / 4); |
|
37 | - } else { |
|
38 | - $width = rand(800, 1600); |
|
39 | - $height = round($width * 3 / 4); |
|
40 | - } |
|
41 | - |
|
42 | - $url .= $width.'/'.$height; |
|
43 | - |
|
44 | - $category = ['abstract', 'city', 'nature', 'moutains']; |
|
45 | - $url .= '/'.$category[array_rand($category, 1)].'/'; |
|
46 | - return $url; |
|
47 | - } |
|
48 | - |
|
49 | - protected function downloadMedia($url) |
|
50 | - { |
|
51 | - $filepath = sys_get_temp_dir().'/tmp.jpg'; |
|
52 | - $ch = curl_init($url); |
|
53 | - $fp = fopen($filepath,'wb'); |
|
54 | - curl_setopt($ch, CURLOPT_FILE, $fp); |
|
55 | - curl_setopt($ch, CURLOPT_HEADER, 0); |
|
56 | - curl_exec($ch); |
|
57 | - curl_close($ch); |
|
58 | - fclose($fp); |
|
59 | - return new File($filepath, 'random'); |
|
60 | - } |
|
11 | + protected $mediaManager; |
|
12 | + |
|
13 | + public function __construct(MediaManager $mediaManager) |
|
14 | + { |
|
15 | + $this->mediaManager = $mediaManager; |
|
16 | + } |
|
17 | + |
|
18 | + public function randomMedia ($width = null, $height = null, $type = "color") |
|
19 | + { |
|
20 | + $file = $this->downloadMedia($this->generateUrl($width, $height, $type)); |
|
21 | + $media = $this->mediaManager->upload($file); |
|
22 | + return $media; |
|
23 | + } |
|
24 | + |
|
25 | + protected function generateUrl ($width = null, $height = null, $type = "color") |
|
26 | + { |
|
27 | + $url = "http://loremflickr.com/"; |
|
28 | + |
|
29 | + if ($type !== 'color') { |
|
30 | + $url .= 'g/'; |
|
31 | + } |
|
32 | + |
|
33 | + if($width === null && $height !== null) { |
|
34 | + $width = round($height * 4 / 3); |
|
35 | + } elseif ($width !== null && $height === null) { |
|
36 | + $height = round($width * 3 / 4); |
|
37 | + } else { |
|
38 | + $width = rand(800, 1600); |
|
39 | + $height = round($width * 3 / 4); |
|
40 | + } |
|
41 | + |
|
42 | + $url .= $width.'/'.$height; |
|
43 | + |
|
44 | + $category = ['abstract', 'city', 'nature', 'moutains']; |
|
45 | + $url .= '/'.$category[array_rand($category, 1)].'/'; |
|
46 | + return $url; |
|
47 | + } |
|
48 | + |
|
49 | + protected function downloadMedia($url) |
|
50 | + { |
|
51 | + $filepath = sys_get_temp_dir().'/tmp.jpg'; |
|
52 | + $ch = curl_init($url); |
|
53 | + $fp = fopen($filepath,'wb'); |
|
54 | + curl_setopt($ch, CURLOPT_FILE, $fp); |
|
55 | + curl_setopt($ch, CURLOPT_HEADER, 0); |
|
56 | + curl_exec($ch); |
|
57 | + curl_close($ch); |
|
58 | + fclose($fp); |
|
59 | + return new File($filepath, 'random'); |
|
60 | + } |
|
61 | 61 | } |