better transformFile

ElegantEngineeringTech · Nov 13, 2024 · d1dcd47 · d1dcd47
1 parent 20cbee9
commit d1dcd47
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 24 deletions.
diff --git a/src/Concerns/InteractWithFiles.php b/src/Concerns/InteractWithFiles.php
@@ -180,17 +180,14 @@ public function moveFileTo(
      * Transform the media file inside a temporary directory while keeping the same Model
      * Usefull to optimize or convert the media file afterwards
      *
-     * @param  Closure(HttpFile $copy): HttpFile  $transform
+     * @param  Closure(HttpFile $copy, \Spatie\TemporaryDirectory\TemporaryDirectory $temporaryDirectory): HttpFile  $transform
      * @return $this
      */
     public function transformFile(Closure $transform): static
     {
 
         TemporaryDirectory::callback(function ($temporaryDirectory) use ($transform) {
 
-            /** Used to delete the old file */
-            $clone = clone $this;
-
             if (
                 ! $this->path ||
                 ! $this->disk ||
@@ -199,10 +196,10 @@ public function transformFile(Closure $transform): static
                 return $this;
             }
 
-            $storage = Storage::build([
-                'driver' => 'local',
-                'root' => $temporaryDirectory->path(),
-            ]);
+            /** Used to delete the old file at the end */
+            $clone = clone $this;
+
+            $storage = TemporaryDirectory::storage($temporaryDirectory);
 
             $copy = $this->copyFileTo(
                 disk: $storage,
@@ -213,7 +210,10 @@ public function transformFile(Closure $transform): static
                 return;
             }
 
-            $file = $transform(new HttpFile($storage->path($copy)));
+            $file = $transform(
+                new HttpFile($storage->path($copy)),
+                $temporaryDirectory
+            );
 
             $result = $this->putFile(
                 disk: $this->disk,

diff --git a/src/Definitions/MediaConversionDefinition.php b/src/Definitions/MediaConversionDefinition.php
@@ -9,7 +9,6 @@
 use Elegantly\Media\TemporaryDirectory;
 use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Foundation\Bus\PendingDispatch;
-use Illuminate\Support\Facades\Storage;
 use Spatie\TemporaryDirectory\TemporaryDirectory as SpatieTemporaryDirectory;
 
 class MediaConversionDefinition
@@ -73,10 +72,7 @@ public function execute(Media $media, ?MediaConversion $parent): ?MediaConversio
     {
         return TemporaryDirectory::callback(function ($temporaryDirectory) use ($media, $parent) {
 
-            $storage = Storage::build([
-                'driver' => 'local',
-                'root' => $temporaryDirectory->path(),
-            ]);
+            $storage = TemporaryDirectory::storage($temporaryDirectory);
 
             $source = $parent ?? $media;
 

diff --git a/src/Helpers/File.php b/src/Helpers/File.php
@@ -4,14 +4,12 @@
 
 use Elegantly\Media\Enums\MediaType;
 use FFMpeg\Coordinate\Dimension;
-use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Http\File as HttpFile;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\File as SupportFile;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use ProtoneMedia\LaravelFFMpeg\Support\FFMpeg;
-use Spatie\TemporaryDirectory\TemporaryDirectory;
 
 class File
 {
@@ -104,12 +102,4 @@ public static function extractFilename(string|HttpFile $file, ?string $name = nu
 
         return "{$name}.{$extension}";
     }
-
-    public static function makeTemporaryDisk(TemporaryDirectory $directory): Filesystem
-    {
-        return Storage::build([
-            'driver' => 'local',
-            'root' => $directory->path(),
-        ]);
-    }
 }
diff --git a/src/TemporaryDirectory.php b/src/TemporaryDirectory.php
@@ -3,6 +3,8 @@
 namespace Elegantly\Media;
 
 use Closure;
+use Illuminate\Contracts\Filesystem\Filesystem;
+use Illuminate\Support\Facades\Storage;
 use Spatie\TemporaryDirectory\TemporaryDirectory as SpatieTemporaryDirectory;
 
 class TemporaryDirectory extends SpatieTemporaryDirectory
@@ -36,4 +38,12 @@ public static function callback(
         return $value;
 
     }
+
+    public static function storage(SpatieTemporaryDirectory $temporaryDirectory): Filesystem
+    {
+        return Storage::build([
+            'driver' => 'local',
+            'root' => $temporaryDirectory->path(),
+        ]);
+    }
 }