mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-09 16:24:51 +00:00
Add new config
This commit is contained in:
parent
36e15a52e4
commit
25d632c761
2 changed files with 28 additions and 9 deletions
|
@ -57,21 +57,21 @@ class Image
|
|||
}
|
||||
if ($thumbnail) {
|
||||
return [
|
||||
'dimensions' => $this->thumbnail,
|
||||
'orientation' => 'thumbnail',
|
||||
];
|
||||
'dimensions' => $this->thumbnail,
|
||||
'orientation' => 'thumbnail',
|
||||
];
|
||||
}
|
||||
|
||||
list($width, $height) = getimagesize($mediaPath);
|
||||
$aspect = $width / $height;
|
||||
$orientation = $aspect === 1 ? 'square' :
|
||||
($aspect > 1 ? 'landscape' : 'portrait');
|
||||
($aspect > 1 ? 'landscape' : 'portrait');
|
||||
$this->orientation = $orientation;
|
||||
|
||||
return [
|
||||
'dimensions' => $this->orientations()[$orientation],
|
||||
'orientation' => $orientation,
|
||||
];
|
||||
'dimensions' => $this->orientations()[$orientation],
|
||||
'orientation' => $orientation,
|
||||
];
|
||||
}
|
||||
|
||||
public function resizeImage(Media $media)
|
||||
|
@ -116,11 +116,14 @@ class Image
|
|||
$constraint->aspectRatio();
|
||||
});
|
||||
} else {
|
||||
$metadata = $img->exif();
|
||||
if(config('media.exif.database', false) == true) {
|
||||
$metadata = $img->exif();
|
||||
$media->metadata = json_encode($metadata);
|
||||
}
|
||||
|
||||
$img->resize($aspect['width'], $aspect['height'], function ($constraint) {
|
||||
$constraint->aspectRatio();
|
||||
});
|
||||
$media->metadata = json_encode($metadata);
|
||||
}
|
||||
$converted = $this->setBaseName($path, $thumbnail, $img->extension);
|
||||
$newPath = storage_path('app/'.$converted['path']);
|
||||
|
@ -141,6 +144,7 @@ class Image
|
|||
}
|
||||
|
||||
$media->save();
|
||||
Cache::forget('status:transformer:media:attachments:'.$media->status_id);
|
||||
Cache::forget('status:thumb:'.$media->status_id);
|
||||
} catch (Exception $e) {
|
||||
}
|
||||
|
|
15
config/media.php
Normal file
15
config/media.php
Normal file
|
@ -0,0 +1,15 @@
|
|||
<?php
|
||||
|
||||
return [
|
||||
'exif' => [
|
||||
'database' => env('MEDIA_EXIF_DATABASE', false),
|
||||
'strip' => true
|
||||
],
|
||||
'types' => env('MEDIA_TYPES', 'image/jpeg,image/png,image/gif'),
|
||||
'photo' => [
|
||||
'optimize' => env('PF_OPTIMIZE_IMAGES', true),
|
||||
'quality' => (int) env('IMAGE_QUALITY', 80),
|
||||
'max_size' => env('MAX_PHOTO_SIZE', 15000),
|
||||
'max_album_length' => env('MAX_ALBUM_LENGTH', 4),
|
||||
],
|
||||
];
|
Loading…
Reference in a new issue