chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

Merge pull request #1414 from pixelfed/frontend-ui-refactor

Browse source 
Add new config
This commit is contained in:
daniel 2019-06-17 22:18:26 -06:00 committed by GitHub
commit 4a78be76b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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
View 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),
],
];