add content to generated conversions

ElegantEngineeringTech · Sep 29, 2024 · 89ff46e · 89ff46e
1 parent f2b8613
commit 89ff46e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 25 deletions.
diff --git a/src/Casts/GeneratedConversion.php b/src/Casts/GeneratedConversion.php
@@ -35,6 +35,7 @@ public function __construct(
         public ?int $width = null,
         public ?float $aspect_ratio = null,
         public ?string $average_color = null,
+        public ?string $content = null,
         public array $metadata = [],
         public Collection $generated_conversions = new Collection,
         ?Carbon $created_at = null,
@@ -66,6 +67,7 @@ public static function make(array $attributes): self
             width: Arr::get($attributes, 'width'),
             aspect_ratio: Arr::get($attributes, 'aspect_ratio'),
             average_color: Arr::get($attributes, 'average_color'),
+            content: Arr::get($attributes, 'content'),
             metadata: Arr::get($attributes, 'metadata', []),
             generated_conversions: collect(Arr::get($attributes, 'generated_conversions', []))->map(fn ($item) => self::make($item)),
             created_at: $created_at ? Carbon::parse($created_at) : null,

diff --git a/src/Jobs/MediaConversionJob.php b/src/Jobs/MediaConversionJob.php
@@ -84,13 +84,15 @@ public function getMediaConversion(): ?MediaConversion
 
     public function isNestedConversion(): bool
     {
-        return count(explode('.', $this->conversionName)) > 1;
+        return str($this->conversionName)->contains('.');
     }
 
     public function getGeneratedParentConversion(): ?GeneratedConversion
     {
         if ($this->isNestedConversion()) {
-            return $this->media->getGeneratedParentConversion($this->conversionName);
+            return $this->media->getGeneratedConversion(
+                str($this->conversionName)->beforeLast('.')->value()
+            );
         }
 
         return null;

diff --git a/src/Models/Media.php b/src/Models/Media.php
@@ -95,7 +95,7 @@ protected function url(): Attribute
         return Attribute::get(fn () => $this->getUrl());
     }
 
-    public function getConversionKey(string $conversion): string
+    public function makeGeneratedConversionKey(string $conversion): string
     {
         return str_replace('.', '.generated_conversions.', $conversion);
     }
@@ -106,7 +106,10 @@ public function getConversionKey(string $conversion): string
      */
     public function getGeneratedConversion(string $conversion, ?string $state = null): ?GeneratedConversion
     {
-        $generatedConversion = data_get($this->generated_conversions, $this->getConversionKey($conversion));
+        $generatedConversion = data_get(
+            $this->generated_conversions,
+            $this->makeGeneratedConversionKey($conversion)
+        );
 
         if ($state) {
             return $generatedConversion?->state === $state ? $generatedConversion : null;
@@ -115,14 +118,6 @@ public function getGeneratedConversion(string $conversion, ?string $state = null
         return $generatedConversion;
     }
 
-    public function getGeneratedParentConversion(string $conversion, ?string $state = null): ?GeneratedConversion
-    {
-        $genealogy = explode('.', $conversion);
-        $parents = implode('.', array_slice($genealogy, 0, -1));
-
-        return $this->getGeneratedConversion($parents, $state);
-    }
-
     public function hasGeneratedConversion(string $conversion, ?string $state = null): bool
     {
         return (bool) $this->getGeneratedConversion($conversion, $state);
@@ -136,8 +131,10 @@ public function hasGeneratedConversion(string $conversion, ?string $state = null
      *      /conversionName
      *      files
      */
-    public function generateBasePath(?string $conversion = null): string
-    {
+    public function makePath(
+        ?string $conversion = null,
+        ?string $fileName = null
+    ): string {
         $prefix = config('media.generated_path_prefix', '');
 
         $root = Str::of($prefix)
@@ -148,11 +145,12 @@ public function generateBasePath(?string $conversion = null): string
         if ($conversion) {
             return $root
                 ->append('generated_conversions/')
-                ->append(str_replace('.', '/', $this->getConversionKey($conversion)))
-                ->finish('/');
+                ->append(str_replace('.', '/', $this->makeGeneratedConversionKey($conversion)))
+                ->finish('/')
+                ->append($fileName ?? '');
         }
 
-        return $root;
+        return $root->append($fileName ?? '');
     }
 
     public function putGeneratedConversion(string $conversion, GeneratedConversion $generatedConversion): static
@@ -231,7 +229,7 @@ public function storeFileFromHttpFile(
 
         $file = $this->performMediaTransformations($file);
 
-        $basePath = Str::finish($basePath ?? $this->generateBasePath(), '/');
+        $basePath = Str::finish($basePath ?? $this->makePath(), '/');
 
         $this->name = Str::limit(
             File::sanitizeFilename($name ?? File::name($file)),
@@ -405,7 +403,7 @@ public function storeConversionFromHttpFile(
             name: $name,
             extension: $extension,
             file_name: $file_name,
-            path: Str::of($basePath ?? $this->generateBasePath($conversion))->finish('/')->append($file_name),
+            path: Str::of($basePath ?? $this->makePath($conversion))->finish('/')->append($file_name),
             mime_type: $mime_type,
             type: $type,
             state: $state,
@@ -610,9 +608,10 @@ public function deleteGeneratedConversion(string $conversion): ?GeneratedConvers
             return null;
         }
 
-        $this->deleteGeneratedConversionFiles($conversion);
-        $this->forgetGeneratedConversion($conversion);
-        $this->save();
+        $this
+            ->deleteGeneratedConversionFiles($conversion)
+            ->forgetGeneratedConversion($conversion)
+            ->save();
 
         return $generatedConversion;
     }

diff --git a/tests/Feature/MediaTest.php b/tests/Feature/MediaTest.php
@@ -67,9 +67,9 @@
     /** @var Media $media */
     $media = MediaFactory::new()->make();
 
-    expect($media->getConversionKey('poster'))->toBe('poster');
-    expect($media->getConversionKey('poster.480p'))->toBe('poster.generated_conversions.480p');
-    expect($media->getConversionKey('poster.square.480p'))->toBe('poster.generated_conversions.square.generated_conversions.480p');
+    expect($media->makeGeneratedConversionKey('poster'))->toBe('poster');
+    expect($media->makeGeneratedConversionKey('poster.480p'))->toBe('poster.generated_conversions.480p');
+    expect($media->makeGeneratedConversionKey('poster.square.480p'))->toBe('poster.generated_conversions.square.generated_conversions.480p');
 });
 
 it('retrieve the generated conversion', function () {