Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Image Compression #15

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
"locomotivemtl/charcoal-core": "~0.6",
"locomotivemtl/charcoal-factory": "~0.4",
"locomotivemtl/charcoal-image": "~0.4",
"locomotivemtl/charcoal-translator": "~0.3"
"locomotivemtl/charcoal-translator": "~0.3",
"locomotivemtl/charcoal-image-compression": "~0.1"
},
"require-dev": {
"phpunit/phpunit": "^5.7 || ^6.5",
Expand Down
27 changes: 27 additions & 0 deletions src/Charcoal/Property/ImageProperty.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace Charcoal\Property;

use Charcoal\ImageCompression\ImageCompressor;
use Charcoal\ImageCompression\Service\ImageCompressionService;
use InvalidArgumentException;
use OutOfBoundsException;

Expand All @@ -14,6 +16,7 @@

// From 'charcoal-property'
use Charcoal\Property\FileProperty;
use Pimple\Container;

/**
* Image Property.
Expand Down Expand Up @@ -57,6 +60,24 @@ class ImageProperty extends FileProperty
*/
private $imageFactory;

/**
* @var ImageCompressionService
*/
private $imageCompression;

/**
* Inject dependencies from a DI Container.
*
* @param Container $container A dependencies container instance.
* @return void
*/
protected function setDependencies(Container $container)
{
parent::setDependencies($container);

$this->imageCompression = $container['image-compression'];
}

/**
* @return string
*/
Expand Down Expand Up @@ -325,6 +346,10 @@ public function save($val)
$val = $this->processEffects($val);
}

if ($val) {
$this->imageCompression->compress($val);
}

Comment on lines +349 to +352
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we using effects to create intermediate images (what we expect to show on the web site), why compress the the selected (original) image?

If we want to compress the original image, we should be attaching the image compression service to the ElfinderConnectorAction in charcoal-admin instead of charcoal-property.

return $val;
}

Expand Down Expand Up @@ -584,4 +609,6 @@ private function processEffectsOne($value, array $effects = null, ImageInterface

return $value;
}


Comment on lines +612 to +613
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Superfluous line breaks

Suggested change

}