v/PrintABrick
1
0
Fork 0
mirror of https://github.com/ToxicCrack/PrintABrick.git synced 2025-05-16 04:10:09 -07:00
Code Issues Projects Releases Wiki Activity

Revert Image loader changes

Browse Source
This commit is contained in:
David Hübner 2017-06-27 18:08:25 +02:00
parent 1c12e34bb2
commit 8f4c7f09da
6 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Resources/views/macros/blocks.html.twig
View File

@ -7,7 +7,7 @@
{% endif %}
<img src="{{ placeholder }}"
data-src="{{ asset(color~'/'~number) | imagine_filter(filter) }}"
data-src="{{ asset(color~'/'~number~'.png') | imagine_filter(filter) }}"
alt="{{ 'part.image.alt'|trans({'%number%':number}) }}">
</div>
{% endmacro %}
@ -21,7 +21,7 @@
{% endif %}
<img src="{{ placeholder }}"
data-src="{{ number|imagine_filter(filter) }}"
data-src="{{ asset(number~'.jpg')|imagine_filter(filter) }}"
alt="{{ 'set.image.alt'|trans({'%number%':number}) }}">
</div>
{% endmacro %}

2
app/Resources/views/model/detail.html.twig
View File

@ -11,7 +11,7 @@
model.id~' '~model.name,
app.request.uri,
'meta.description' | trans | striptags('sup'),
asset('-1/'~model.id) | imagine_filter('part_large')
asset('-1/'~model.id~'.png') | imagine_filter('part_large')
)}}
{% endblock %}

2
app/Resources/views/set/detail.html.twig
View File

@ -11,7 +11,7 @@
set.id~' '~set.name ,
app.request.uri,
'meta.description' | trans | striptags('sup'),
asset(set.id)|imagine_filter('set_large')
asset(set.id~'.jpg')|imagine_filter('set_large')
)}}
{% endblock %}

4
src/FrontBundle/Controller/SearchController.php
View File

@ -54,7 +54,7 @@ class SearchController extends Controller
'id' => $id,
'name' => $name,
'url' => $this->generateUrl('model_detail', ['id' => $model->getTransformed()->getId()]),
'img' => $liip->getBrowserPath('-1/'.$model->getTransformed()->getId(), 'part_min'),
'img' => $liip->getBrowserPath('-1/'.$model->getTransformed()->getId().'.png', 'part_min'),
];
}
@ -68,7 +68,7 @@ class SearchController extends Controller
'id' => $id,
'name' => $name,
'url' => $this->generateUrl('set_detail', ['id' => $set->getTransformed()->getId()]),
'img' => $liip->getBrowserPath($set->getTransformed()->getId(), 'set_min'),
'img' => $liip->getBrowserPath($set->getTransformed()->getId().'.jpg', 'set_min'),
];
}

14
src/FrontBundle/Imagine/PartImageLoader.php
View File

@ -31,25 +31,21 @@ class PartImageLoader extends BaseImageLoader
public function find($path)
{
$localPath = '/images/'.$path.'.png';
// try to load image from local mediaFilesystem
if ($this->mediaFilesystem->has($localPath)) {
return $this->mediaFilesystem->read($localPath);
if ($this->mediaFilesystem->has('/images/'.$path)) {
return $this->mediaFilesystem->read('/images/'.$path);
}
$rebrickablePath = $this->rebrickableContext.strtolower($path).'.png';
// try to load image from rebrickable website
if ($this->remoteFileExists($rebrickablePath)) {
if ($this->remoteFileExists($this->rebrickableContext.$path)) {
$context = stream_context_create(['http' => ['header' => 'Connection: close\r\n']]);
return file_get_contents($rebrickablePath, false, $context);
return file_get_contents($this->rebrickableContext.strtolower($path), false, $context);
}
// Load part entity form rebrickable api and get image path from response
try {
if (preg_match('/^(.*)\/(.*)$/', $path, $match)) {
if (preg_match('/^(.*)\/(.*).png$/', $path, $match)) {
$part = $this->rebrickableManager->getPart($match[2]);
if ($part && $part->getImgUrl()) {

20
src/FrontBundle/Imagine/SetImageLoader.php
View File

@ -29,28 +29,28 @@ class SetImageLoader extends BaseImageLoader
$this->mediaFilesystem = $mediaFilesystem;
}
public function find($setNumber)
public function find($path)
{
$rebrickablePath = $this->rebrickableContext.strtolower($setNumber).'.jpg';
// try to load image from rebrickable website
if ($this->remoteFileExists($rebrickablePath)) {
if ($this->remoteFileExists($this->rebrickableContext.strtolower($path))) {
$context = stream_context_create(['http' => ['header' => 'Connection: close\r\n']]);
return file_get_contents($rebrickablePath, false, $context);
return file_get_contents($this->rebrickableContext.strtolower($path), false, $context);
}
// Load part entity form brickset api and get image path from response
try {
$set = $this->bricksetManager->getSetByNumber($setNumber);
if (preg_match('/^(.*)(.png|.jpg)$/', $path, $match)) {
$set = $this->bricksetManager->getSetByNumber($match[1]);
if ($set && $set->getImage()) {
return file_get_contents($set->getImageURL());
if ($set && $set->getImage()) {
return file_get_contents($set->getImageURL());
}
}
} catch (\Exception $e) {
throw new NotLoadableException(sprintf('Image %s could not be loaded.', $setNumber), $e->getCode(), $e);
throw new NotLoadableException(sprintf('Source image %s could not be loaded.', $path), $e->getCode(), $e);
}
throw new NotLoadableException(sprintf('Image %s not found.', $setNumber));
throw new NotLoadableException(sprintf('Source image %s not found.', $path));
}
}