mirror/php-flextype
1
0
Fork 0
mirror of https://github.com/flextype/flextype.git synced 2025-08-07 21:56:33 +02:00
Code Issues Releases Wiki Activity

feat(media): move images settings into media.images settings #541

Browse Source
This commit is contained in:
Awilum
2021-01-12 18:18:31 +03:00
parent 533c9991d5
commit f550e97535
3 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/flextype/Foundation/Media/MediaFiles.php
View File

@@ -85,8 +85,8 @@ class MediaFiles
$acceptFileTypes = flextype('registry')->get('flextype.settings.media.accept_file_types');
$maxFileSize = flextype('registry')->get('flextype.settings.media.max_file_size');
$safeNames = flextype('registry')->get('flextype.settings.media.safe_names');
$maxImageWidth = flextype('registry')->get('flextype.settings.media.max_image_width');
$maxImageHeight = flextype('registry')->get('flextype.settings.media.max_image_height');
$maxImageWidth = flextype('registry')->get('flextype.settings.media.images.max_image_width');
$maxImageHeight = flextype('registry')->get('flextype.settings.media.images.max_image_height');
$exact = false;
$chmod = 0644;
@@ -149,29 +149,30 @@ class MediaFiles
chmod($filename, $chmod);
if (in_array(mime_content_type($filename), ['image/jpeg', 'image/jpg', 'image/png', 'image/gif'])) {
// open an image file
$img = Image::make($filename);
// now you are able to resize the instance
if (flextype('registry')->get('flextype.settings.media.image_width') > 0 && flextype('registry')->get('flextype.settings.media.image_height') > 0) {
$img->resize(flextype('registry')->get('flextype.settings.media.image_width'), flextype('registry')->get('flextype.settings.media.image_height'), static function ($constraint): void {
if (flextype('registry')->get('flextype.settings.media.images.image_width') > 0 && flextype('registry')->get('flextype.settings.media.images.image_height') > 0) {
$img->resize(flextype('registry')->get('flextype.settings.media.images.image_width'), flextype('registry')->get('flextype.settings.media.images.image_height'), static function ($constraint): void {
$constraint->aspectRatio();
$constraint->upsize();
});
} elseif (flextype('registry')->get('flextype.settings.media.image_width') > 0) {
$img->resize(flextype('registry')->get('flextype.settings.media.image_width'), null, static function ($constraint): void {
} elseif (flextype('registry')->get('flextype.settings.media.images.image_width') > 0) {
$img->resize(flextype('registry')->get('flextype.settings.media.images.image_width'), null, static function ($constraint): void {
$constraint->aspectRatio();
$constraint->upsize();
});
} elseif (flextype('registry')->get('flextype.settings.media.image_height') > 0) {
$img->resize(null, flextype('registry')->get('flextype.settings.media.image_height'), static function ($constraint): void {
} elseif (flextype('registry')->get('flextype.settings.media.images.image_height') > 0) {
$img->resize(null, flextype('registry')->get('flextype.settings.media.images.image_height'), static function ($constraint): void {
$constraint->aspectRatio();
$constraint->upsize();
});
}
// finally we save the image as a new file
$img->save($filename, flextype('registry')->get('flextype.settings.media.image_quality'));
$img->save($filename, flextype('registry')->get('flextype.settings.media.images.image_quality'));
// destroy
$img->destroy();
@@ -233,7 +234,8 @@ class MediaFiles
isset($options['collection']) &&
strings($options['collection'])->isTrue()
) {
$result = [];
$result = [];
foreach (filesystem()->find()->files()->in(flextype('media')->folders()->meta()->getDirectoryMetaLocation($id)) as $file) {
$basename = $file->getBasename('.' . $file->getExtension());

2
src/flextype/dependencies.php
View File

@@ -220,7 +220,7 @@ flextype()->container()['serializers'] = fn() => new Serializers();
*/
flextype()->container()['images'] = static function () {
// Get images settings
$imagesSettings = ['driver' => flextype('registry')->get('flextype.settings.image.driver')];
$imagesSettings = ['driver' => flextype('registry')->get('flextype.settings.media.image.driver')];
// Set source filesystem
$source = new Flysystem(

22
src/flextype/settings.yaml
View File

@@ -333,18 +333,8 @@ slugify:
lowercase_after_regexp: false
strip_tags: false
# Image
#
# - driver: gd or imagick
image:
driver: gd
# Markdown
#
# - markdown.auto_line_breaks: Enable automatic line breaks
# - markdown.auto_url_links: Enable automatic HTML links
# - markdown.escape_markup: Escape markup tags into entities
#
# Shortcode
#
# - shortcodes: Flextype Shortcodes to load.
@@ -418,11 +408,13 @@ media:
accept_file_types: 'gif, jpg, jpeg, png, ico, zip, tgz, txt, md, doc, docx, pdf, epub, xls, xlsx, ppt, pptx, mp3, ogg, wav, m4a, mp4, m4v, ogv, wmv, avi, webm, svg'
max_file_size: 8000000
safe_names: true
image_width: 1600
image_height: 0
image_quality: 70
max_image_width: null
max_image_height: null
images:
driver: gd
image_width: 1600
image_height: 0
image_quality: 70
max_image_width: null
max_image_height: null
# Session
#