mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Update MediaDeletePipeline, fix async media deletion

This commit is contained in:
Daniel Supernault 2022-06-19 06:52:06 -06:00
parent 1eba7f810a
commit bb1cccbe03
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Console/Commands/MediaGarbageCollector.php
View File

@ -51,10 +51,10 @@ class MediaGarbageCollector extends Command
$bar = $this->output->createProgressBar($gc->count()); $bar = $this->output->createProgressBar($gc->count());
$bar->start(); $bar->start();
foreach($gc as $media) { foreach($gc as $media) {
MediaStorageService::delete($media); MediaStorageService::delete($media, true);
$media->forceDelete();
$bar->advance(); $bar->advance();
} }
$bar->finish(); $bar->finish();
$this->line('');
} }
} }

2
app/Http/Controllers/ComposeController.php
View File

@ -228,8 +228,6 @@ class ComposeController extends Controller
MediaStorageService::delete($media, true); MediaStorageService::delete($media, true);
$media->forceDelete();
return response()->json([ return response()->json([
'msg' => 'Successfully deleted', 'msg' => 'Successfully deleted',
'code' => 200 'code' => 200

4
app/Jobs/MediaPipeline/MediaDeletePipeline.php
View File

@ -57,7 +57,9 @@ class MediaDeletePipeline implements ShouldQueue
$disk->deleteDirectory($i); $disk->deleteDirectory($i);
} }
return 1; $media->forceDelete();
return;
} }
} }