From 0c97796703f327a178159341d49a206e6993755d Mon Sep 17 00:00:00 2001 From: Freek Date: Sun, 26 Apr 2015 22:24:23 +0200 Subject: [PATCH 01/11] Update CHANGELOG.md --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8af29aa7a..cae3bd7e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ # Changelog -All Notable changes to `laravel-medialibrary` will be documented in this file \ No newline at end of file +All Notable changes to `laravel-medialibrary` will be documented in this file + +##1.0.0 +- initial release From 6c5bc7d18248cff4c213b8744b0209fb76e623c4 Mon Sep 17 00:00:00 2001 From: Freek Date: Sun, 26 Apr 2015 23:52:09 +0200 Subject: [PATCH 02/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2fbe37ef7..df22bb1c6 100644 --- a/README.md +++ b/README.md @@ -208,7 +208,7 @@ You can also generate a derived image on the fly by passing an array with parame $mediaItem->getURL(['w' => 450, 'h' => 200, 'filt' => 'greyscale']); ``` -This call will generated an url that, when hit, will generate the derived image. +This call will generate an url that, when hit, will generate the derived image. ## Contributing From 44ff8ca65911a98d67d657160e0e7465bd299ed0 Mon Sep 17 00:00:00 2001 From: freek Date: Tue, 28 Apr 2015 17:13:38 +0200 Subject: [PATCH 03/11] add option to specify queue name --- CHANGELOG.md | 3 +++ README.md | 9 +++++++++ src/ImageManipulators/GlideImageManipulator.php | 15 ++++++++++++++- src/ToPublish/config/laravel-medialibrary.php | 7 +++++++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cae3bd7e8..9bfa37b4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,5 +2,8 @@ All Notable changes to `laravel-medialibrary` will be documented in this file +##1.0.1 +- Added option to specify the name of the queue that should be used to create image manipulations + ##1.0.0 - initial release diff --git a/README.md b/README.md index df22bb1c6..80a26f6d3 100644 --- a/README.md +++ b/README.md @@ -74,9 +74,18 @@ return [ * See the README of the package for an example. */ 'globalImageProfiles' => [], + + /* + * The medialibrary will used this queue to generate derived images. + * Leave empty to use the default queue. + */ + + 'queueName' => 'media_queue', ]; ``` +If you are planning on working with the image manipulations you should configure a queue on your service with the name specified in the config file. + ## Basic usage diff --git a/src/ImageManipulators/GlideImageManipulator.php b/src/ImageManipulators/GlideImageManipulator.php index 6ef402468..3d16d93b0 100644 --- a/src/ImageManipulators/GlideImageManipulator.php +++ b/src/ImageManipulators/GlideImageManipulator.php @@ -84,7 +84,7 @@ private function createProfileImages(Media $media, $originalFile, $originalPath) 'conversionParameters' => $imageConversionParameters, 'outputFile' => $outputFile, ], - 'media_queue' + $this->getQueueName() ); return; @@ -175,4 +175,17 @@ private function getModelImageProfiles($className) return $model->imageProfiles; } + + /** + * @return string + */ + private function getQueueName() + { + if (config('laravel-medialibrary.queueName') == '') + { + return null; + } + + return config('laravel-medialibrary.queueName'); + } } diff --git a/src/ToPublish/config/laravel-medialibrary.php b/src/ToPublish/config/laravel-medialibrary.php index b473ced91..332ee2fea 100644 --- a/src/ToPublish/config/laravel-medialibrary.php +++ b/src/ToPublish/config/laravel-medialibrary.php @@ -25,4 +25,11 @@ * See the README of the package for an example. */ 'globalImageProfiles' => [], + + /* + * The medialibrary will used this queue to generate derived images. + * Leave empty to use the default queue. + */ + + 'queueName' => 'media_queue', ]; From f32a71ad4bc1cbd32003bcf237cf021ec0a77ebe Mon Sep 17 00:00:00 2001 From: freek Date: Tue, 28 Apr 2015 17:15:22 +0200 Subject: [PATCH 04/11] edit changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bfa37b4b..e8189298f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All Notable changes to `laravel-medialibrary` will be documented in this file -##1.0.1 +##1.1.0 - Added option to specify the name of the queue that should be used to create image manipulations ##1.0.0 From ebb34aa222f6fabab035cc2ff2771700371f011f Mon Sep 17 00:00:00 2001 From: Freek Date: Tue, 28 Apr 2015 17:16:20 +0200 Subject: [PATCH 05/11] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 80a26f6d3..3a880457a 100644 --- a/README.md +++ b/README.md @@ -76,9 +76,9 @@ return [ 'globalImageProfiles' => [], /* - * The medialibrary will used this queue to generate derived images. - * Leave empty to use the default queue. - */ + * The medialibrary will used this queue to generate derived images. + * Leave empty to use the default queue. + */ 'queueName' => 'media_queue', ]; From 0282afcc498ed350af8a7c20501215334362c5c8 Mon Sep 17 00:00:00 2001 From: Freek Date: Tue, 28 Apr 2015 17:17:49 +0200 Subject: [PATCH 06/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3a880457a..94b8438d7 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Latest Version](https://img.shields.io/github/release/freekmurze/laravel-medialibrary.svg?style=flat-square)](https://github.com/freekmurze/laravel-medialibrary/releases) [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md) -[![SensioLabsInsight](https://img.shields.io/sensiolabs/i/27cf455a-0555-4bcf-abae-16b5f7860d09.svg)](https://insight.sensiolabs.com/projects/27cf455a-0555-4bcf-abae-16b5f7860d09) +[![SensioLabsInsight](https://insight.sensiolabs.com/projects/27cf455a-0555-4bcf-abae-16b5f7860d09.svg)](https://insight.sensiolabs.com/projects/27cf455a-0555-4bcf-abae-16b5f7860d09) [![Quality Score](https://img.shields.io/scrutinizer/g/freekmurze/laravel-medialibrary.svg?style=flat-square)](https://scrutinizer-ci.com/g/freekmurze/laravel-medialibrary) [![Total Downloads](https://img.shields.io/packagist/dt/spatie/laravel-medialibrary.svg?style=flat-square)](https://packagist.org/packages/spatie/:laravel-medialibrary) From f834a9cc67d3bd10a2f33072b84daf4dfa8780e3 Mon Sep 17 00:00:00 2001 From: Freek Date: Tue, 28 Apr 2015 17:18:17 +0200 Subject: [PATCH 07/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 94b8438d7..c26afaa99 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Latest Version](https://img.shields.io/github/release/freekmurze/laravel-medialibrary.svg?style=flat-square)](https://github.com/freekmurze/laravel-medialibrary/releases) [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md) -[![SensioLabsInsight](https://insight.sensiolabs.com/projects/27cf455a-0555-4bcf-abae-16b5f7860d09.svg)](https://insight.sensiolabs.com/projects/27cf455a-0555-4bcf-abae-16b5f7860d09) +[![SensioLabsInsight](https://insight.sensiolabs.com/projects/27cf455a-0555-4bcf-abae-16b5f7860d09/small.png)](https://insight.sensiolabs.com/projects/27cf455a-0555-4bcf-abae-16b5f7860d09) [![Quality Score](https://img.shields.io/scrutinizer/g/freekmurze/laravel-medialibrary.svg?style=flat-square)](https://scrutinizer-ci.com/g/freekmurze/laravel-medialibrary) [![Total Downloads](https://img.shields.io/packagist/dt/spatie/laravel-medialibrary.svg?style=flat-square)](https://packagist.org/packages/spatie/:laravel-medialibrary) From eee3e303140884b19260201aaff8723e2a5781f7 Mon Sep 17 00:00:00 2001 From: Freek Date: Tue, 28 Apr 2015 17:18:34 +0200 Subject: [PATCH 08/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c26afaa99..fd0380a1b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Latest Version](https://img.shields.io/github/release/freekmurze/laravel-medialibrary.svg?style=flat-square)](https://github.com/freekmurze/laravel-medialibrary/releases) [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md) -[![SensioLabsInsight](https://insight.sensiolabs.com/projects/27cf455a-0555-4bcf-abae-16b5f7860d09/small.png)](https://insight.sensiolabs.com/projects/27cf455a-0555-4bcf-abae-16b5f7860d09) +[![SensioLabsInsight](https://insight.sensiolabs.com/projects/27cf455a-0555-4bcf-abae-16b5f7860d09/mini.png)](https://insight.sensiolabs.com/projects/27cf455a-0555-4bcf-abae-16b5f7860d09) [![Quality Score](https://img.shields.io/scrutinizer/g/freekmurze/laravel-medialibrary.svg?style=flat-square)](https://scrutinizer-ci.com/g/freekmurze/laravel-medialibrary) [![Total Downloads](https://img.shields.io/packagist/dt/spatie/laravel-medialibrary.svg?style=flat-square)](https://packagist.org/packages/spatie/:laravel-medialibrary) From 1f1d3b38be540fe792f166775b0f8d806b482e89 Mon Sep 17 00:00:00 2001 From: freek Date: Tue, 28 Apr 2015 17:24:07 +0200 Subject: [PATCH 09/11] remove newline --- src/ToPublish/config/laravel-medialibrary.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ToPublish/config/laravel-medialibrary.php b/src/ToPublish/config/laravel-medialibrary.php index 332ee2fea..8c846e350 100644 --- a/src/ToPublish/config/laravel-medialibrary.php +++ b/src/ToPublish/config/laravel-medialibrary.php @@ -30,6 +30,5 @@ * The medialibrary will used this queue to generate derived images. * Leave empty to use the default queue. */ - 'queueName' => 'media_queue', ]; From c9133b9d28e49c9f0ff36482f7212e7ecbb8db9d Mon Sep 17 00:00:00 2001 From: Freek Date: Tue, 28 Apr 2015 17:47:07 +0200 Subject: [PATCH 10/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fd0380a1b..48a1db206 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ Using the facade you can add items to the library like this: ```php $collectionName = 'myFirstCollection' $newsItem = News::find(1); -Medialibrary::add($pathToAFile, $newsItem, $collectionName); +MediaLibrary::add($pathToAFile, $newsItem, $collectionName); ``` Adding a file will move your file to a directory managed by the medialibrary. From 86b762ac3ae7ff7460c3e190469941bb723cfd41 Mon Sep 17 00:00:00 2001 From: Freek Date: Tue, 28 Apr 2015 17:57:03 +0200 Subject: [PATCH 11/11] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 48a1db206..12ece9ffc 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,6 @@ return [ * The medialibrary will used this queue to generate derived images. * Leave empty to use the default queue. */ - 'queueName' => 'media_queue', ]; ```