UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-22 13:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3767 from pixelfed/staging

Browse source 
Update MediaDeletePipeline to handle flysystem v3
This commit is contained in:
daniel 2022-11-14 01:48:30 -07:00 committed by GitHub
commit bbb9cc68e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/Jobs/MediaPipeline/MediaDeletePipeline.php
View file

@ -38,8 +38,14 @@ class MediaDeletePipeline implements ShouldQueue
if(config_cache('pixelfed.cloud_storage') == true) { if(config_cache('pixelfed.cloud_storage') == true) {
$disk = Storage::disk(config('filesystems.cloud')); $disk = Storage::disk(config('filesystems.cloud'));
$disk->delete($path);
$disk->delete($thumb); if($path) {
$disk->delete($path);
}
if($thumb) {
$disk->delete($thumb);
}
if(count($e) > 4 && count($disk->files($i)) == 0) { if(count($e) > 4 && count($disk->files($i)) == 0) {
$disk->deleteDirectory($i); $disk->deleteDirectory($i);
@ -47,10 +53,10 @@ class MediaDeletePipeline implements ShouldQueue
} }
$disk = Storage::disk(config('filesystems.local')); $disk = Storage::disk(config('filesystems.local'));
if($disk->exists($path)) { if($path && $disk->exists($path)) {
$disk->delete($path); $disk->delete($path);
} }
if($disk->exists($thumb)) { if($thumb && $disk->exists($thumb)) {
$disk->delete($thumb); $disk->delete($thumb);
} }
if(count($e) > 4 && count($disk->files($i)) == 0) { if(count($e) > 4 && count($disk->files($i)) == 0) {