Merge pull request #3958 from pixelfed/staging

Update CloudMediaMigrate command
This commit is contained in:
daniel 2022-12-17 23:41:54 -07:00 committed by GitHub
commit 199c507974
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -7,6 +7,7 @@ use App\Media;
use App\Services\MediaStorageService; use App\Services\MediaStorageService;
use App\Util\Lexer\PrettyNumber; use App\Util\Lexer\PrettyNumber;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
class CloudMediaMigrate extends Command class CloudMediaMigrate extends Command
{ {
@ -61,7 +62,13 @@ class CloudMediaMigrate extends Command
->each(function($media) use($bar) { ->each(function($media) use($bar) {
if(Storage::disk('local')->exists($media->media_path)) { if(Storage::disk('local')->exists($media->media_path)) {
$this->totalSize = $this->totalSize + $media->size; $this->totalSize = $this->totalSize + $media->size;
MediaStorageService::store($media); try {
MediaStorageService::store($media);
} catch (FileNotFoundException $e) {
return;
} catch (Exception $e) {
return;
}
} }
$bar->advance(); $bar->advance();
}); });