From e13c6d43241fe457711d0aff20cd97d69915ec47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20H=C3=BCbner?= Date: Wed, 17 May 2017 20:22:44 +0200 Subject: [PATCH] Fix Image loaders --- src/AppBundle/Imagine/BaseImageLoader.php | 3 +-- src/AppBundle/Imagine/PartImageLoader.php | 3 ++- src/AppBundle/Imagine/SetImageLoader.php | 11 ++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/AppBundle/Imagine/BaseImageLoader.php b/src/AppBundle/Imagine/BaseImageLoader.php index ffa9cf3..0383698 100644 --- a/src/AppBundle/Imagine/BaseImageLoader.php +++ b/src/AppBundle/Imagine/BaseImageLoader.php @@ -2,7 +2,6 @@ namespace AppBundle\Imagine; - use Liip\ImagineBundle\Binary\Loader\LoaderInterface; abstract class BaseImageLoader implements LoaderInterface @@ -24,4 +23,4 @@ abstract class BaseImageLoader implements LoaderInterface return $status === 200 ? true : false; } -} \ No newline at end of file +} diff --git a/src/AppBundle/Imagine/PartImageLoader.php b/src/AppBundle/Imagine/PartImageLoader.php index 4a1dc96..dab1553 100644 --- a/src/AppBundle/Imagine/PartImageLoader.php +++ b/src/AppBundle/Imagine/PartImageLoader.php @@ -57,6 +57,7 @@ class PartImageLoader extends BaseImageLoader throw new NotLoadableException(sprintf('Source image %s could not be loaded.', $path), $e->getCode(), $e); } - return $this->mediaFilesystem->read('noimage.png'); + throw new NotLoadableException(sprintf('Source image %s not found.', $path)); +// return $this->mediaFilesystem->read('noimage.png'); } } diff --git a/src/AppBundle/Imagine/SetImageLoader.php b/src/AppBundle/Imagine/SetImageLoader.php index 11bd681..b99e3a0 100644 --- a/src/AppBundle/Imagine/SetImageLoader.php +++ b/src/AppBundle/Imagine/SetImageLoader.php @@ -31,16 +31,16 @@ class SetImageLoader extends BaseImageLoader { // try to load image from rebrickable website try { - if ($this->remoteFileExists($this->rebrickableContext.$path)) { - return file_get_contents($this->rebrickableContext.$path); + if ($this->remoteFileExists($this->rebrickableContext.strtolower($path))) { + return file_get_contents($this->rebrickableContext.strtolower($path)); } } catch (\Exception $e) { throw new NotLoadableException(sprintf('Source image %s could not be loaded.', $path), $e->getCode(), $e); } - // Load part entity form rebrickable api and get image path from response + // Load part entity form brickset api and get image path from response try { - if (preg_match('/^(.*)[.png|.jpg]$/', $path, $match)) { + if (preg_match('/^(.*)(.png|.jpg)$/', $path, $match)) { $set = $this->bricksetManager->getSetByNumber($match[1]); if ($set && $set->getImage()) { @@ -51,6 +51,7 @@ class SetImageLoader extends BaseImageLoader throw new NotLoadableException(sprintf('Source image %s could not be loaded.', $path), $e->getCode(), $e); } - return $this->mediaFilesystem->read('noimage.png'); + throw new NotLoadableException(sprintf('Source image %s not found.', $path)); +// return $this->mediaFilesystem->read('noimage.png'); } }