Merge pull request #17 from outl1ne/feature/2

Encode file names for storage
outl1ne · Sep 21, 2022 · ea8f415 · ea8f415
2 parents 156b649 + e69deb1
commit ea8f415
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/MediaHandler/Support/FileHelpers.php b/src/MediaHandler/Support/FileHelpers.php
@@ -61,7 +61,10 @@ public static function getFileHash(string $path, string $disk = null): string
 
     public static function sanitizeFileName($fileName)
     {
-        return str_replace(['#', '/', '\\', ' ', '?', '='], '-', $fileName);
+        [$extension, $name] = explode('.', strrev($fileName), 2);
+        $sanitizedName = urlencode(str_replace(['#', '/', '\\', ' ', '?', '=', '.'], '-', $name));
+
+        return strrev("{$extension}.{$sanitizedName}");
     }
 
     // Returns [$fileName, $extension]

diff --git a/src/MediaHandler/Support/FileNamer.php b/src/MediaHandler/Support/FileNamer.php
@@ -13,4 +13,11 @@ public function formatConversionFileName(string $fileName, string $extension, $c
     {
         return "{$fileName}.{$conversion}.{$extension}";
     }
+
+    public static function encode(string $fileName): string
+    {
+        // For backwards compatibility.
+        // Encodes fileName while avoiding double encoding.
+        return urlencode(urldecode($fileName));
+    }
 }
diff --git a/src/Models/Media.php b/src/Models/Media.php
@@ -5,6 +5,7 @@
 use Outl1ne\NovaMediaHub\MediaHub;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Storage;
+use Outl1ne\NovaMediaHub\MediaHandler\Support\FileNamer;
 
 class Media extends Model
 {
@@ -38,7 +39,7 @@ public function getConversionsPathAttribute()
 
     public function getUrlAttribute()
     {
-        return Storage::disk($this->disk)->url("{$this->path}{$this->file_name}");
+        return Storage::disk($this->disk)->url(FileNamer::encode("{$this->path}{$this->file_name}"));
     }
 
     public function getThumbnailUrlAttribute()
@@ -49,7 +50,7 @@ public function getThumbnailUrlAttribute()
         $thumbnailName = $this->conversions[$thumbnailConversionName] ?? null;
         if (!$thumbnailName) return null;
 
-        return Storage::disk($this->conversions_disk)->url($this->conversionsPath . $thumbnailName);
+        return Storage::disk($this->conversions_disk)->url(FileNamer::encode($this->conversionsPath . $thumbnailName));
     }
 
     public function formatForNova()