Merge pull request #544 from emielmolenaar/configurable-temp-path

Fixes running multiple workers processing image manipulations
spatie · Mar 8, 2017 · c9ed3f7 · c9ed3f7
2 parents 0293be9 + 15d1946
commit c9ed3f7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/config/medialibrary.php b/config/medialibrary.php
@@ -8,6 +8,12 @@
      */
     'defaultFilesystem' => 'media',
 
+    /*
+     * The path where to store temporary files while performing image conversions.
+     * If set to null, storage_path('medialibrary/temp') will be used.
+     */
+    'temp_file_path' => null,
+
     /*
      * The maximum file size of an item in bytes. Adding a file
      * that is larger will result in an exception.

diff --git a/src/FileManipulator.php b/src/FileManipulator.php
@@ -55,7 +55,7 @@ public function performConversions(ConversionCollection $conversions, Media $med
             return;
         }
 
-        $temporaryDirectory = new TemporaryDirectory(storage_path('medialibrary/temp'));
+        $temporaryDirectory = new TemporaryDirectory($this->getTemporaryDirectoryPath());
 
         $copiedOriginalFile = app(Filesystem::class)->copyFromMediaLibrary(
             $media,
@@ -76,9 +76,11 @@ public function performConversions(ConversionCollection $conversions, Media $med
             app(Filesystem::class)->copyToMediaLibrary($renamedFile, $media, true);
 
             event(new ConversionHasBeenCompleted($media, $conversion));
+
+            unlink($renamedFile);
         }
 
-        $temporaryDirectory->delete();
+        unlink($copiedOriginalFile);
     }
 
     public function performConversion(Media $media, Conversion $conversion, string $imageFile): string
@@ -109,6 +111,20 @@ protected function dispatchQueuedConversions(Media $media, ConversionCollection
         app(Dispatcher::class)->dispatch($job);
     }
 
+    /**
+     * @return string
+     */
+    protected function getTemporaryDirectoryPath(): string
+    {
+        $path = config('medialibrary.temp_file_path');
+
+        if ($path !== null) {
+            return $path;
+        }
+
+        return storage_path('medialibrary/temp');
+    }
+
     /**
      * @param \Spatie\MediaLibrary\Media $media
      *