From 3fced97a7e67418de7705c745014e46498528487 Mon Sep 17 00:00:00 2001 From: Stephen Sullivan Date: Tue, 31 Jan 2023 13:26:18 +0000 Subject: [PATCH 1/2] Add check for empty directory before attempting to create directory --- src/MediaHandler/Support/Filesystem.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/MediaHandler/Support/Filesystem.php b/src/MediaHandler/Support/Filesystem.php index 08890df..c55045d 100644 --- a/src/MediaHandler/Support/Filesystem.php +++ b/src/MediaHandler/Support/Filesystem.php @@ -111,7 +111,9 @@ public function getMediaDirectory(Media $media, ?string $type = null): string ? $media->disk : $media->conversions_disk; - $this->filesystem->disk($diskName)->makeDirectory($directory); + if (!empty($directory)) { + $this->filesystem->disk($diskName)->makeDirectory($directory); + } return $directory; } From ade64be7f4a63f787b335f0da8e6c5780d18edc7 Mon Sep 17 00:00:00 2001 From: Stephen Sullivan Date: Tue, 31 Jan 2023 14:43:52 +0000 Subject: [PATCH 2/2] Added check for empty path when trying to remove a directory --- src/MediaHandler/Support/Filesystem.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MediaHandler/Support/Filesystem.php b/src/MediaHandler/Support/Filesystem.php index 08890df..6114c03 100644 --- a/src/MediaHandler/Support/Filesystem.php +++ b/src/MediaHandler/Support/Filesystem.php @@ -50,7 +50,7 @@ public function deleteFromMediaLibrary(Media $media) // Check if main media folder is empty, if so, delete it $mainDisk = $this->filesystem->disk($media->disk); - if ($mainDisk->exists($media->path)) { + if (!empty($media->path) && $mainDisk->exists($media->path)) { $fileCount = count($convDisk->files($media->path)); $dirCount = count(array_filter( $convDisk->allDirectories($media->path),