fix: logs, images with extensions (#192)

* fix: error logs * fix: images have an extension
sigwinhq · Dec 12, 2023 · e452343 · e452343
1 parent b74d447
commit e452343
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 5 deletions.
diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml
@@ -1,4 +1,6 @@
 framework:
+    php_errors:
+        log: true
     session:
         storage_factory_id: session.storage.factory.mock_file
     csrf_protection: ~
diff --git a/resources/init/basic/compose.yaml b/resources/init/basic/compose.yaml
@@ -3,6 +3,9 @@ services:
         image: darthsim/imgproxy:v3
         environment:
             - IMGPROXY_LOCAL_FILESYSTEM_ROOT=/app
+            - IMGPROXY_MAX_ANIMATION_FRAMES=60
+            - IMGPROXY_ENABLE_AVIF_DETECTION=1
+            - IMGPROXY_ENABLE_WEBP_DETECTION=1
         working_dir: /app
         ports:
             - 8090:8080

diff --git a/src/AssetQueue.php b/src/AssetQueue.php
@@ -47,7 +47,11 @@ public function flush(?callable $callable = null): array
 
             // TODO: ImgProxy
             if ($specification instanceof AssetFetch) {
-                $response = $this->httpClient->request('GET', $specification->url);
+                $response = $this->httpClient->request('GET', $specification->url, [
+                    'headers' => [
+                        'Accept' => 'image/webp,image/apng,image/*,*/*;q=0.8',
+                    ],
+                ]);
                 $this->filesystem->mkdir(\dirname($destination));
                 $handle = fopen($destination, 'w');
                 if ($handle === false) {

diff --git a/src/Bridge/Twig/Extension/ThumbnailExtension.php b/src/Bridge/Twig/Extension/ThumbnailExtension.php
@@ -83,7 +83,7 @@ public function getFunctions(): array
                     return $url;
                 }
 
-                $path = \dirname($relative).'/'.md5(md5_file($path).$filter);
+                $path = sprintf('%1$s/%2$s.%3$s.webp', \dirname($relative), pathinfo($relative, \PATHINFO_FILENAME), mb_substr(md5(md5_file($path).$filter), 0, 8));
                 $this->thumbnailQueue->add(new AssetFetch($url, $path));
 
                 return $this->packages->getUrl(ltrim($path, '/'));

diff --git a/tests/functional/site/compose.yaml b/tests/functional/site/compose.yaml
@@ -3,6 +3,9 @@ services:
         image: darthsim/imgproxy:v3
         environment:
             - IMGPROXY_LOCAL_FILESYSTEM_ROOT=/app
+            - IMGPROXY_MAX_ANIMATION_FRAMES=60
+            - IMGPROXY_ENABLE_AVIF_DETECTION=1
+            - IMGPROXY_ENABLE_WEBP_DETECTION=1
         working_dir: /app
         ports:
             - 8090:8080

diff --git a/tests/functional/site/fixtures/content/articles/images/200ad8764a311b8ca90c5271eaf73efb b/tests/functional/site/fixtures/content/articles/images/200ad8764a311b8ca90c5271eaf73efb
diff --git a/tests/functional/site/fixtures/content/articles/images/509b6b4c27eb27d81e17c4038e7ad88b b/tests/functional/site/fixtures/content/articles/images/509b6b4c27eb27d81e17c4038e7ad88b
diff --git a/tests/functional/site/fixtures/content/articles/images/8514a44ac6072de0665dcd273f694d28 b/tests/functional/site/fixtures/content/articles/images/8514a44ac6072de0665dcd273f694d28
diff --git a/tests/functional/site/fixtures/content/articles/images/image.200ad876.webp b/tests/functional/site/fixtures/content/articles/images/image.200ad876.webp
diff --git a/tests/functional/site/fixtures/content/articles/images/image.509b6b4c.webp b/tests/functional/site/fixtures/content/articles/images/image.509b6b4c.webp
diff --git a/tests/functional/site/fixtures/content/articles/images/image.8514a44a.webp b/tests/functional/site/fixtures/content/articles/images/image.8514a44a.webp
diff --git a/tests/functional/site/fixtures/en/article/images/index.html b/tests/functional/site/fixtures/en/article/images/index.html
@@ -43,8 +43,8 @@ <h1>Images!</h1>
 </tbody>
 </table>
 <p>This is a database lookup example: Hello World!</p>
-<p>This is an asset lookup: /sub/dir/another/content/articles/images/509b6b4c27eb27d81e17c4038e7ad88b</p>
-<p><img src="/sub/dir/another/content/articles/images/8514a44ac6072de0665dcd273f694d28" alt="Logo" /></p>
+<p>This is an asset lookup: /sub/dir/another/content/articles/images/image.509b6b4c.webp</p>
+<p><img src="/sub/dir/another/content/articles/images/image.8514a44a.webp" alt="Logo" /></p>
 
         </div>
     </div>

diff --git a/tests/functional/site/fixtures/en/articles/1/index.html b/tests/functional/site/fixtures/en/articles/1/index.html
@@ -16,7 +16,7 @@
             <div class="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10 prose">
                 <h1>Articles</h1>
                                     <h2><a href="https://example.com/sub/dir/another/en/article/images/">Images!</a></h2>
-                                        <p><img src="/sub/dir/another/content/articles/images/200ad8764a311b8ca90c5271eaf73efb"></p>
+                                        <p><img src="/sub/dir/another/content/articles/images/image.200ad876.webp"></p>
                                         <p>20.07.2022. 12:35</p>
                                     <h2><a href="https://example.com/sub/dir/another/en/article/lists/">Lists!</a></h2>
                                         <p>19.07.2022. 12:13</p>