Skip to content
This repository has been archived by the owner on Jan 6, 2023. It is now read-only.

[thumbnailer] Support for files in subdirectories #856

Merged
merged 1 commit into from
May 3, 2019
Merged

[thumbnailer] Support for files in subdirectories #856

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
110 changes: 38 additions & 72 deletions src/core/Directus/Filesystem/Thumbnailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class Thumbnailer {
* @param Filesystem $main
* @param Filesystem $thumb
* @param array $config
* @param string $path in the form '_/100/100/crop/good/some-image.jpg'
* @param string $path in the form '_/100/100/crop/good/path/to/some-image.jpg'
*
* @throws Exception
*/
Expand Down Expand Up @@ -217,84 +217,50 @@ public function crop()
*/
public function extractThumbnailParams($thumbnailUrlPath)
{
try {
if ($this->thumbnailParams) {
return $this->thumbnailParams;
}

$urlSegments = explode('/', $thumbnailUrlPath);

// pull the env out of the segments
array_shift($urlSegments);

if (! $urlSegments) {
throw new Exception('Invalid thumbnailUrlPath.');
}

// pop off the filename
$fileName = ArrayUtils::pop($urlSegments);

// make sure filename is valid
$ext = pathinfo($fileName, PATHINFO_EXTENSION);
$name = pathinfo($fileName, PATHINFO_FILENAME);
if (! $this->isSupportedFileExtension($ext)) {
throw new Exception('Invalid file extension.');
}

$thumbnailParams = [
'fileName' => filename_put_ext($name, $ext),
'fileExt' => $ext
];

foreach ($urlSegments as $segment) {

if (! $segment) continue;

$hasWidth = ArrayUtils::get($thumbnailParams, 'width');
$hasHeight = ArrayUtils::get($thumbnailParams, 'height');
// extract width and height
if ((!$hasWidth || !$hasHeight) && is_numeric($segment)) {
if (!$hasWidth) {
ArrayUtils::set($thumbnailParams, 'width', $segment);
} else if (!$hasHeight) {
ArrayUtils::set($thumbnailParams, 'height', $segment);
}
}

// extract action and quality
else {
if (!ArrayUtils::get($thumbnailParams, 'action')) {
ArrayUtils::set($thumbnailParams, 'action', $segment);
} else if (!ArrayUtils::get($thumbnailParams, 'quality')) {
ArrayUtils::set($thumbnailParams, 'quality', $segment);
}
}
}
// cache
if ($this->thumbnailParams) {
return $this->thumbnailParams;
}

// validate
if (! ArrayUtils::contains($thumbnailParams, [
'width',
'height'
])) {
throw new Exception('No height or width provided.');
}
// get URL parts
// https://docs.directus.io/guides/thumbnailer.html#url-syntax
$urlSegments = explode('/', $thumbnailUrlPath);
if (count($urlSegments) < 6) {
throw new Exception('Invalid URL syntax.');
}

// set default action, if needed
if (! ArrayUtils::exists($thumbnailParams, 'action')) {
ArrayUtils::set($thumbnailParams, 'action', null);
}
// pull the env out of the segments
array_shift($urlSegments);

// set quality to null, if needed
if (! ArrayUtils::exists($thumbnailParams, 'quality')) {
ArrayUtils::set($thumbnailParams, 'quality', null);
}
// set thumbnail parameters
$thumbnailParams = [
'action' => filter_var($urlSegments[2], FILTER_SANITIZE_STRING),
'height' => filter_var($urlSegments[1], FILTER_SANITIZE_NUMBER_INT),
'quality' => filter_var($urlSegments[3], FILTER_SANITIZE_STRING),
'width' => filter_var($urlSegments[0], FILTER_SANITIZE_NUMBER_INT),
];

return $thumbnailParams;
// validate parameters
if (! ArrayUtils::contains($thumbnailParams, [
'width',
'height'
])) {
throw new Exception('No height or width provided.');
}

catch (Exception $e) {
throw $e;
// make sure filename is valid
$filename = implode('/', array_slice($urlSegments, 4));
$ext = pathinfo($filename, PATHINFO_EXTENSION);
$name = pathinfo($filename, PATHINFO_FILENAME);
if (! $this->isSupportedFileExtension($ext)) {
throw new Exception('Invalid file extension.');
}

// Set thumbnail filename parameters
$thumbnailParams['fileName'] = $filename;
$thumbnailParams['fileExt'] = $ext;

return $thumbnailParams;
}

/**
Expand Down