UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-02-01 01:10:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update MediaStorageService, handle local media deletes after successful S3 upload

Browse source
This commit is contained in:
Daniel Supernault 2025-01-31 00:13:37 -07:00
parent 599a36f4aa
commit 280f63dc6a
No known key found for this signature in database
GPG key ID: 23740873EE6F76A1
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/Services/MediaStorageService.php
View file

@ -19,7 +19,7 @@ class MediaStorageService
public static function store(Media $media) public static function store(Media $media)
{ {
if ((bool) config_cache('pixelfed.cloud_storage') == true) { if ((bool) config_cache('pixelfed.cloud_storage') == true) {
(new self())->cloudStore($media); (new self)->cloudStore($media);
} }
} }
@ -31,19 +31,19 @@ class MediaStorageService
} }
if ((bool) config_cache('pixelfed.cloud_storage') == true) { if ((bool) config_cache('pixelfed.cloud_storage') == true) {
return (new self())->cloudMove($media); return (new self)->cloudMove($media);
} }
} }
public static function avatar($avatar, $local = false, $skipRecentCheck = false) public static function avatar($avatar, $local = false, $skipRecentCheck = false)
{ {
return (new self())->fetchAvatar($avatar, $local, $skipRecentCheck); return (new self)->fetchAvatar($avatar, $local, $skipRecentCheck);
} }
public static function head($url) public static function head($url)
{ {
$c = new Client(); $c = new Client;
try { try {
$r = $c->request('HEAD', $url); $r = $c->request('HEAD', $url);
} catch (RequestException $e) { } catch (RequestException $e) {
@ -75,10 +75,10 @@ class MediaStorageService
{ {
if ($media->remote_media == true) { if ($media->remote_media == true) {
if (config('media.storage.remote.cloud')) { if (config('media.storage.remote.cloud')) {
(new self())->remoteToCloud($media); (new self)->remoteToCloud($media);
} }
} else { } else {
(new self())->localToCloud($media); (new self)->localToCloud($media);
} }
} }
@ -102,6 +102,18 @@ class MediaStorageService
$media->optimized_url = $url; $media->optimized_url = $url;
$media->replicated_at = now(); $media->replicated_at = now();
$media->save(); $media->save();
if ((bool) config_cache('pixelfed.cloud_storage') && (bool) config('media.delete_local_after_cloud')) {
$s3Domain = config('filesystems.disks.s3.url') ?? config('filesystems.disks.s3.endpoint');
if (str_contains($url, $s3Domain)) {
if (file_exists($path)) {
unlink($path);
}
if (file_exists($thumb)) {
unlink($thumb);
}
}
}
if ($media->status_id) { if ($media->status_id) {
Cache::forget('status:transformer:media:attachments:'.$media->status_id); Cache::forget('status:transformer:media:attachments:'.$media->status_id);
MediaService::del($media->status_id); MediaService::del($media->status_id);