Implement keycdn

Author: dvlpp

config/ozu-client.php

@@ -17,5 +17,9 @@
     // The following values should not be modified unless you know what you are doing
     'api_host' => env('OZU_API_HOST', 'https://ozu.code16.fr/'),
     'api_version' => env('OZU_API_VERSION', 'v1'),
-    'cdn_url' => env('OZU_CDN_URL'),
+
+    'cdn' => [
+        'provider' => env('OZU_CDN_PROVIDER'),
+        'url' => env('OZU_CDN_URL'),
+    ],
 ];

src/OzuServiceProvider.php

@@ -5,7 +5,8 @@
 use Code16\OzuClient\Deploy\DeployServiceProvider;
 use Code16\OzuClient\Support\Pagination\StaticLengthAwarePaginator;
 use Code16\OzuClient\Support\Pagination\StaticPaginator;
-use Code16\OzuClient\Support\Thumbnails\CdnThumbnail;
+use Code16\OzuClient\Support\Thumbnails\ImageKitThumbnail;
+use Code16\OzuClient\Support\Thumbnails\KeyCdnThumbnail;
 use Code16\OzuClient\Support\Thumbnails\LocalThumbnail;
 use Code16\OzuClient\Support\Thumbnails\Thumbnail;
 use Code16\OzuClient\View\Components\Content;
@@ -47,9 +48,15 @@ public function register()
         $this->app->bind(Paginator::class, StaticPaginator::class);
         $this->app->bind(LengthAwarePaginator::class, StaticLengthAwarePaginator::class);
         $this->app->bind(Thumbnail::class, function ($app) {
-            return $app->environment('production')
-                ? $app->make(CdnThumbnail::class)
-                : $app->make(LocalThumbnail::class);
+            if (!$app->environment('production') || !config('ozu-client.cdn.url')) {
+                return $app->make(LocalThumbnail::class);
+            }
+
+            return match(config('ozu-client.cdn.provider')) {
+                'imagekit' => $app->make(ImageKitThumbnail::class),
+                'keycdn' => $app->make(KeyCdnThumbnail::class),
+                default => $app->make(LocalThumbnail::class)
+            };
         });
 
         $this->app->register(DeployServiceProvider::class);

src/Support/Thumbnails/CdnThumbnail.php

@@ -2,11 +2,11 @@
 
 namespace Code16\OzuClient\Support\Thumbnails;
 
-class CdnThumbnail extends Thumbnail
+abstract class CdnThumbnail extends Thumbnail
 {
     public function make(?int $width, ?int $height = null, bool $fit = false): ?string
     {
-        if($cdnUrl = str(config('ozu-client.cdn_url'))->rtrim('/')) {
+        if($cdnUrl = str(config('ozu-client.cdn.url'))->rtrim('/')) {
             return sprintf(
                 '%s/storage/%s?%s',
                 $cdnUrl,
@@ -18,24 +18,5 @@ public function make(?int $width, ?int $height = null, bool $fit = false): ?stri
         return null;
     }
 
-    private function generateUrlParameters(?int $width, ?int $height, bool $fit): string
-    {
-        if (!$fit) {
-            if ($width && $height) {
-                return sprintf('tr=w-%s,h-%s,c-at_max', $width, $height);
-            }
-
-            return $width
-                ? sprintf('tr=w-%s', $width)
-                : sprintf('tr=h-%s', $height ?: 400);
-        }
-
-        if ($width && $height) {
-            return sprintf('tr=w-%s,h-%s,c-at_max', $width, $height);
-        }
-
-        $side = ($width ?: $height) ?: 400;
-
-        return sprintf('tr=w-%s,h-%s,c-maintain_ratio', $side, $side);
-    }
+    abstract protected function generateUrlParameters(?int $width, ?int $height, bool $fit): string;
 }

src/Support/Thumbnails/ImageKitThumbnail.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Code16\OzuClient\Support\Thumbnails;
+
+class ImageKitThumbnail extends CdnThumbnail
+{
+    protected function generateUrlParameters(?int $width, ?int $height, bool $fit): string
+    {
+        if (!$fit) {
+            if ($width && $height) {
+                return sprintf('tr=w-%s,h-%s,c-at_max', $width, $height);
+            }
+
+            return $width
+                ? sprintf('tr=w-%s', $width)
+                : sprintf('tr=h-%s', $height ?: 400);
+        }
+
+        if ($width && $height) {
+            return sprintf('tr=w-%s,h-%s,c-maintain_ratio', $width, $height);
+        }
+
+        $side = ($width ?: $height) ?: 400;
+
+        return sprintf('tr=w-%s,h-%s,c-maintain_ratio', $side, $side);
+    }
+}

src/Support/Thumbnails/KeyCdnThumbnail.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Code16\OzuClient\Support\Thumbnails;
+
+class KeyCdnThumbnail extends CdnThumbnail
+{
+
+    protected function generateUrlParameters(?int $width, ?int $height, bool $fit): string
+    {
+        if (!$fit) {
+            if ($width && $height) {
+                return sprintf('width=%s&height=%s&fit=inside', $width, $height);
+            }
+
+            return $width
+                ? sprintf('width=%s', $width)
+                : sprintf('height=%s', $height ?: 400);
+        }
+
+        if ($width && $height) {
+            return sprintf('width=%s&height=%s&fit=cover', $width, $height);
+        }
+
+        $side = ($width ?: $height) ?: 400;
+
+        return sprintf('width=%s&height=%s&fit=cover', $side, $side);
+    }
+}

src/Support/Thumbnails/LocalThumbnail.php

@@ -6,6 +6,7 @@
 use Illuminate\Filesystem\FilesystemManager;
 use Illuminate\Support\Str;
 use Intervention\Image\Drivers\Imagick\Driver;
+use Intervention\Image\Exceptions\DecoderException;
 use Intervention\Image\ImageManager;
 
 class LocalThumbnail extends Thumbnail
@@ -76,7 +77,7 @@ private function generateThumbnail(string $sourceDisk, string $sourceRelPath, st
                 }
 
                 $thumbnailDisk->put($thumbnailPath, $sourceImg->toJpeg(quality: $this->quality));
-            } catch (FileNotFoundException $ex) {
+            } catch (FileNotFoundException|DecoderException) {
                 return null;
             }
         }