Implement creator studio and upload updates

app/Http/Controllers/ArtworkDownloadController.php

@@ -27,6 +27,11 @@ final class ArtworkDownloadController extends Controller
         'webp',
         'bmp',
         'tiff',
+        'zip',
+        'rar',
+        '7z',
+        'tar',
+        'gz',
     ];
 
     public function __invoke(Request $request, int $id): BinaryFileResponse
@@ -36,22 +41,19 @@ final class ArtworkDownloadController extends Controller
             abort(404);
         }
 
-        $hash = strtolower((string) $artwork->hash);
-        $ext = strtolower(ltrim((string) $artwork->file_ext, '.'));
+        $filePath = $this->resolveOriginalPath($artwork);
+        $ext = strtolower(ltrim((string) pathinfo($filePath, PATHINFO_EXTENSION), '.'));
 
-        if (! $this->isValidHash($hash) || ! in_array($ext, self::ALLOWED_EXTENSIONS, true)) {
+        if ($filePath === '' || ! in_array($ext, self::ALLOWED_EXTENSIONS, true)) {
             abort(404);
         }
 
-        $filePath = $this->resolveOriginalPath($hash, $ext);
-
         $this->recordDownload($request, $artwork->id);
         $this->incrementDownloadCountIfAvailable($artwork->id);
 
         if (! File::isFile($filePath)) {
             Log::warning('Artwork original file missing for download.', [
                 'artwork_id' => $artwork->id,
-                'hash' => $hash,
                 'ext' => $ext,
                 'resolved_path' => $filePath,
             ]);
@@ -65,16 +67,29 @@ final class ArtworkDownloadController extends Controller
         return response()->download($filePath, $downloadName);
     }
 
-    private function resolveOriginalPath(string $hash, string $ext): string
+    private function resolveOriginalPath(Artwork $artwork): string
     {
-        $firstDir = substr($hash, 0, 2);
-        $secondDir = substr($hash, 2, 2);
-        $root = rtrim((string) config('uploads.storage_root'), DIRECTORY_SEPARATOR);
+        $relative = trim((string) $artwork->file_path, '/');
+        $prefix = trim((string) config('uploads.object_storage.prefix', 'artworks'), '/') . '/original/';
+
+        if ($relative !== '' && str_starts_with($relative, $prefix)) {
+            $suffix = substr($relative, strlen($prefix));
+            $root = rtrim((string) config('uploads.local_originals_root'), DIRECTORY_SEPARATOR);
+
+            return $root . DIRECTORY_SEPARATOR . str_replace(['/', '\\'], DIRECTORY_SEPARATOR, (string) $suffix);
+        }
+
+        $hash = strtolower((string) $artwork->hash);
+        $ext = strtolower(ltrim((string) $artwork->file_ext, '.'));
+        if (! $this->isValidHash($hash) || $ext === '') {
+            return '';
+        }
+
+        $root = rtrim((string) config('uploads.local_originals_root'), DIRECTORY_SEPARATOR);
 
         return $root
-            . DIRECTORY_SEPARATOR . 'original'
-            . DIRECTORY_SEPARATOR . $firstDir
-            . DIRECTORY_SEPARATOR . $secondDir
+            . DIRECTORY_SEPARATOR . substr($hash, 0, 2)
+            . DIRECTORY_SEPARATOR . substr($hash, 2, 2)
             . DIRECTORY_SEPARATOR . $hash . '.' . $ext;
     }