0.9.7.12: Version anheben

0.9.7.11: Fotorama-Derivate on demand erzeugen

include/webdav_gallery_runtime.inc.php

@@ -4,6 +4,53 @@ if (!defined('PHPWG_ROOT_PATH'))
   die('Hacking attempt!');
 }
 
+function bratonien_tools_webdav_derivative_matches_preview($derivative_path, $params, $image_id)
+{
+  $derivative_path = (string)$derivative_path;
+  $image_id = (int)$image_id;
+  if ($derivative_path === '' || $image_id < 1 || !is_file($derivative_path) || !is_readable($derivative_path)) return false;
+
+  $info = bratonien_tools_webdav_image_source_info($image_id);
+  if (!$info) return false;
+
+  $preview = bratonien_tools_webdav_preview_path($info);
+  if (!$preview || !is_file($preview) || !is_readable($preview)) return false;
+
+  $preview_size = @getimagesize($preview);
+  $derivative_size = @getimagesize($derivative_path);
+  if (!is_array($preview_size) || empty($preview_size[0]) || empty($preview_size[1])) return false;
+  if (!is_array($derivative_size) || empty($derivative_size[0]) || empty($derivative_size[1])) return false;
+
+  try
+  {
+    $expected_size = $params->compute_final_size(array((int)$preview_size[0], (int)$preview_size[1]));
+  }
+  catch (Throwable $e)
+  {
+    return false;
+  }
+
+  if (!is_array($expected_size) || !isset($expected_size[0], $expected_size[1])) return false;
+  if ((int)$derivative_size[0] !== (int)$expected_size[0] || (int)$derivative_size[1] !== (int)$expected_size[1]) return false;
+
+  $preview_mtime = @filemtime($preview) ?: 0;
+  $derivative_mtime = @filemtime($derivative_path) ?: 0;
+  if ($preview_mtime > 0 && $derivative_mtime < $preview_mtime) return false;
+
+  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;
@@ -14,13 +61,14 @@ function bratonien_tools_filter_webdav_gallery_derivative_url($url, $params, $sr
     return $url;
   }
 
+  $image_id = (int)$src_image->id;
   try
   {
     $derivative = new DerivativeImage($params, $src_image);
     if (!$derivative->same_as_source())
     {
-      $path = $derivative->get_path();
-      if ($path !== '' && is_file($path) && is_readable($path))
+      $derivative_path = $derivative->get_path();
+      if (bratonien_tools_webdav_derivative_matches_preview($derivative_path, $params, $image_id))
       {
         return $url;
       }
@@ -28,9 +76,23 @@ function bratonien_tools_filter_webdav_gallery_derivative_url($url, $params, $sr
   }
   catch (Throwable $e)
   {
-    error_log('Bratonien WebDAV gallery derivative lookup #'.(int)$src_image->id.': '.$e->getMessage());
+    error_log('Bratonien WebDAV derivative lookup #'.$image_id.': '.$e->getMessage());
   }
 
-  $preview_url = bratonien_tools_webdav_image_url((int)$src_image->id, true);
+  // 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')
+  {
+    $ondemand_url = bratonien_tools_webdav_ondemand_derivative_url($image_id, $params);
+    if ($ondemand_url) return $ondemand_url;
+  }
+
+  // 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;
 }

main.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Bratonien Tools
-Version: 0.9.7.7
+Version: 0.9.7.12
 Description: Erweiterbare Administrationswerkzeuge fuer die Bratonien-Piwigo-Installation.
 Plugin URI: https://github.com/Terranom674/Piwigo_Bratonien_Tools
 Author: Bratonien

runtime/lib/build-webdav-derivatives.php

@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli')
   exit(1);
 }
 
-const BRATONIEN_WEBDAV_DERIVATIVE_BUILDER_VERSION = '0.9.7.5';
+const BRATONIEN_WEBDAV_DERIVATIVE_BUILDER_VERSION = '0.9.7.8';
 
 $options = getopt('', array('piwigo-root:', 'connection-id:'));
 $piwigo_root = rtrim((string)($options['piwigo-root'] ?? ''), '/');
@@ -46,25 +46,75 @@ if (!function_exists('bratonien_tools_webdav_image_source_info') || !function_ex
   exit(1);
 }
 
-try
+function bratonien_tools_webdav_modus_config()
 {
-  $standard_gallery = ImageStdParams::get_by_type(IMG_THUMB);
-  if (!$standard_gallery || !isset($standard_gallery->sizing->ideal_size))
+  global $conf;
+
+  $modus = $conf['modus_theme'] ?? array();
+  if (is_string($modus) && $modus !== '')
+  {
+    $decoded = @unserialize($modus);
+    if (is_array($decoded)) $modus = $decoded;
+  }
+  if (!is_array($modus)) $modus = array();
+
+  return array_merge(
+    array(
+      'index_photo_deriv'=>'2small',
+      'index_photo_deriv_hdpi'=>'xsmall',
+    ),
+    $modus
+  );
+}
+
+function bratonien_tools_webdav_gallery_base_params()
+{
+  $modus = bratonien_tools_webdav_modus_config();
+  $type = trim((string)($modus['index_photo_deriv'] ?? '2small'));
+  $params = $type !== '' ? @ImageStdParams::get_by_type($type) : null;
+  if ($params) return $params;
+
+  $params = ImageStdParams::get_by_type(IMG_THUMB);
+  if (!$params)
   {
     throw new RuntimeException('Piwigo-Galeriederivat ist nicht konfiguriert.');
   }
+  return $params;
+}
 
-  $gallery_params = clone $standard_gallery;
-  $gallery_params->sizing = new SizingParams(
-    array(
-      (int)$standard_gallery->sizing->ideal_size[0],
-      (int)$standard_gallery->sizing->ideal_size[1],
-    ),
-    0,
-    null
-  );
-  $gallery_params->type = IMG_THUMB;
-  $gallery_params->use_watermark = false;
+function bratonien_tools_webdav_modus_gallery_params(SrcImage $src, $base_params)
+{
+  $row_height = (int)$base_params->max_height();
+  $candidates = array($base_params);
+
+  foreach (ImageStdParams::get_defined_type_map() as $params)
+  {
+    if (
+      $params->max_height() > $row_height
+      && $params->sizing->max_crop == $base_params->sizing->max_crop
+    )
+    {
+      $candidates[] = $params;
+      if (count($candidates) === 3) break;
+    }
+  }
+
+  $selected = $base_params;
+  foreach ($candidates as $params)
+  {
+    $selected = $params;
+    $probe = new DerivativeImage($params, $src);
+    $size = $probe->get_size();
+    if ((int)$size[1] >= $row_height - 2) break;
+  }
+
+  return $selected;
+}
+
+try
+{
+  $gallery_base_params = bratonien_tools_webdav_gallery_base_params();
+  $gallery_base_type = (string)$gallery_base_params->type;
 
   $images = 0;
   $generated_or_ready = 0;
@@ -73,6 +123,7 @@ try
   $legacy_derivatives_rebuilt = 0;
   $errors = 0;
   $error_lines = array();
+  $variant_counts = array();
 
   $result = pwg_query('SELECT * FROM '.IMAGES_TABLE.' ORDER BY id');
   while ($row = pwg_db_fetch_assoc($result))
@@ -124,6 +175,11 @@ try
     $src = new SrcImage($row);
     try
     {
+      $gallery_params = bratonien_tools_webdav_modus_gallery_params($src, $gallery_base_params);
+      $variant = (string)$gallery_params->type;
+      if ($variant === '') $variant = 'custom';
+      $variant_counts[$variant] = ($variant_counts[$variant] ?? 0) + 1;
+
       $probe = new DerivativeImage($gallery_params, $src);
       if ($probe->same_as_source())
       {
@@ -190,9 +246,18 @@ try
     }
   }
 
+  ksort($variant_counts);
+  $variant_parts = array();
+  foreach ($variant_counts as $type=>$count)
+  {
+    $variant_parts[] = $type.':'.$count;
+  }
+
   echo 'WebDAV-Derivative-Builder: version='.BRATONIEN_WEBDAV_DERIVATIVE_BUILDER_VERSION.
     ' bilder='.$images.
-    ' varianten=1'.
+    ' varianten_pro_bild=1'.
+    ' modus_basis='.$gallery_base_type.
+    ' modus_varianten='.implode(',', $variant_parts).
     ' bereit='.$generated_or_ready.
     ' identisch='.$identity.
     ' metadaten_repariert='.$metadata_repaired.

webdav-derivative.php

@@ -0,0 +1,144 @@
+<?php
+define('PHPWG_ROOT_PATH', '../../');
+include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
+
+if (!defined('BRATONIEN_TOOLS_PATH'))
+{
+  define('BRATONIEN_TOOLS_ID', basename(__DIR__));
+  define('BRATONIEN_TOOLS_PATH', PHPWG_ROOT_PATH.'plugins/'.BRATONIEN_TOOLS_ID.'/');
+}
+
+require_once(BRATONIEN_TOOLS_PATH.'include/webdav_image_runtime.inc.php');
+require_once(BRATONIEN_TOOLS_PATH.'include/webdav_gallery_runtime.inc.php');
+
+function bratonien_tools_webdav_derivative_abort($status, $message)
+{
+  http_response_code((int)$status);
+  header('Content-Type: text/plain; charset=utf-8');
+  header('Cache-Control: no-store');
+  echo $message;
+  exit;
+}
+
+function bratonien_tools_webdav_derivative_fallback($image_id)
+{
+  $url = bratonien_tools_webdav_image_url((int)$image_id, false);
+  if (!$url)
+  {
+    bratonien_tools_webdav_derivative_abort(404, 'WebDAV-Bildquelle ist nicht verfuegbar.');
+  }
+
+  header('Cache-Control: no-store');
+  header('Location: '.$url, true, 302);
+  exit;
+}
+
+$image_id = (int)($_GET['id'] ?? 0);
+$type = trim((string)($_GET['type'] ?? ''));
+if ($image_id < 1 || $type === '')
+{
+  bratonien_tools_webdav_derivative_abort(400, 'Bild-ID oder Derivattyp fehlt.');
+}
+
+$permission_condition = get_sql_condition_FandF(array('forbidden_categories'=>'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))
+{
+  // Altbestand kann noch keinen vorbereiteten Preview-Cache besitzen. Der
+  // fokussierte Fotorama-Request darf dann nicht mit 404 enden, weil Fotorama
+  // den fehlgeschlagenen Frame sonst nicht erneut laedt. Stattdessen wird nur
+  // fuer dieses angeforderte Bild auf die echte WebDAV-Quelle ausgewichen.
+  bratonien_tools_webdav_derivative_fallback($image_id);
+}
+
+$derivative = new DerivativeImage($params, $src);
+if ($derivative->same_as_source())
+{
+  // Niemals die lokale Connector-Platzhalterquelle ausliefern.
+  bratonien_tools_webdav_derivative_fallback($image_id);
+}
+
+$target = $derivative->get_path();
+if ($target === '')
+{
+  bratonien_tools_webdav_derivative_fallback($image_id);
+}
+
+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_fallback($image_id);
+  }
+}
+
+if (!bratonien_tools_webdav_derivative_matches_preview($target, $params, $image_id))
+{
+  bratonien_tools_webdav_derivative_fallback($image_id);
+}
+
+$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);
+}