From 77e20af977d005125e948f2fb6728e72dc3b9054 Mon Sep 17 00:00:00 2001 From: Terranom674 Date: Wed, 19 Aug 2026 22:30:34 +0200 Subject: [PATCH 1/3] 0.9.7.11: Fotorama Derivate erst bei Abruf erzeugen --- include/webdav_gallery_runtime.inc.php | 57 ++++++++++---------------- 1 file changed, 21 insertions(+), 36 deletions(-) diff --git a/include/webdav_gallery_runtime.inc.php b/include/webdav_gallery_runtime.inc.php index 2c1a79a..97d5b7c 100644 --- a/include/webdav_gallery_runtime.inc.php +++ b/include/webdav_gallery_runtime.inc.php @@ -40,6 +40,17 @@ function bratonien_tools_webdav_derivative_matches_preview($derivative_path, $pa return true; } +function bratonien_tools_webdav_ondemand_derivative_url($image_id, $params) +{ + $image_id = (int)$image_id; + if ($image_id < 1 || !is_object($params)) return null; + + $type = trim((string)($params->type ?? '')); + if ($type === '') return null; + + return get_root_url().'plugins/'.BRATONIEN_TOOLS_ID.'/webdav-derivative.php?id='.$image_id.'&type='.rawurlencode($type); +} + function bratonien_tools_filter_webdav_gallery_derivative_url($url, $params, $src_image, $rel_url) { if (!is_object($src_image) || empty($src_image->id) || empty($src_image->rel_path)) return $url; @@ -51,7 +62,6 @@ function bratonien_tools_filter_webdav_gallery_derivative_url($url, $params, $sr } $image_id = (int)$src_image->id; - $derivative_path = ''; try { $derivative = new DerivativeImage($params, $src_image); @@ -69,45 +79,20 @@ function bratonien_tools_filter_webdav_gallery_derivative_url($url, $params, $sr error_log('Bratonien WebDAV derivative lookup #'.$image_id.': '.$e->getMessage()); } + // Auf der Picture-/Fotorama-Seite wird nicht mehr waehrend des HTML-Aufbaus + // synchron erzeugt. Fotorama arbeitet lazy: Erst wenn das konkrete Bild in + // den Fokus kommt und seine URL abruft, erzeugt dieser Endpoint genau dieses + // angeforderte Standard-Derivat aus dem bereits gecachten NC-Preview. $script_name = basename((string)($_SERVER['SCRIPT_NAME'] ?? '')); - if ($script_name === 'picture.php' && function_exists('bratonien_tools_webdav_generate_derivative')) + if ($script_name === 'picture.php') { - if ($derivative_path !== '' && is_file($derivative_path) && !bratonien_tools_webdav_derivative_matches_preview($derivative_path, $params, $image_id)) - { - @unlink($derivative_path); - clearstatcache(true, $derivative_path); - } - - $detail = ''; - try - { - if (bratonien_tools_webdav_generate_derivative($params, $src_image, $detail)) - { - if ($derivative_path === '') - { - $probe = new DerivativeImage($params, $src_image); - if (!$probe->same_as_source()) $derivative_path = $probe->get_path(); - } - if (bratonien_tools_webdav_derivative_matches_preview($derivative_path, $params, $image_id)) - { - return $url; - } - } - } - catch (Throwable $e) - { - $detail = get_class($e).': '.$e->getMessage(); - } - - if ($detail !== '') - { - error_log('Bratonien WebDAV picture derivative #'.$image_id.': '.$detail); - } + $ondemand_url = bratonien_tools_webdav_ondemand_derivative_url($image_id, $params); + if ($ondemand_url) return $ondemand_url; } - // Connector-Platzhalter oder daraus entstandene Derivate werden nie ausgeliefert. - // Wenn noch kein echtes lokales Derivat bereitsteht, geht der Request immer auf - // die echte WebDAV-Bildquelle bzw. deren vorbereitetes Preview. + // Galerie-Fallback: niemals Connector-Platzhalter ausliefern. Solange kein + // lokales korrektes Derivat vorliegt, wird das echte vorbereitete NC-Preview + // verwendet. Der eigentliche Galerie-Derivattyp wird beim Sync vorgebaut. $preview_url = bratonien_tools_webdav_image_url($image_id, true); return $preview_url ?: $url; } From 981ba6c18b0cff46478628119bc330b616f740b0 Mon Sep 17 00:00:00 2001 From: Terranom674 Date: Wed, 19 Aug 2026 22:30:52 +0200 Subject: [PATCH 2/3] 0.9.7.11: On-Demand WebDAV Derivat Endpoint --- webdav-derivative.php | 126 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 webdav-derivative.php diff --git a/webdav-derivative.php b/webdav-derivative.php new file mode 100644 index 0000000..999945a --- /dev/null +++ b/webdav-derivative.php @@ -0,0 +1,126 @@ +'category_id'), null, true); +$access_result = pwg_query('SELECT 1 FROM '.IMAGE_CATEGORY_TABLE.' WHERE image_id='.$image_id.' AND '.$permission_condition.' LIMIT 1'); +if (!pwg_db_num_rows($access_result)) +{ + bratonien_tools_webdav_derivative_abort(403, 'Kein Zugriff auf dieses Bild.'); +} + +if (!class_exists('ImageStdParams') || !class_exists('DerivativeImage') || !class_exists('SrcImage')) +{ + require_once(PHPWG_ROOT_PATH.'include/derivative.inc.php'); +} + +$params = @ImageStdParams::get_by_type($type); +if (!$params) +{ + bratonien_tools_webdav_derivative_abort(404, 'Unbekannter Piwigo-Derivattyp.'); +} + +$result = pwg_query('SELECT * FROM '.IMAGES_TABLE.' WHERE id='.$image_id.' LIMIT 1'); +if (!pwg_db_num_rows($result)) +{ + bratonien_tools_webdav_derivative_abort(404, 'Bild wurde nicht gefunden.'); +} +$row = pwg_db_fetch_assoc($result); +$src = new SrcImage($row); +$info = bratonien_tools_webdav_image_source_info($image_id); +if (!$info) +{ + bratonien_tools_webdav_derivative_abort(404, 'Keine WebDAV-Quelle fuer dieses Bild gefunden.'); +} + +$preview = bratonien_tools_webdav_preview_path($info); +if (!$preview || !is_file($preview) || !is_readable($preview)) +{ + bratonien_tools_webdav_derivative_abort(404, 'Nextcloud-Preview ist noch nicht vorbereitet.'); +} + +$derivative = new DerivativeImage($params, $src); +if ($derivative->same_as_source()) +{ + bratonien_tools_webdav_derivative_abort(404, 'Derivat entspricht der Platzhalterquelle und wird nicht ausgeliefert.'); +} + +$target = $derivative->get_path(); +if ($target === '') +{ + bratonien_tools_webdav_derivative_abort(500, 'Derivat-Zielpfad fehlt.'); +} + +if (!bratonien_tools_webdav_derivative_matches_preview($target, $params, $image_id)) +{ + if (is_file($target)) + { + @unlink($target); + clearstatcache(true, $target); + } + + $detail = ''; + if (!bratonien_tools_webdav_generate_derivative($params, $src, $detail)) + { + error_log('Bratonien WebDAV on-demand derivative #'.$image_id.' type='.$type.': '.$detail); + bratonien_tools_webdav_derivative_abort(503, 'Derivat konnte noch nicht erzeugt werden.'); + } +} + +if (!bratonien_tools_webdav_derivative_matches_preview($target, $params, $image_id)) +{ + bratonien_tools_webdav_derivative_abort(503, 'Erzeugtes Derivat ist noch nicht gueltig.'); +} + +$size = @filesize($target); +$mtime = @filemtime($target) ?: time(); +$etag = sha1($target.'|'.$mtime.'|'.($size ?: 0)); +$extension = strtolower(pathinfo($target, PATHINFO_EXTENSION)); +$content_type = 'image/jpeg'; +if ($extension === 'png') $content_type = 'image/png'; +elseif ($extension === 'gif') $content_type = 'image/gif'; +elseif ($extension === 'webp') $content_type = 'image/webp'; + +header('Content-Type: '.$content_type); +if ($size !== false) header('Content-Length: '.(string)$size); +header('ETag: "'.$etag.'"'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s', $mtime).' GMT'); +header('Cache-Control: private, max-age=86400, must-revalidate'); +header('X-Content-Type-Options: nosniff'); + +$client_etag = trim((string)($_SERVER['HTTP_IF_NONE_MATCH'] ?? ''), " \t\r\n\""); +if ($client_etag !== '' && hash_equals($etag, $client_etag)) +{ + http_response_code(304); + exit; +} + +if (($_SERVER['REQUEST_METHOD'] ?? 'GET') !== 'HEAD') +{ + readfile($target); +} From 85369fa15ee853576ca72f5039dfb468f7d47880 Mon Sep 17 00:00:00 2001 From: Terranom674 Date: Wed, 19 Aug 2026 22:31:13 +0200 Subject: [PATCH 3/3] Version 0.9.7.11 --- main.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.inc.php b/main.inc.php index f9c78c7..c1a0fd0 100644 --- a/main.inc.php +++ b/main.inc.php @@ -1,7 +1,7 @@