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.

Sign up for GitHub

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

Hotfix/transform source path #4

Merged
merged 4 commits into from
Nov 19, 2020
Merged

Hotfix/transform source path #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0d6c50
Updated master image source to use transform source path instead of url
Nov 16, 2020
6dca08c
Updated readme
Nov 16, 2020
4f2471a
Closes #3 - updated file extenstion regex pattern
codewithkyle Nov 19, 2020
63ba038
Updated changelog
codewithkyle Nov 19, 2020
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
10 changes: 9 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p

## [Unreleased]

## [1.1.1] - 2020-11-19

### Fixed

- changed `$asset->url` to `$asset->getImageTransformSourcePath()` ([#3](https://github.com/codewithkyle/craft-jitter/issues/3))
- changed file extension regex pattern from `/(\..*)$/` to `/(\..{1,4})$/` ([#3](https://github.com/codewithkyle/craft-jitter/issues/3))

## [1.1.0] - 2020-10-26

### Added
Expand All @@ -26,6 +33,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- delete local files
- delete S3 files

[Unreleased]: https://github.com/codewithkyle/craft-jitter/compare/v1.1.0...HEAD
[Unreleased]: https://github.com/codewithkyle/craft-jitter/compare/v1.1.1...HEAD
[1.1.1]: https://github.com/codewithkyle/craft-jitter/compare/v1.1.0...v1.1.1
[1.1.0]: https://github.com/codewithkyle/craft-jitter/compare/v1.0.0...v1.1.0
[1.0.0]: https://github.com/codewithkyle/craft-jitter/releases/tag/v1.0.0
25 changes: 13 additions & 12 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,19 @@ Requesting an image transformation via Twig:

Transformation parameters:

| Parameter | Default | Description | Valid options |
| ------------- | ------------------------ | ------------------------------- | -------------------------------------- |
| `id` | `null` | the image asset id (required) | `int` |
| `w` | base image width | desired image width | `int` |
| `h` | base image height | desired image height | `int` |
| `ar` | base image aspect ratio | desired aspect ratio | `int:int` |
| `fm` | `auto` | desired image format | `jpg`, `png`, `gif`, `auto` |
| `q` | `80` | desired image quality | `0` to `100` |
| `m` | `clip` | how the image should be resized | `crop`, `clip`, `fit`, `letterbox` |
| `bg` | `ffffff` | letterbox background color | `hex` |
| `fp-x` | `0.5` | horizontal focus point | `0` to `1` |
| `fp-y` | `0.5` | vertical focus point | `0` to `1` |
| Parameter | Default | Description | Valid options |
| ------------- | -------------------------- | ------------------------------- | -------------------------------------- |
| `id` | `null` | the image asset id | `int` |
| `path` | `null` | the image asset id | `int` |
| `w` | base image width | desired image width | `int` |
| `h` | base image height | desired image height | `int` |
| `ar` | base image aspect ratio | desired aspect ratio | `int`:`int` |
| `fm` | `auto` | desired image format | `jpg`, `png`, `gif`, `auto` |
| `q` | `80` | desired image quality | `0` to `100` |
| `m` | `clip` | how the image should be resized | `crop`, `clip`, `fit`, `letterbox` |
| `bg` | `ffffff` | letterbox background color | `hex` |
| `fp-x` | `0.5` or asset focal point | horizontal focus point | `0` to `1` |
| `fp-y` | `0.5` or asset focal point | vertical focus point | `0` to `1` |

The `auto` format type will return a `webp` image when the server can generate the format and the client's browser supports the format.

Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "codewithkyle/jitter",
"description": "A just in time image transformation service.",
"type": "craft-plugin",
"version": "1.1.0",
"version": "1.1.1",
"keywords": [
"craft",
"cms",
Expand Down
14 changes: 7 additions & 7 deletions src/services/Transform.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public function generateSourceSet(string $id, array $images): string
}
else
{
$masterImage = $asset->url;
$masterImage = $asset->getImageTransformSourcePath();
}
if ($masterImage)
{
Expand Down Expand Up @@ -165,21 +165,21 @@ public function transformImage(array $params, bool $clientAcceptsWebp): array
}
else
{
$masterImage = $asset->url;
$masterImage = $asset->getImageTransformSourcePath();
}
}
else if (isset($params['path']))
{
$masterImage = $params['path'];
}

preg_match("/(\..*)$/", $asset->filename, $matches);
preg_match("/(\..{1,4})$/", $asset->filename, $matches);
$baseType = strtolower(ltrim($matches[0], "."));

// Build transform details
$transform = $this->getImageTransformSettings($params, $masterImage, $asset);
$uid = $this->buildTransformUid($transform);
$filename = preg_replace("/(\..*)$/", '', $asset->filename) . '-' . $uid;
$filename = preg_replace("/(\..{1,4})$/", '', $asset->filename) . '-' . $uid;

// Create S3 client (if possible)
$settings = [];
Expand Down Expand Up @@ -225,7 +225,7 @@ public function transformImage(array $params, bool $clientAcceptsWebp): array
$cleanName = preg_replace("/.*\//", '', $cleanName);
$response['url'] = "/jitter/" . $cleanName;
$response['type'] = 'local';
preg_match("/(\..*)$/", $existingFile, $matches);
preg_match("/(\..{1,4})$/", $existingFile, $matches);
$contentType = ltrim($matches[0], ".");
switch ($contentType)
{
Expand Down Expand Up @@ -253,7 +253,7 @@ public function transformImage(array $params, bool $clientAcceptsWebp): array
// Save the output
if ($s3)
{
preg_match("/(\..*)$/", $finalImage, $matches);
preg_match("/(\..{1,4})$/", $finalImage, $matches);
$finalImageType = $matches[0];
$uri = "/" . str_replace('\\', '/', $finalImage);
$uri = preg_replace("/.*\//", '', $uri);
Expand Down Expand Up @@ -288,7 +288,7 @@ public function transformImage(array $params, bool $clientAcceptsWebp): array
copy($finalImage, FileHelper::normalizePath($publicPath. DIRECTORY_SEPARATOR . $cleanName));
$response['url'] = "/jitter/" . $cleanName;
$response['type'] = 'local';
preg_match("/(\..*)$/", $finalImage, $matches);
preg_match("/(\..{1,4})$/", $finalImage, $matches);
$contentType = ltrim($matches[0], ".");
switch ($contentType)
{
Expand Down