UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-14 02:24:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update Image media util, store dimensions of media not thumbnail

Browse source
This commit is contained in:
Daniel Supernault 2021-01-19 19:36:05 -07:00
parent cf40526ef9
commit 40bd64aae7
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/Util/Media/Image.php
View file

@ -4,7 +4,7 @@ namespace App\Util\Media;
use App\Media; use App\Media;
use Image as Intervention; use Image as Intervention;
use Cache, Storage; use Cache, Log, Storage;
class Image class Image
{ {
@ -165,30 +165,32 @@ class Image
$quality = config('pixelfed.image_quality'); $quality = config('pixelfed.image_quality');
$img->save($newPath, $quality); $img->save($newPath, $quality);
$media->width = $img->width();
$media->height = $img->height();
$img->destroy();
if (!$thumbnail) {
$media->orientation = $orientation;
}
if ($thumbnail == true) { if ($thumbnail == true) {
$media->thumbnail_path = $converted['path']; $media->thumbnail_path = $converted['path'];
$media->thumbnail_url = url(Storage::url($converted['path'])); $media->thumbnail_url = url(Storage::url($converted['path']));
} else { } else {
$media->width = $img->width();
$media->height = $img->height();
$media->orientation = $orientation;
$media->media_path = $converted['path']; $media->media_path = $converted['path'];
$media->mime = $img->mime; $media->mime = $img->mime;
} }
$img->destroy();
$media->save(); $media->save();
if($thumbnail) { if($thumbnail) {
$this->generateBlurhash($media); $this->generateBlurhash($media);
} }
Cache::forget('status:transformer:media:attachments:'.$media->status_id); Cache::forget('status:transformer:media:attachments:'.$media->status_id);
Cache::forget('status:thumb:'.$media->status_id); Cache::forget('status:thumb:'.$media->status_id);
} catch (Exception $e) { } catch (Exception $e) {
$media->processed_at = now();
$media->save();
Log::info('MediaResizeException: Could not process media id: ' . $media->id);
} }
} }