Merge pull request #3957 from pixelfed/staging

Staging

CHANGELOG.md

@@ -57,6 +57,8 @@
 - Update InboxPipeline, dispatch Follow/Accept Follow jobs to follow queue ([f62d2494](https://github.com/pixelfed/pixelfed/commit/f62d2494))
 - Add MediaS3GarbageCollector command to clear local media after uploaded to S3 disks after 12 hours ([b8c3f153](https://github.com/pixelfed/pixelfed/commit/b8c3f153))
 - Update MediaS3GarbageCollector command, disable logging by default and optimize huge invocations ([a14af93b](https://github.com/pixelfed/pixelfed/commit/a14af93b))
+- Update MediaStorageService, clear MediaService and StatusService caches after localToCloud ([de56b0f0](https://github.com/pixelfed/pixelfed/commit/de56b0f0))
+- Add CloudMediaMigrate command to migrate older local media to cloud storage ([382d00d9](https://github.com/pixelfed/pixelfed/commit/382d00d9))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)

app/Console/Commands/CloudMediaMigrate.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use App\Media;
+use App\Services\MediaStorageService;
+use App\Util\Lexer\PrettyNumber;
+use Illuminate\Support\Facades\Storage;
+
+class CloudMediaMigrate extends Command
+{
+    public $totalSize = 0;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'media:migrate2cloud {--limit=200} {--huge}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Move older media to cloud storage';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $enabled = config('pixelfed.cloud_storage');
+        if(!$enabled) {
+            $this->error('Cloud storage not enabled. Exiting...');
+            return;
+        }
+
+        $limit = $this->option('limit');
+        $hugeMode = $this->option('huge');
+
+        if($limit > 500 && !$hugeMode) {
+            $this->error('Max limit exceeded, use a limit lower than 500 or run again with the --huge flag');
+            return;
+        }
+
+        $bar = $this->output->createProgressBar($limit);
+        $bar->start();
+
+        Media::whereNot('version', '4')
+            ->where('created_at', '<', now()->subDays(2))
+            ->whereRemoteMedia(false)
+            ->whereNotNull(['status_id', 'profile_id'])
+            ->whereNull(['cdn_url', 'replicated_at'])
+            ->orderByDesc('size')
+            ->take($limit)
+            ->get()
+            ->each(function($media) use($bar) {
+                if(Storage::disk('local')->exists($media->media_path)) {
+                    $this->totalSize = $this->totalSize + $media->size;
+                    MediaStorageService::store($media);
+                }
+                $bar->advance();
+            });
+
+        $bar->finish();
+        $this->line(' ');
+        $this->info('Finished!');
+        if($this->totalSize) {
+            $this->info('Uploaded ' . PrettyNumber::size($this->totalSize) . ' of media to cloud storage!');
+            $this->line(' ');
+            $this->info('These files are still stored locally, and will be automatically removed.');
+        }
+        return Command::SUCCESS;
+    }
+}

app/Services/MediaStorageService.php

@@ -106,6 +106,8 @@ class MediaStorageService {
 		$media->save();
 		if($media->status_id) {
 			Cache::forget('status:transformer:media:attachments:' . $media->status_id);
+			MediaService::del($media->status_id);
+			StatusService::del($media->status_id, false);
 		}
 	}