Support multiple file upload in single model

nanaya · Nov 13, 2023 · f267305 · f267305
1 parent f70c93c
commit f267305
Show file tree

Hide file tree

Showing 22 changed files with 416 additions and 414 deletions.
diff --git a/app/Casts/LegacyFilename.php b/app/Casts/LegacyFilename.php
@@ -0,0 +1,41 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+namespace App\Casts;
+
+use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+use Illuminate\Database\Eloquent\Model;
+
+class LegacyFilename implements CastsAttributes
+{
+    public static function makeFromAttributes(?array $attributes): ?string
+    {
+        if (!isset($attributes['hash'])) {
+            return null;
+        }
+
+        $filename = $attributes['hash'];
+        if (isset($attributes['ext'])) {
+            $filename .= ".{$attributes['ext']}";
+        }
+
+        return $filename;
+    }
+
+    public function get(Model $model, string $key, mixed $value, array $attributes)
+    {
+        return static::makeFromAttributes($attributes);
+    }
+
+    public function set(Model $model, string $key, mixed $value, array $attributes)
+    {
+        return [
+            'ext' => null,
+            'hash' => $value,
+        ];
+    }
+}
diff --git a/app/Console/Commands/ForumTopicCoversCleanup.php b/app/Console/Commands/ForumTopicCoversCleanup.php
@@ -51,7 +51,7 @@ public function handle()
 
                 $deleted++;
                 $progress->advance();
-                $cover->deleteWithFile();
+                $cover->delete();
             }
         });
 

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
@@ -90,9 +90,9 @@ public function cover()
         }
 
         try {
-            $user
-                ->profileCustomization()
-                ->setCover(Request::input('cover_id'), Request::file('cover_file'));
+            $profile = $user->profileCustomization();
+            $profile->setCover(Request::input('cover_id'), Request::file('cover_file'));
+            $profile->save();
         } catch (ImageProcessorException $e) {
             return error_popup($e->getMessage());
         }

diff --git a/app/Http/Controllers/Admin/ContestsController.php b/app/Http/Controllers/Admin/ContestsController.php
@@ -8,7 +8,6 @@
 use App\Models\Contest;
 use App\Models\DeletedUser;
 use App\Models\UserContestEntry;
-use GuzzleHttp;
 use ZipStream\ZipStream;
 
 class ContestsController extends Controller
@@ -47,14 +46,11 @@ public function gimmeZip($id)
         return response()->streamDownload(function () use ($entries) {
             $zip = new ZipStream();
 
-            $client = new GuzzleHttp\Client();
-
             $deletedUser = new DeletedUser();
             foreach ($entries as $entry) {
                 $targetDir = ($entry->user ?? $deletedUser)->username." ({$entry->user_id})";
                 $filename = sanitize_filename($entry->original_filename);
-                $file = $client->get($entry->fileUrl())->getBody();
-                $zip->addFileFromPsr7Stream("$targetDir/{$filename}", $file);
+                $zip->addFile("$targetDir/{$filename}", $entry->file()->get());
             }
 
             $zip->finish();

diff --git a/app/Http/Controllers/ContestEntriesController.php b/app/Http/Controllers/ContestEntriesController.php
@@ -97,7 +97,7 @@ public function destroy($id)
 
         priv_check('ContestEntryDestroy', $entry)->ensureCan();
 
-        $entry->deleteWithFile();
+        $entry->delete();
 
         return $contest->userEntries($user);
     }

diff --git a/app/Http/Controllers/Forum/TopicCoversController.php b/app/Http/Controllers/Forum/TopicCoversController.php
@@ -78,7 +78,7 @@ public function destroy($id)
         if ($cover !== null) {
             priv_check('ForumTopicCoverEdit', $cover)->ensureCan();
 
-            $cover->deleteWithFile();
+            $cover->delete();
         }
 
         return json_item($cover, new TopicCoverTransformer());

diff --git a/app/Libraries/ForumDefaultTopicCover.php b/app/Libraries/ForumDefaultTopicCover.php
diff --git a/app/Libraries/ProfileCover.php b/app/Libraries/ProfileCover.php
diff --git a/app/Libraries/Uploader.php b/app/Libraries/Uploader.php
@@ -0,0 +1,108 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+namespace App\Libraries;
+
+use App\Exceptions\InvariantException;
+use App\Models\Model;
+use Illuminate\Http\File;
+use League\Flysystem\Local\LocalFilesystemAdapter;
+
+class Uploader
+{
+    private static function process(string $name, ?array $options, string $srcPath): ?string
+    {
+        switch ($name) {
+            case 'image':
+                $processor = new ImageProcessor($srcPath, $options['maxDimensions'], $options['maxFileSize'] ?? 10_000_000);
+                $processor->process();
+
+                return $processor->ext();
+        }
+
+        throw new InvariantException('unknown process name');
+    }
+
+    private ?string $filename;
+
+    public function __construct(
+        private string $baseDir,
+        private Model $model,
+        private string $attr,
+        private array $processors = [],
+    ) {
+        $this->filename = $this->model->{$this->attr};
+    }
+
+    public function delete(): void
+    {
+        $this->setFilename(null);
+        \Storage::deleteDirectory($this->dir());
+    }
+
+    public function get(): ?string
+    {
+        $path = $this->path();
+
+        return $path === null ? null : \Storage::get($path);
+    }
+
+    public function store(string $srcPath, string $ext = ''): void
+    {
+        foreach ($this->processors as $processName => $processOptions) {
+            $newExt = static::process($processName, $processOptions, $srcPath);
+            if ($newExt !== null) {
+                $ext = $newExt;
+            }
+        }
+
+        $this->delete();
+        $filename = hash_file('sha256', $srcPath);
+        if (present($ext)) {
+            $filename .= ".{$ext}";
+        }
+        $this->setFilename($filename);
+        $storage = \Storage::disk();
+
+        if ($storage->getAdapter() instanceof LocalFilesystemAdapter) {
+            $options = [
+                'visibility' => 'public',
+                'directory_visibility' => 'public',
+            ];
+        }
+
+        $storage->putFileAs(
+            $this->dir(),
+            new File($srcPath),
+            $this->filename,
+            $options ?? [],
+        );
+    }
+
+    public function url(): ?string
+    {
+        $path = $this->path();
+
+        return $path === null ? null : StorageUrl::make(null, $path);
+    }
+
+    private function dir(): string
+    {
+        return "{$this->baseDir}/{$this->model->getKey()}";
+    }
+
+    private function path(): ?string
+    {
+        return $this->filename === null ? null : "{$this->dir()}/{$this->filename}";
+    }
+
+    private function setFilename(?string $filename): void
+    {
+        $this->filename = $filename;
+        $this->model->{$this->attr} = $filename;
+    }
+}