mirror of https://github.com/pixelfed/pixelfed.git
Update MediaDeletePipeline, fix async media deletion
This commit is contained in:
parent
1eba7f810a
commit
bb1cccbe03
|
@ -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('');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -57,7 +57,9 @@ class MediaDeletePipeline implements ShouldQueue
|
||||||
$disk->deleteDirectory($i);
|
$disk->deleteDirectory($i);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1;
|
$media->forceDelete();
|
||||||
|
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue