0.9.7.28: Version für WebDAV-Wiederherstellung

0.9.7.27: funktionierenden 0.9.6.1 Sync-Pfad wiederherstellen

js/nc_connector_edit_v2.js

@@ -1,6 +1,134 @@
 (function () {
   'use strict';
 
+  var statusEndpoint = 'plugins/bratonien_tools/nc-connector-status.php';
+
+  function ensureLiveStatus(detail, actions) {
+    var node = detail.querySelector('[data-nc-run-live]');
+    if (node) return node;
+
+    node = document.createElement('div');
+    node.setAttribute('data-nc-run-live', '1');
+    node.className = 'bratonien-base-note';
+    node.style.marginTop = '.6rem';
+    node.hidden = true;
+    actions.parentNode.insertBefore(node, actions.nextSibling);
+    return node;
+  }
+
+  function renderLiveStatus(node, data) {
+    var state = String(data && data.state || '');
+    var message = String(data && data.message || '');
+    var detail = String(data && data.error_detail || '');
+
+    node.hidden = false;
+    node.innerHTML = '';
+
+    var strong = document.createElement('strong');
+    if (state === 'queued') strong.textContent = 'Angefordert: ';
+    else if (state === 'running') strong.textContent = 'Läuft: ';
+    else if (state === 'ok' || state === 'success') strong.textContent = 'Erfolgreich: ';
+    else if (state === 'error') strong.textContent = 'Fehler: ';
+    else strong.textContent = 'Status: ';
+    node.appendChild(strong);
+    node.appendChild(document.createTextNode(message || state || 'Status wird ermittelt …'));
+
+    if (detail) {
+      var details = document.createElement('details');
+      details.style.marginTop = '.35rem';
+      var summary = document.createElement('summary');
+      summary.textContent = 'Technische Laufzeitdetails';
+      var pre = document.createElement('pre');
+      pre.style.whiteSpace = 'pre-wrap';
+      pre.style.wordBreak = 'break-word';
+      pre.textContent = detail;
+      details.appendChild(summary);
+      details.appendChild(pre);
+      node.appendChild(details);
+    }
+  }
+
+  function pollConnection(connectionId, node, button) {
+    var attempts = 0;
+    var maxAttempts = 180;
+    var timer = null;
+
+    function stop() {
+      if (timer) window.clearInterval(timer);
+      timer = null;
+      if (button) {
+        button.disabled = false;
+        button.textContent = 'Jetzt abgleichen';
+      }
+    }
+
+    function poll() {
+      attempts += 1;
+      fetch(statusEndpoint + '?connection_id=' + encodeURIComponent(connectionId) + '&_=' + Date.now(), {
+        credentials: 'same-origin',
+        cache: 'no-store',
+        headers: {'Accept': 'application/json'}
+      })
+        .then(function (response) {
+          if (!response.ok) throw new Error('HTTP ' + response.status);
+          return response.json();
+        })
+        .then(function (data) {
+          renderLiveStatus(node, data);
+          var state = String(data && data.state || '');
+          if (state === 'ok' || state === 'success' || state === 'error' || attempts >= maxAttempts) stop();
+        })
+        .catch(function (error) {
+          if (attempts >= maxAttempts) {
+            renderLiveStatus(node, {state: 'error', message: 'Status konnte nicht gelesen werden.', error_detail: error.message});
+            stop();
+          }
+        });
+    }
+
+    poll();
+    timer = window.setInterval(poll, 1000);
+  }
+
+  function bindRunNow(form, detail, liveNode) {
+    if (form.dataset.ncRunBound === '1') return;
+    form.dataset.ncRunBound = '1';
+
+    form.addEventListener('submit', function (event) {
+      event.preventDefault();
+      detail.open = true;
+
+      var button = form.querySelector('button[value="nc_connector_run_now"]');
+      var connectionInput = form.querySelector('input[name="connection_id"]');
+      if (!connectionInput) return;
+
+      if (button) {
+        button.disabled = true;
+        button.textContent = 'Abgleich wird gestartet …';
+      }
+      renderLiveStatus(liveNode, {state: 'queued', message: 'Abgleich wird angefordert …'});
+
+      fetch(form.action || window.location.href, {
+        method: 'POST',
+        credentials: 'same-origin',
+        cache: 'no-store',
+        body: new FormData(form)
+      })
+        .then(function (response) {
+          if (!response.ok) throw new Error('HTTP ' + response.status);
+          renderLiveStatus(liveNode, {state: 'queued', message: 'Abgleich wurde angefordert.'});
+          pollConnection(connectionInput.value, liveNode, button);
+        })
+        .catch(function (error) {
+          renderLiveStatus(liveNode, {state: 'error', message: 'Abgleich konnte nicht angefordert werden.', error_detail: error.message});
+          if (button) {
+            button.disabled = false;
+            button.textContent = 'Jetzt abgleichen';
+          }
+        });
+    });
+  }
+
   function restoreRunNowButtons() {
     var section = document.getElementById('nc-connector');
     if (!section) return;
@@ -18,36 +146,42 @@
     var details = connectionCard.querySelectorAll(':scope > details');
     details.forEach(function (detail) {
       var actions = detail.querySelector('.bratonien-actions');
-      if (!actions || actions.querySelector('[value="nc_connector_run_now"]')) return;
+      if (!actions) return;
 
       var connectionInput = detail.querySelector('input[name="connection_id"]');
       var tokenInput = detail.querySelector('input[name="pwg_token"]');
       if (!connectionInput || !tokenInput) return;
 
-      var form = document.createElement('form');
-      form.method = 'post';
+      var form = actions.querySelector('form[data-nc-run-now]');
+      if (!form) {
+        form = document.createElement('form');
+        form.method = 'post';
+        form.setAttribute('data-nc-run-now', '1');
 
-      var token = document.createElement('input');
-      token.type = 'hidden';
-      token.name = 'pwg_token';
-      token.value = tokenInput.value;
-      form.appendChild(token);
+        var token = document.createElement('input');
+        token.type = 'hidden';
+        token.name = 'pwg_token';
+        token.value = tokenInput.value;
+        form.appendChild(token);
 
-      var connection = document.createElement('input');
-      connection.type = 'hidden';
-      connection.name = 'connection_id';
-      connection.value = connectionInput.value;
-      form.appendChild(connection);
+        var connection = document.createElement('input');
+        connection.type = 'hidden';
+        connection.name = 'connection_id';
+        connection.value = connectionInput.value;
+        form.appendChild(connection);
 
-      var button = document.createElement('button');
-      button.className = 'buttonLike';
-      button.type = 'submit';
-      button.name = 'bratonien_tool';
-      button.value = 'nc_connector_run_now';
-      button.textContent = 'Jetzt abgleichen';
-      form.appendChild(button);
+        var button = document.createElement('button');
+        button.className = 'buttonLike';
+        button.type = 'submit';
+        button.name = 'bratonien_tool';
+        button.value = 'nc_connector_run_now';
+        button.textContent = 'Jetzt abgleichen';
+        form.appendChild(button);
 
-      actions.insertBefore(form, actions.firstChild);
+        actions.insertBefore(form, actions.firstChild);
+      }
+
+      bindRunNow(form, detail, ensureLiveStatus(detail, actions));
     });
   }
 

main.inc.php

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

nc-connector-status.php

@@ -24,6 +24,7 @@ if (!function_exists('is_admin') || !is_admin())
   exit;
 }
 
+$requested_connection_id = isset($_GET['connection_id']) ? max(0, (int)$_GET['connection_id']) : 0;
 $dir = PHPWG_ROOT_PATH.'_data/bratonien-tools/nc-connector-status';
 $latest = array(
   'state'=>'idle',
@@ -41,11 +42,16 @@ $latest = array(
   'route_timestamp'=>0,
   'route_time_label'=>'Nicht verfügbar',
   'route_detail'=>'',
+  'connection_id'=>$requested_connection_id,
 );
 
 if (is_dir($dir))
 {
-  foreach (glob($dir.'/connection-*.json') ?: array() as $file)
+  $files = $requested_connection_id > 0
+    ? array($dir.'/connection-'.$requested_connection_id.'.json')
+    : (glob($dir.'/connection-*.json') ?: array());
+
+  foreach ($files as $file)
   {
     if (!is_readable($file))
     {
@@ -63,60 +69,58 @@ if (is_dir($dir))
     }
   }
 
-  $route_file = $dir.'/route-status.json';
-  if (is_readable($route_file))
+  if ($requested_connection_id === 0)
   {
-    $route = json_decode((string)@file_get_contents($route_file), true);
-    if (is_array($route))
+    $route_file = $dir.'/route-status.json';
+    if (is_readable($route_file))
     {
-      $route_name = (string)($route['route'] ?? '');
-      $route_timestamp = (int)($route['timestamp'] ?? 0);
-      $route_label = (string)($route['label'] ?? '');
+      $route = json_decode((string)@file_get_contents($route_file), true);
+      if (is_array($route))
+      {
+        $route_name = (string)($route['route'] ?? '');
+        $route_timestamp = (int)($route['timestamp'] ?? 0);
+        $route_label = (string)($route['label'] ?? '');
 
-      if ($route_name === 'webdav')
-      {
-        $route_label = 'WEBDAV PRIMÄR';
-      }
-      elseif ($route_name === 'legacy_fallback')
-      {
-        $route_label = 'LEGACY-FALLBACK AKTIV';
-      }
-      elseif ($route_name === 'failed')
-      {
-        $route_label = 'FEHLER - KEIN ERFOLGREICHER DATENWEG';
-      }
-      elseif ($route_label === '')
-      {
-        $route_label = 'UNBEKANNTER DATENWEG';
-      }
+        if ($route_name === 'webdav')
+        {
+          $route_label = 'WEBDAV PRIMÄR';
+        }
+        elseif ($route_name === 'legacy_fallback')
+        {
+          $route_label = 'LEGACY-FALLBACK AKTIV';
+        }
+        elseif ($route_name === 'failed')
+        {
+          $route_label = 'FEHLER - KEIN ERFOLGREICHER DATENWEG';
+        }
+        elseif ($route_label === '')
+        {
+          $route_label = 'UNBEKANNTER DATENWEG';
+        }
 
-      $route_detail = trim((string)($route['detail'] ?? ''));
-      $latest['route'] = $route_name;
-      $latest['route_label'] = $route_label;
-      $latest['route_timestamp'] = $route_timestamp;
-      $latest['route_time_label'] = $route_timestamp > 0 ? date('d.m.Y H:i:s', $route_timestamp) : 'Nicht verfügbar';
-      $latest['route_detail'] = $route_detail;
+        $route_detail = trim((string)($route['detail'] ?? ''));
+        $latest['route'] = $route_name;
+        $latest['route_label'] = $route_label;
+        $latest['route_timestamp'] = $route_timestamp;
+        $latest['route_time_label'] = $route_timestamp > 0 ? date('d.m.Y H:i:s', $route_timestamp) : 'Nicht verfügbar';
+        $latest['route_detail'] = $route_detail;
 
-      $base_message = trim((string)($latest['message'] ?? ''));
-      $message_parts = array($route_label);
-      if ($route_name !== 'webdav' && $route_detail !== '')
-      {
-        $message_parts[] = $route_detail;
+        $base_message = trim((string)($latest['message'] ?? ''));
+        $message_parts = array($route_label);
+        if ($route_name !== 'webdav' && $route_detail !== '')
+        {
+          $message_parts[] = $route_detail;
+        }
+        if ($base_message !== '')
+        {
+          $message_parts[] = $base_message;
+        }
+        $latest['message'] = implode(' · ', $message_parts);
       }
-      if ($base_message !== '')
-      {
-        $message_parts[] = $base_message;
-      }
-      $latest['message'] = implode(' · ', $message_parts);
     }
   }
 }
 
-if ((int)$latest['timestamp'] > 0)
-{
-  $latest['last_run_label'] = date('d.m.Y H:i:s', (int)$latest['timestamp']);
-}
-
 $system_file = BRATONIEN_TOOLS_PATH.'include/nc_connector_system.inc.php';
 if (is_readable($system_file))
 {
@@ -129,4 +133,27 @@ if (is_readable($system_file))
   }
 }
 
+$scheduler_file = PHPWG_ROOT_PATH.'_data/bratonien-tools/nc-connector-scheduler/state.json';
+if ($requested_connection_id > 0 && is_readable($scheduler_file))
+{
+  $scheduler = json_decode((string)@file_get_contents($scheduler_file), true);
+  if (
+    is_array($scheduler)
+    && (int)($scheduler['connection_id'] ?? 0) === $requested_connection_id
+    && in_array((string)($scheduler['state'] ?? ''), array('queued','running'), true)
+    && (int)($scheduler['timestamp'] ?? 0) >= (int)($latest['timestamp'] ?? 0)
+  )
+  {
+    $latest['state'] = (string)$scheduler['state'];
+    $latest['message'] = (string)($scheduler['message'] ?? 'NC-Abgleich läuft.');
+    $latest['timestamp'] = (int)($scheduler['timestamp'] ?? time());
+    $latest['error_detail'] = '';
+  }
+}
+
+if ((int)$latest['timestamp'] > 0)
+{
+  $latest['last_run_label'] = date('d.m.Y H:i:s', (int)$latest['timestamp']);
+}
+
 echo json_encode($latest, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);

runtime/run-all.sh

@@ -4,7 +4,6 @@ set -Eeuo pipefail
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
 PIWIGO_ROOT_DEFAULT="${BRATONIEN_NC_PIWIGO_ROOT:-$(cd -- "$SCRIPT_DIR/../../.." && pwd)}"
 CONFIG_DIR="${BRATONIEN_NC_CONFIG_DIR:-/etc/bratonien-tools/nc-connector}"
-NATIVE_MODE="${BRATONIEN_NC_NATIVE:-0}"
 TARGET_CONNECTION_ID="${BRATONIEN_NC_CONNECTION_ID:-0}"
 GLOBAL_LOCK_DIR="${PIWIGO_ROOT_DEFAULT%/}/_data/bratonien-tools/nc-connector-scheduler"
 GLOBAL_LOCK_FILE="$GLOBAL_LOCK_DIR/worker.lock"
@@ -55,25 +54,17 @@ write_route_status() {
     ' "$ROUTE_STATUS_FILE" "$route" "$label" "$detail" "$success"
 }
 
-if [[ "$NATIVE_MODE" != "1" ]]; then
-    php "$SCRIPT_DIR/reconcile.php"
-fi
+# Legacy ist beendet. Der Runner bereitet ausschließlich die aktuelle WebDAV-Runtime vor.
 php "$SCRIPT_DIR/reconcile-webdav.php"
-php "$SCRIPT_DIR/cleanup-webdav-piwigo.php"
-if [[ "$NATIVE_MODE" != "1" ]]; then
-    php "$SCRIPT_DIR/cleanup-stale.php"
-fi
 
-configs=("$CONFIG_DIR"/connection-*.conf)
 webdav_configs=("$CONFIG_DIR"/webdav-connection-*.conf)
-
-if [[ ${#configs[@]} -eq 0 && ${#webdav_configs[@]} -eq 0 ]]; then
-    echo "Keine NC-Connector-Verbindungen konfiguriert."
+if [[ ${#webdav_configs[@]} -eq 0 ]]; then
+    echo "Keine WebDAV-NC-Connector-Verbindungen konfiguriert."
     exit 0
 fi
 
 route_piwigo_root=""
-for candidate in "${webdav_configs[@]}" "${configs[@]}"; do
+for candidate in "${webdav_configs[@]}"; do
     [[ -f "$candidate" ]] || continue
     candidate_id="$(read_config_value CONNECTION_ID "$candidate")"
     if [[ "$TARGET_CONNECTION_ID" -gt 0 && "$candidate_id" != "$TARGET_CONNECTION_ID" ]]; then
@@ -86,10 +77,8 @@ done
 ROUTE_STATUS_FILE="${route_piwigo_root%/}/_data/bratonien-tools/nc-connector-status/route-status.json"
 
 failure_count=0
-webdav_count=0
-local_count=0
-summary_parts=()
 matched_count=0
+summary_parts=()
 
 for config in "${webdav_configs[@]}"; do
     [[ -f "$config" ]] || continue
@@ -106,7 +95,6 @@ for config in "${webdav_configs[@]}"; do
     fi
 
     matched_count=$((matched_count + 1))
-    webdav_count=$((webdav_count + 1))
     echo "NC Connector WebDAV #$connection_id: $name"
     output=""
     if output="$(env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync-webdav.sh" 2>&1)"; then
@@ -120,75 +108,21 @@ for config in "${webdav_configs[@]}"; do
     fi
 done
 
-if [[ "$NATIVE_MODE" != "1" ]]; then
-    for config in "${configs[@]}"; do
-        [[ -f "$config" ]] || continue
-        name="$(basename "$config")"
-        connection_id="0"
-        if [[ "$name" =~ ^connection-([0-9]+)\.conf$ ]]; then
-            connection_id="${BASH_REMATCH[1]}"
-        fi
-        if [[ "$connection_id" -lt 1 ]]; then
-            echo "NC Connector: $name besitzt keine gueltige Verbindungs-ID." >&2
-            failure_count=$((failure_count + 1))
-            summary_parts+=("$name: ungueltige Verbindungs-ID")
-            continue
-        fi
-        if [[ "$TARGET_CONNECTION_ID" -gt 0 && "$connection_id" != "$TARGET_CONNECTION_ID" ]]; then
-            continue
-        fi
-
-        matched_count=$((matched_count + 1))
-        piwigo_root="$(read_config_value PIWIGO_ROOT "$config")"
-        [[ -n "$piwigo_root" ]] || piwigo_root="$PIWIGO_ROOT_DEFAULT"
-        tombstone_dir="${piwigo_root%/}/_data/bratonien-tools/nc-connector-status"
-        if [[ -f "$tombstone_dir/deleted-$connection_id" ]]; then
-            echo "NC Connector: Verbindung $connection_id wurde geloescht; Laufzeitdateien werden entfernt."
-            rm -f -- "$CONFIG_DIR/connection-$connection_id.conf" \
-                "$CONFIG_DIR/connection-$connection_id.db-password" \
-                "$CONFIG_DIR/connection-$connection_id.piwigo-password" \
-                "$CONFIG_DIR/connection-$connection_id.storages.tsv" \
-                "$CONFIG_DIR/connection-$connection_id.roots.tsv"
-            rm -f -- "$tombstone_dir/deleted-$connection_id"
-            continue
-        fi
-
-        local_count=$((local_count + 1))
-        echo "NC Connector Local #$connection_id: $name"
-        if env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync.sh"; then
-            summary_parts+=("Local #$connection_id erfolgreich")
-        else
-            failure_count=$((failure_count + 1))
-            summary_parts+=("Local #$connection_id fehlgeschlagen")
-        fi
-    done
-fi
-
 if [[ "$TARGET_CONNECTION_ID" -gt 0 && "$matched_count" -eq 0 ]]; then
-    write_route_status "failed" "FEHLER - Verbindung #$TARGET_CONNECTION_ID" "Keine Laufzeitkonfiguration für Verbindung #$TARGET_CONNECTION_ID gefunden." "0"
-    echo "NC Connector: keine Laufzeitkonfiguration für Verbindung #$TARGET_CONNECTION_ID gefunden." >&2
+    write_route_status "failed" "FEHLER - Verbindung #$TARGET_CONNECTION_ID" "Keine WebDAV-Laufzeitkonfiguration für Verbindung #$TARGET_CONNECTION_ID gefunden." "0"
+    echo "NC Connector: keine WebDAV-Laufzeitkonfiguration für Verbindung #$TARGET_CONNECTION_ID gefunden." >&2
     exit 1
 fi
 
 summary_detail="$(IFS='; '; printf '%s' "${summary_parts[*]}")"
-[[ -n "$summary_detail" ]] || summary_detail="Keine Verbindung wurde ausgefuehrt."
+[[ -n "$summary_detail" ]] || summary_detail="Keine WebDAV-Verbindung wurde ausgefuehrt."
 
 if [[ "$failure_count" -eq 0 ]]; then
-    if [[ "$webdav_count" -gt 0 && "$local_count" -gt 0 ]]; then
-        route="mixed"
-        label="WebDAV + Local"
-    elif [[ "$webdav_count" -gt 0 ]]; then
-        route="webdav"
-        label="WebDAV"
-    else
-        route="local"
-        label="Local"
-    fi
-    write_route_status "$route" "$label" "$summary_detail" "1"
-    echo "NC Connector: angeforderte Verbindung wurde erfolgreich verarbeitet."
+    write_route_status "webdav" "WebDAV" "$summary_detail" "1"
+    echo "NC Connector: WebDAV-Verbindung wurde erfolgreich verarbeitet."
     exit 0
 fi
 
-write_route_status "failed" "FEHLER - angeforderte Verbindung" "$summary_detail" "0"
-echo "NC Connector: die angeforderte Verbindung ist fehlgeschlagen." >&2
+write_route_status "failed" "FEHLER - WebDAV-Verbindung" "$summary_detail" "0"
+echo "NC Connector: die angeforderte WebDAV-Verbindung ist fehlgeschlagen." >&2
 exit 1

runtime/sync-webdav.sh

@@ -59,6 +59,10 @@ for target in (status_file, public_file):
 PY
 }
 
+compact_output() {
+    tail -n 20 | tr '\n' ' ' | sed 's/[[:space:]]\+/ /g; s/^[[:space:]]//; s/[[:space:]]$//'
+}
+
 failure() {
     local code="$1" command="$2" line="$3"
     trap - ERR
@@ -78,7 +82,9 @@ done < "$WEBDAV_ROOTS_FILE"
 WEBDAV_CONNECT_IP="$(php "$SCRIPT_DIR/lib/resolve-nextcloud-target.php" "$WEBDAV_BASE_URL")"
 [[ -n "$WEBDAV_CONNECT_IP" ]] || { write_status error "Nextcloud-Zieladresse konnte nicht ermittelt werden"; exit 1; }
 
-python3 "$SCRIPT_DIR/lib/build_webdav_placeholder_source.py" \
+PLACEHOLDER_OUTPUT=""
+PLACEHOLDER_EXIT=0
+if PLACEHOLDER_OUTPUT="$(python3 "$SCRIPT_DIR/lib/build_webdav_placeholder_source.py" \
     --base-url "$WEBDAV_BASE_URL" \
     --connect-ip "$WEBDAV_CONNECT_IP" \
     --user "$WEBDAV_USER" \
@@ -86,14 +92,66 @@ python3 "$SCRIPT_DIR/lib/build_webdav_placeholder_source.py" \
     "${ROOT_ARGS[@]}" \
     --source-dir "$WEBDAV_SOURCE_DIR" \
     --manifest "$MANIFEST" \
-    --mapping "$WEBDAV_MAPPING_FILE"
+    --mapping "$WEBDAV_MAPPING_FILE" 2>&1)"; then
+    PLACEHOLDER_EXIT=0
+else
+    PLACEHOLDER_EXIT=$?
+fi
+[[ -z "$PLACEHOLDER_OUTPUT" ]] || printf '%s\n' "$PLACEHOLDER_OUTPUT"
+if [[ "$PLACEHOLDER_EXIT" -ne 0 ]]; then
+    DETAIL="Exit-Code: $PLACEHOLDER_EXIT"
+    if [[ -n "$PLACEHOLDER_OUTPUT" ]]; then
+        DETAIL+="; Ausgabe: $(printf '%s\n' "$PLACEHOLDER_OUTPUT" | compact_output)"
+    fi
+    trap - ERR
+    write_status error "WebDAV-Shadow-Tree fehlgeschlagen" "$DETAIL"
+    exit "$PLACEHOLDER_EXIT"
+fi
 
-python3 "$SCRIPT_DIR/lib/shadow_tree.py" \
+SHADOW_OUTPUT=""
+SHADOW_EXIT=0
+if SHADOW_OUTPUT="$(python3 "$SCRIPT_DIR/lib/shadow_tree.py" \
     --manifest "$MANIFEST" \
     --destination "$GALLERY_ROOT" \
-    --state "$SHADOW_MAP_FILE"
+    --state "$SHADOW_MAP_FILE" 2>&1)"; then
+    SHADOW_EXIT=0
+else
+    SHADOW_EXIT=$?
+fi
+[[ -z "$SHADOW_OUTPUT" ]] || printf '%s\n' "$SHADOW_OUTPUT"
+if [[ "$SHADOW_EXIT" -ne 0 ]]; then
+    DETAIL="Exit-Code: $SHADOW_EXIT"
+    if [[ -n "$SHADOW_OUTPUT" ]]; then
+        DETAIL+="; Ausgabe: $(printf '%s\n' "$SHADOW_OUTPUT" | compact_output)"
+    fi
+    trap - ERR
+    write_status error "WebDAV-Shadow-Tree fehlgeschlagen" "$DETAIL"
+    exit "$SHADOW_EXIT"
+fi
 
 trap - ERR
+PREVIEW_CACHE="$PIWIGO_ROOT/_data/bratonien-tools/nc-webdav-preview/connection-$CONNECTION_ID"
+PREVIEW_OUTPUT=""
+PREVIEW_EXIT=0
+if PREVIEW_OUTPUT="$(php "$SCRIPT_DIR/lib/precache-webdav-previews.php" \
+    --mapping="$WEBDAV_MAPPING_FILE" \
+    --base-url="$WEBDAV_BASE_URL" \
+    --user="$WEBDAV_USER" \
+    --password-file="$WEBDAV_PASSWORD_FILE" \
+    --cache-dir="$PREVIEW_CACHE" 2>&1)"; then
+    PREVIEW_EXIT=0
+else
+    PREVIEW_EXIT=$?
+fi
+[[ -z "$PREVIEW_OUTPUT" ]] || printf '%s\n' "$PREVIEW_OUTPUT"
+if [[ "$PREVIEW_EXIT" -ne 0 ]]; then
+    DETAIL="Exit-Code: $PREVIEW_EXIT"
+    if [[ -n "$PREVIEW_OUTPUT" ]]; then
+        DETAIL+="; Ausgabe: $(printf '%s\n' "$PREVIEW_OUTPUT" | compact_output)"
+    fi
+    write_status error "WebDAV-Vorschaubilder konnten beim Einlesen nicht erzeugt werden" "$DETAIL"
+    exit "$PREVIEW_EXIT"
+fi
 
 if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
     PIWIGO_OUTPUT=""
@@ -111,7 +169,7 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
     if [[ "$PIWIGO_EXIT" -ne 0 ]]; then
         DETAIL="Exit-Code: $PIWIGO_EXIT"
         if [[ -n "$PIWIGO_OUTPUT" ]]; then
-            DETAIL+="; Ausgabe: $(printf '%s\n' "$PIWIGO_OUTPUT" | tail -n 12 | tr '\n' ' ' | sed 's/[[:space:]]\+/ /g; s/^[[:space:]]//; s/[[:space:]]$//')"
+            DETAIL+="; Ausgabe: $(printf '%s\n' "$PIWIGO_OUTPUT" | compact_output)"
         fi
 
         if grep -qi 'Invalid username/password' <<<"$PIWIGO_OUTPUT"; then
@@ -138,9 +196,28 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
         exit "$PIWIGO_EXIT"
     fi
 
+    DERIVATIVE_OUTPUT=""
+    DERIVATIVE_EXIT=0
+    if DERIVATIVE_OUTPUT="$(php "$SCRIPT_DIR/lib/build-webdav-derivatives.php" \
+        --piwigo-root="$PIWIGO_ROOT" \
+        --connection-id="$CONNECTION_ID" 2>&1)"; then
+        DERIVATIVE_EXIT=0
+    else
+        DERIVATIVE_EXIT=$?
+    fi
+    [[ -z "$DERIVATIVE_OUTPUT" ]] || printf '%s\n' "$DERIVATIVE_OUTPUT"
+    if [[ "$DERIVATIVE_EXIT" -ne 0 ]]; then
+        DETAIL="Exit-Code: $DERIVATIVE_EXIT"
+        if [[ -n "$DERIVATIVE_OUTPUT" ]]; then
+            DETAIL+="; Ausgabe: $(printf '%s\n' "$DERIVATIVE_OUTPUT" | compact_output)"
+        fi
+        write_status error "Piwigo-Derivate für WebDAV-Bilder konnten nicht erzeugt werden" "$DETAIL"
+        exit "$DERIVATIVE_EXIT"
+    fi
+
     if grep -q 'Piwigo-Synchronisierung per API erfolgreich' <<<"$PIWIGO_OUTPUT"; then
         write_status ok \
-            "WebDAV eingelesen und Piwigo synchronisiert" \
+            "WebDAV eingelesen, Piwigo synchronisiert und Derivate erzeugt" \
             "" \
             "api" \
             "ok" \
@@ -149,7 +226,7 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
             "Fallback wurde nicht benötigt"
     elif grep -q 'Piwigo-Datenbanksynchronisierung per Benutzername/Passwort-Fallback erfolgreich' <<<"$PIWIGO_OUTPUT"; then
         write_status ok \
-            "WebDAV eingelesen und Piwigo über Fallback synchronisiert" \
+            "WebDAV eingelesen, Piwigo über Fallback synchronisiert und Derivate erzeugt" \
             "" \
             "fallback" \
             "not_used" \
@@ -157,8 +234,8 @@ if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
             "ok" \
             "Benutzername/Passwort-Fallback erfolgreich"
     else
-        write_status ok "WebDAV eingelesen und Piwigo synchronisiert"
+        write_status ok "WebDAV eingelesen, Piwigo synchronisiert und Derivate erzeugt"
     fi
 else
-    write_status ok "WebDAV eingelesen; Piwigo-Synchronisierung ist für diese Verbindung deaktiviert"
+    write_status ok "WebDAV eingelesen und Vorschaubilder erzeugt; Piwigo-Synchronisierung ist für diese Verbindung deaktiviert"
 fi

webdav-image.php

@@ -52,6 +52,18 @@ if (!pwg_db_num_rows($access_result)) bratonien_tools_webdav_image_abort(403, 'K
 $source = bratonien_tools_webdav_image_source_info($image_id);
 if (!$source) bratonien_tools_webdav_image_abort(404, 'Keine WebDAV-Quelle für dieses Bild gefunden.');
 
+if (!empty($_GET['ajaxload']))
+{
+  $preview = !empty($_GET['preview']);
+  $final_url = bratonien_tools_webdav_image_url($image_id, $preview);
+  if (!$final_url) bratonien_tools_webdav_image_abort(404, 'Keine WebDAV-Bild-URL verfügbar.');
+
+  header('Content-Type: application/json; charset=utf-8');
+  header('Cache-Control: no-store, max-age=0');
+  echo json_encode(array('url'=>$final_url), JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+  exit;
+}
+
 if (!empty($_GET['preview']))
 {
   $preview = bratonien_tools_webdav_preview_path($source);
@@ -121,7 +133,7 @@ $options = array(
   CURLOPT_USERPWD => $user.':'.$password,
   CURLOPT_RETURNTRANSFER => false,
   CURLOPT_FAILONERROR => false,
-  CURLOPT_USERAGENT => 'Bratonien-Tools-WebDAV-Image/0.9.7.16',
+  CURLOPT_USERAGENT => 'Bratonien-Tools-WebDAV-Image/0.9.7.24',
   CURLOPT_HEADERFUNCTION => function($ch, $line)
   {
     $length = strlen($line);