0.9.7.16: echte NC-Previews als lokale Piwigo-Quelle verwenden

2026-09-19 16:24:33 +00:00 · 2026-08-19 23:04:06 +02:00
parent 9052076fd7
commit bc0593642c
1 changed files with 95 additions and 43 deletions
--- a/runtime/lib/precache-webdav-previews.php
+++ b/runtime/lib/precache-webdav-previews.php
@@ -8,7 +8,7 @@ if (PHP_SAPI !== 'cli')

 require_once(dirname(__DIR__, 2).'/include/nc_transport.inc.php');

-const BRATONIEN_WEBDAV_PREVIEW_VERSION = 2;
+const BRATONIEN_WEBDAV_PREVIEW_VERSION = 3;
 const BRATONIEN_WEBDAV_PREVIEW_MAX_EDGE = 4096;
 const BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY = 88;

@@ -34,7 +34,7 @@ function fetch_remote_blob($url, $user, $password)
    CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
    CURLOPT_USERPWD => $user.':'.$password,
    CURLOPT_FAILONERROR => false,
-    CURLOPT_USERAGENT => 'Bratonien-Tools-WebDAV-Precache/0.9.7.1',
+    CURLOPT_USERAGENT => 'Bratonien-Tools-WebDAV-Precache/0.9.7.16',
  );
  bratonien_tools_nc_transport_apply_curl($options, $url);
  curl_setopt_array($ch, $options);
@@ -52,12 +52,11 @@ function fetch_remote_blob($url, $user, $password)

 function preview_extension_for_entry(array $entry)
 {
-  $content_type = strtolower(trim((string)($entry['content_type'] ?? '')));
  $path = strtolower((string)($entry['webdav_path'] ?? ''));
-  if ($content_type === 'image/png' || preg_match('/\.png$/', $path))
-  {
-    return 'png';
-  }
+  $extension = strtolower(pathinfo($path, PATHINFO_EXTENSION));
+  if ($extension === 'png') return 'png';
+  if ($extension === 'gif') return 'gif';
+  if ($extension === 'webp') return 'webp';
  return 'jpg';
 }

@@ -68,7 +67,7 @@ function preview_target_for_entry($cache_dir, $key, array $entry)

 function remove_other_preview_format($cache_dir, $key, $keep_target)
 {
-  foreach (array('jpg', 'png', 'webp') as $ext)
+  foreach (array('jpg', 'png', 'gif', 'webp') as $ext)
  {
    $candidate = $cache_dir.'/'.$key.'.'.$ext;
    if ($candidate !== $keep_target && is_file($candidate)) @unlink($candidate);
@@ -90,13 +89,19 @@ function write_preview_imagick($blob, $target, $extension)
    {
      $image->setImageFormat('png');
    }
+    elseif ($extension === 'gif')
+    {
+      $image->setImageFormat('gif');
+    }
+    elseif ($extension === 'webp')
+    {
+      $image->setImageFormat('webp');
+      $image->setImageCompressionQuality(BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY);
+    }
    else
    {
      $image->setImageBackgroundColor('white');
-      if (method_exists($image, 'mergeImageLayers'))
-      {
-        $image = $image->mergeImageLayers(Imagick::LAYERMETHOD_FLATTEN);
-      }
+      if (method_exists($image, 'mergeImageLayers')) $image = $image->mergeImageLayers(Imagick::LAYERMETHOD_FLATTEN);
      $image->setImageFormat('jpeg');
      $image->setImageCompression(Imagick::COMPRESSION_JPEG);
      $image->setImageCompressionQuality(BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY);
@@ -131,7 +136,7 @@ function write_preview_gd($blob, $target, $extension)

    try
    {
-      if ($extension === 'png')
+      if (in_array($extension, array('png', 'gif', 'webp'), true))
      {
        imagealphablending($preview, false);
        imagesavealpha($preview, true);
@@ -149,10 +154,12 @@ function write_preview_gd($blob, $target, $extension)
        fail_preview('GD konnte das Preview nicht skalieren.');
      }

-      $written = $extension === 'png'
-        ? imagepng($preview, $target, 6)
-        : imagejpeg($preview, $target, BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY);
-      if (!$written) fail_preview('GD konnte das Preview nicht schreiben.');
+      if ($extension === 'png') $written = imagepng($preview, $target, 6);
+      elseif ($extension === 'gif') $written = function_exists('imagegif') ? imagegif($preview, $target) : false;
+      elseif ($extension === 'webp') $written = function_exists('imagewebp') ? imagewebp($preview, $target, BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY) : false;
+      else $written = imagejpeg($preview, $target, BRATONIEN_WEBDAV_PREVIEW_JPEG_QUALITY);
+
+      if (!$written) fail_preview('GD konnte das Preview im Format '.$extension.' nicht schreiben.');
    }
    finally
    {
@@ -168,7 +175,7 @@ function write_preview_gd($blob, $target, $extension)
 function write_preview($blob, $target, $extension)
 {
  $dir = dirname($target);
-  if (!is_dir($dir) && !mkdir($dir, 0755, true) && !is_dir($dir)) fail_preview('Preview-Verzeichnis konnte nicht angelegt werden.');
+  if (!is_dir($dir) && !mkdir($dir, 0775, true) && !is_dir($dir)) fail_preview('Preview-Verzeichnis konnte nicht angelegt werden.');

  if (class_exists('Imagick'))
  {
@@ -190,7 +197,48 @@ function write_preview($blob, $target, $extension)
    @unlink($target);
    fail_preview('Das erzeugte Preview ist ungültig.');
  }
-  @chmod($target, 0644);
+  @chmod($target, 0664);
+}
+
+function local_source_is_hydrated($source_path, $preview)
+{
+  if (!is_file($source_path) || !is_readable($source_path)) return false;
+  $source_size = @getimagesize($source_path);
+  $preview_size = @getimagesize($preview);
+  if (!is_array($source_size) || !is_array($preview_size)) return false;
+  if ((int)$source_size[0] !== (int)$preview_size[0] || (int)$source_size[1] !== (int)$preview_size[1]) return false;
+  $source_bytes = @filesize($source_path);
+  $preview_bytes = @filesize($preview);
+  return $source_bytes !== false && $preview_bytes !== false && (int)$source_bytes === (int)$preview_bytes;
+}
+
+function hydrate_local_source($source_path, $preview)
+{
+  $normalized = str_replace('\\', '/', (string)$source_path);
+  if (!preg_match('#/nc-webdav-source/connection-[0-9]+/root-[0-9]+/#', $normalized))
+  {
+    fail_preview('Unsicherer lokaler Connector-Quellpfad: '.$source_path);
+  }
+  if (!is_file($preview) || !is_readable($preview)) fail_preview('Preview für lokale Quelle fehlt: '.$preview);
+  if (local_source_is_hydrated($source_path, $preview)) return false;
+
+  $dir = dirname($source_path);
+  if (!is_dir($dir) && !mkdir($dir, 0775, true) && !is_dir($dir)) fail_preview('Lokales Connector-Verzeichnis konnte nicht angelegt werden: '.$dir);
+
+  $tmp = $source_path.'.bratonien-next-'.getmypid();
+  if (!@copy($preview, $tmp)) fail_preview('Preview konnte nicht in lokale Piwigo-Quelle kopiert werden: '.$source_path);
+  @chmod($tmp, 0664);
+  $mtime = @filemtime($preview);
+  if ($mtime) @touch($tmp, $mtime);
+  if (!@rename($tmp, $source_path))
+  {
+    @unlink($tmp);
+    fail_preview('Lokale Piwigo-Quelle konnte nicht ersetzt werden: '.$source_path);
+  }
+  clearstatcache(true, $source_path);
+  $size = @getimagesize($source_path);
+  if (!is_array($size) || empty($size[0]) || empty($size[1])) fail_preview('Lokale Piwigo-Quelle ist nach dem Ersetzen ungültig: '.$source_path);
+  return true;
 }

 try
@@ -212,8 +260,8 @@ try
  $mapping = json_decode((string)file_get_contents($mapping_file), true);
  if (!is_array($mapping) || !isset($mapping['files']) || !is_array($mapping['files'])) fail_preview('WebDAV-Mapping ist ungültig.');

-  if (!is_dir($cache_dir) && !mkdir($cache_dir, 0755, true) && !is_dir($cache_dir)) fail_preview('Preview-Cache konnte nicht angelegt werden.');
-  @chmod($cache_dir, 0755);
+  if (!is_dir($cache_dir) && !mkdir($cache_dir, 0775, true) && !is_dir($cache_dir)) fail_preview('Preview-Cache konnte nicht angelegt werden.');
+  @chmod($cache_dir, 2775);

  $state_file = $cache_dir.'/state.json';
  $old_state = array();
@@ -226,9 +274,10 @@ try
  $new_state = array();
  $generated = 0;
  $cached = 0;
+  $hydrated = 0;
  $errors = 0;

-  foreach ($mapping['files'] as $entry)
+  foreach ($mapping['files'] as $local_path=>$entry)
  {
    if (!is_array($entry) || (string)($entry['kind'] ?? '') !== 'file') continue;
    $webdav_path = trim((string)($entry['webdav_path'] ?? ''), '/');
@@ -245,26 +294,29 @@ try
      'version' => BRATONIEN_WEBDAV_PREVIEW_VERSION,
    );

-    $old = $old_state[$key] ?? null;
-    if (
-      is_file($target)
-      && is_array($old)
-      && (string)($old['etag'] ?? '') === $etag
-      && (string)($old['format'] ?? '') === $extension
-      && (int)($old['version'] ?? 0) === BRATONIEN_WEBDAV_PREVIEW_VERSION
-    )
-    {
-      $cached++;
-      continue;
-    }
-
    try
    {
-      $url = $base_url.'/remote.php/dav/files/'.rawurlencode($user).'/'.quote_webdav_path($webdav_path);
-      $blob = fetch_remote_blob($url, $user, $password);
-      write_preview($blob, $target, $extension);
-      remove_other_preview_format($cache_dir, $key, $target);
-      $generated++;
+      $old = $old_state[$key] ?? null;
+      $valid_cached = is_file($target)
+        && is_array($old)
+        && (string)($old['etag'] ?? '') === $etag
+        && (string)($old['format'] ?? '') === $extension
+        && (int)($old['version'] ?? 0) === BRATONIEN_WEBDAV_PREVIEW_VERSION;
+
+      if (!$valid_cached)
+      {
+        $url = $base_url.'/remote.php/dav/files/'.rawurlencode($user).'/'.quote_webdav_path($webdav_path);
+        $blob = fetch_remote_blob($url, $user, $password);
+        write_preview($blob, $target, $extension);
+        remove_other_preview_format($cache_dir, $key, $target);
+        $generated++;
+      }
+      else
+      {
+        $cached++;
+      }
+
+      if (hydrate_local_source((string)$local_path, $target)) $hydrated++;
    }
    catch (Throwable $e)
    {
@@ -277,14 +329,14 @@ try
  {
    if (!is_file($file) || basename($file) === 'state.json') continue;
    $name = basename($file);
-    if (!preg_match('/^([a-f0-9]{40})\.(jpg|png|webp)$/', $name, $m)) continue;
+    if (!preg_match('/^([a-f0-9]{40})\.(jpg|png|gif|webp)$/', $name, $m)) continue;
    if (!isset($new_state[$m[1]])) @unlink($file);
  }

  file_put_contents($state_file, json_encode($new_state, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)."\n", LOCK_EX);
-  @chmod($state_file, 0644);
+  @chmod($state_file, 0664);

-  echo 'WebDAV-Previews: erzeugt='.$generated.' vorhanden='.$cached.' fehler='.$errors."\n";
+  echo 'WebDAV-Previews: erzeugt='.$generated.' vorhanden='.$cached.' lokale_quellen='.$hydrated.' fehler='.$errors."\n";
  exit($errors > 0 ? 1 : 0);
 }
 catch (Throwable $e)