callback for conversion and collection

ElegantEngineeringTech · Jan 11, 2025 · 1f47ec0 · 1f47ec0
1 parent 7e1d35c
commit 1f47ec0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/Concerns/HasMedia.php b/src/Concerns/HasMedia.php
@@ -197,6 +197,10 @@ public function addMedia(
             force: true,
         );
 
+        if ($onAdded = $collection?->onAdded) {
+            $onAdded($media);
+        }
+
         event(new MediaAddedEvent($media));
 
         return $media;

diff --git a/src/Definitions/MediaConversionDefinition.php b/src/Definitions/MediaConversionDefinition.php
@@ -18,18 +18,20 @@ class MediaConversionDefinition
      * @param  MediaConversionDefinition[]  $conversions
      * @param  Closure(Media $media, ?MediaConversion $parent, ?string $file, Filesystem $filesystem, SpatieTemporaryDirectory $temporaryDirectory): ?MediaConversion  $handle
      * @param  null|bool|Closure(Media $media, ?MediaConversion $parent): bool  $when
+     * @param  null|(Closure(?MediaConversion $conversion, Media $media, ?MediaConversion $parent): void)  $onCompleted
      */
     public function __construct(
         public string $name,
         public Closure $handle,
         public null|bool|Closure $when = null,
+        public ?Closure $onCompleted = null,
         public bool $immediate = true,
         public bool $queued = true,
         public ?string $queue = null,
         public array $conversions = [],
     ) {
         /** @var array<string, MediaConversionDefinition> $conversions */
-        $conversions = collect($conversions)->keyBy('name')->toArray();
+        $conversions = collect($conversions)->keyBy('name')->all();
         $this->conversions = $conversions;
     }
 
@@ -70,7 +72,7 @@ public function dispatch(Media $media, ?MediaConversion $parent): PendingDispatc
 
     public function execute(Media $media, ?MediaConversion $parent): ?MediaConversion
     {
-        return TemporaryDirectory::callback(function ($temporaryDirectory) use ($media, $parent) {
+        $value = TemporaryDirectory::callback(function ($temporaryDirectory) use ($media, $parent) {
 
             $storage = TemporaryDirectory::storage($temporaryDirectory);
 
@@ -84,5 +86,11 @@ public function execute(Media $media, ?MediaConversion $parent): ?MediaConversio
             return $this->handle($media, $parent, $copy, $storage, $temporaryDirectory);
 
         });
+
+        if ($onCompleted = $this->onCompleted) {
+            $onCompleted($value, $media, $parent);
+        }
+
+        return $value;
     }
 }
diff --git a/src/MediaCollection.php b/src/MediaCollection.php
@@ -4,6 +4,7 @@
 
 use Closure;
 use Elegantly\Media\Definitions\MediaConversionDefinition;
+use Elegantly\Media\Models\Media;
 use Illuminate\Http\File;
 use Illuminate\Http\UploadedFile;
 
@@ -13,6 +14,7 @@ class MediaCollection
      * @param  null|(string[])  $acceptedMimeTypes
      * @param  null|string|(Closure(): null|string)  $fallback
      * @param  null|(Closure(UploadedFile|File $file): (UploadedFile|File))  $transform
+     * @param  null|(Closure(Media $media): void)  $onAdded
      * @param  MediaConversionDefinition[]  $conversions
      */
     public function __construct(
@@ -23,10 +25,11 @@ public function __construct(
         public ?string $disk = null,
         public null|string|Closure $fallback = null,
         public ?Closure $transform = null,
+        public ?Closure $onAdded = null,
         public array $conversions = [],
     ) {
         /** @var array<string, MediaConversionDefinition> $conversions */
-        $conversions = collect($conversions)->keyBy('name')->toArray();
+        $conversions = collect($conversions)->keyBy('name')->all();
         $this->conversions = $conversions;
     }