Thomas/Piwigo_Bratonien_Tools
1
0
Fork 0
mirror of https://github.com/Terranom674/Piwigo_Bratonien_Tools.git synced 2026-09-19 14:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Serve precached watermarks as static derivatives

Browse Source
This commit is contained in:
Terranom674
2026-08-15 16:51:12 +02:00
parent 3e566cccdb
commit 40f1b68890
1 changed files with 74 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
include/watermark_runtime.inc.php
View File

@@ -137,8 +137,73 @@ function bratonien_tools_runtime_profile_version(array $profile)
return substr(sha1(implode('|', $parts)), 0, 16); return substr(sha1(implode('|', $parts)), 0, 16);
} }
function bratonien_tools_runtime_cache_descriptor($rel_url, array $profile, $params, $source_path, $extension='')
{
if (!$params || !$source_path)
{
return null;
}
$watermark_path = bratonien_tools_profile_watermark_path($profile);
if (!$watermark_path)
{
return null;
}
$extension = strtolower((string)$extension);
if ($extension === '' && preg_match('/\.(jpe?g|png|gif|webp)(?:$|\?)/i', (string)$rel_url, $match))
{
$extension = strtolower($match[1]);
}
if (!in_array($extension, array('jpg','jpeg','png','gif','webp'), true))
{
$extension = 'jpg';
}
$profile_id = (int)($profile['id'] ?? 0);
if ($profile_id <= 0)
{
return null;
}
$scale_percent = isset($profile['scale_percent']) ? max(1.0, min(1000.0, (float)$profile['scale_percent'])) : 100.0;
$profile_version = bratonien_tools_runtime_profile_version($profile);
$min_size = is_array($params->sizing->min_size) ? implode('x', $params->sizing->min_size) : '';
$cache_fingerprint = array(
$rel_url,
$profile_version,
@filemtime($source_path) ?: 0,
$params->last_mod_time,
$params->sharpen,
implode('x', $params->sizing->ideal_size),
$params->sizing->max_crop,
$min_size,
$profile['watermark_file'], $scale_percent, $profile['xpos'], $profile['ypos'],
$profile['xrepeat'], $profile['yrepeat'], $profile['opacity'],
$profile['min_width'], $profile['min_height'], $profile['active'],
@filemtime($watermark_path),
);
$relative_dir = PWG_DERIVATIVE_DIR.'bratonien-watermark/'.$profile_id;
$filename = sha1(implode('|', $cache_fingerprint)).'.'.$extension;
$relative_path = $relative_dir.'/'.$filename;
return array(
'dir' => PHPWG_ROOT_PATH.$relative_dir,
'path' => PHPWG_ROOT_PATH.$relative_path,
'relative_path' => $relative_path,
'url' => get_root_url().$relative_path,
'profile_version' => $profile_version,
);
}
function bratonien_tools_filter_derivative_url($url, $params, $src_image, $rel_url) function bratonien_tools_filter_derivative_url($url, $params, $src_image, $rel_url)
{ {
if (defined('BRATONIEN_TOOLS_PRECACHE_BUILD') && BRATONIEN_TOOLS_PRECACHE_BUILD)
{
return $url;
}
if (!bratonien_tools_watermark_engine_enabled()) if (!bratonien_tools_watermark_engine_enabled())
{ {
return $url; return $url;
@@ -170,6 +235,15 @@ function bratonien_tools_filter_derivative_url($url, $params, $src_image, $rel_u
} }
} }
if (is_object($params) && is_object($src_image))
{
$descriptor = bratonien_tools_runtime_cache_descriptor($rel_url, $profile, $params, $src_image->get_path());
if ($descriptor && is_file($descriptor['path']) && is_readable($descriptor['path']))
{
return $descriptor['url'];
}
}
$profile_id = (int)$profile['id']; $profile_id = (int)$profile['id'];
$profile_version = bratonien_tools_runtime_profile_version($profile); $profile_version = bratonien_tools_runtime_profile_version($profile);
$signature = bratonien_tools_runtime_sign($rel_url, $profile_id, $profile_version); $signature = bratonien_tools_runtime_sign($rel_url, $profile_id, $profile_version);