Robuste Darktable-Synchronisation: sequenzieller Ablauf, Versions- und Concurrent-Schutz

- Race Condition behoben: Pre-Sync wird vollstaendig abgewartet bevor Darktable startet
- Post-Sync nach Schliessen von Darktable eingefuehrt (bisher fehlend)
- .env aus festem Pfad ~/.config/darktable-sync/.env geladen (nicht mehr relativ)
- Server-Erreichbarkeit per SSH statt ping (Firewall-sicher)
- Darktable-Versionscheck (Major.Minor) vor Download mit Abbruch bei Konflikt
- DB-Backup vor jedem Download (library.db.bak, data.db.bak)
- sync_pending-Marker bei Offline/Fehler, Hinweis beim naechsten Start
- darktable.active-Marker auf Server fuer Concurrent-Erkennung
- Lock-Dateien vom Sync ausgeschlossen
- systemd-Timer entfernt, Service bleibt als manueller Trigger
- Gemeinsame Hilfsfunktionen in darktable_common.sh extrahiert
- 20 BATS-Tests mit vollstaendigem Stub-System ohne GUI-Dialoge

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

install.sh

@@ -2,127 +2,186 @@
 
 set -e
 
-### Default Configuration (can be overridden by .env file)
-
-SERVER_USER="${SERVER_USER:-$USER}"                # Default: current user
-SERVER_SSH_PORT="${SERVER_SSH_PORT:-22}"           # Default: standard SSH port
-SERVER_IP="${SERVER_IP:-192.168.1.100}"            # Default: common local network
+### Standardkonfiguration (kann durch .env ueberschrieben werden)
 
+SERVER_USER="${SERVER_USER:-$USER}"
+SERVER_SSH_PORT="${SERVER_SSH_PORT:-22}"
+SERVER_IP="${SERVER_IP:-192.168.1.100}"
 SERVER_DB_DIR="${SERVER_DB_DIR:-/volume1/Darktable/darktable_db}"
 SERVER_PHOTO_DIR="${SERVER_PHOTO_DIR:-/volume1/Darktable/photo_library}"
-
-LOCAL_PHOTO_DIR="${PHOTO_DIR:-$HOME/Pictures/raw}"
-LOCAL_DARKTABLE_DB_DIR="${DARKTABLE_DB_DIR:-$HOME/.config/darktable}"
-
+LOCAL_PHOTO_DIR="${LOCAL_PHOTO_DIR:-$HOME/Pictures/raw}"
+LOCAL_DARKTABLE_DB_DIR="${LOCAL_DARKTABLE_DB_DIR:-$HOME/.config/darktable}"
 BIN_DIR="${BIN_DIR:-$HOME/.local/bin}"
+DARKTABLE_BIN="${DARKTABLE_BIN:-darktable}"
+SYNC_BIN="${SYNC_BIN:-$HOME/.local/bin/darktable_sync.sh}"
+
 APPLICATIONS_DIR="$HOME/.local/share/applications"
+CONFIG_DIR="$HOME/.config/darktable-sync"
 
 SYNC_SCRIPT="$BIN_DIR/darktable_sync.sh"
 WRAPPER_SCRIPT="$BIN_DIR/darktable_wrapper.sh"
+COMMON_SCRIPT="$BIN_DIR/darktable_common.sh"
 DESKTOP_SHORTCUT="$APPLICATIONS_DIR/darktable-with-sync.desktop"
 SYNC_ONLY_SHORTCUT="$APPLICATIONS_DIR/darktable-sync-only.desktop"
 
-### Prepare folders
+### Verzeichnisse anlegen
 
 mkdir -p "$BIN_DIR"
-mkdir -p "$HOME/.config/systemd/user"
 mkdir -p "$APPLICATIONS_DIR"
+mkdir -p "$CONFIG_DIR"
 
-### Load .env if present (overrides defaults)
+### .env laden falls vorhanden
 
 ENV_FILE=".env"
+CONFIG_ENV="$CONFIG_DIR/.env"
 
 if [[ -f "$ENV_FILE" ]]; then
-  echo "Loading configuration from .env file..."
-  set -a
-  # shellcheck source=/dev/null
-  . "$ENV_FILE"
-  set +a
+    echo "Hinweis: .env im Projektverzeichnis gefunden."
+    echo "  Bitte nach $CONFIG_ENV verschieben:"
+    echo "  cp .env $CONFIG_ENV && chmod 600 $CONFIG_ENV"
 fi
 
-### Show effective configuration
+if [[ -f "$CONFIG_ENV" ]]; then
+    echo "Konfiguration laden aus $CONFIG_ENV..."
+    set -a
+    # shellcheck source=/dev/null
+    . "$CONFIG_ENV"
+    set +a
+fi
 
-echo "Using configuration:"
-echo "SERVER_USER: $SERVER_USER"
-echo "SERVER_IP: $SERVER_IP"
-echo "SERVER_SSH_PORT: $SERVER_SSH_PORT"
-echo "SERVER_DB_DIR: $SERVER_DB_DIR"
-echo "SERVER_PHOTO_DIR: $SERVER_PHOTO_DIR"
-echo "PHOTO_DIR: $LOCAL_PHOTO_DIR"
-echo "DARKTABLE_DB_DIR: $LOCAL_DARKTABLE_DB_DIR"
-echo "BIN_DIR: $BIN_DIR"
+### Konfiguration anzeigen
 
-### Check dependencies
+echo ""
+echo "Aktive Konfiguration:"
+echo "  SERVER_USER:            $SERVER_USER"
+echo "  SERVER_IP:              $SERVER_IP"
+echo "  SERVER_SSH_PORT:        $SERVER_SSH_PORT"
+echo "  SERVER_DB_DIR:          $SERVER_DB_DIR"
+echo "  SERVER_PHOTO_DIR:       $SERVER_PHOTO_DIR"
+echo "  LOCAL_PHOTO_DIR:        $LOCAL_PHOTO_DIR"
+echo "  LOCAL_DARKTABLE_DB_DIR: $LOCAL_DARKTABLE_DB_DIR"
+echo "  BIN_DIR:                $BIN_DIR"
+echo ""
 
-echo "Checking requirements..."
+### Abhaengigkeiten pruefen
 
-REQUIRED_CMDS=("rsync" "notify-send" "ping" "darktable" "systemctl" "xdg-user-dir")
+echo "Abhaengigkeiten pruefen..."
 
+REQUIRED_CMDS=("rsync" "notify-send" "darktable" "systemctl" "ssh")
 for cmd in "${REQUIRED_CMDS[@]}"; do
-  if ! command -v "$cmd" >/dev/null 2>&1; then
-    echo "Error: '$cmd' is not installed."
-    echo "Install it with: sudo apt install $cmd"
-    exit 1
-  fi
+    if ! command -v "$cmd" >/dev/null 2>&1; then
+        echo "Fehler: '$cmd' ist nicht installiert."
+        echo "  Installieren mit: sudo apt install $cmd"
+        exit 1
+    fi
 done
 
-# Check folder presence
+if ! command -v zenity >/dev/null 2>&1 && ! command -v kdialog >/dev/null 2>&1; then
+    echo "Warnung: Weder 'zenity' noch 'kdialog' gefunden."
+    echo "  Mindestens eines installieren fuer GUI-Dialoge:"
+    echo "  sudo apt install zenity    # GNOME"
+    echo "  sudo apt install kdialog   # KDE"
+    echo "  (Ohne Dialog-Tool wird ein Text-Fallback verwendet)"
+fi
+
+if ! command -v bats >/dev/null 2>&1; then
+    echo "Hinweis: 'bats' nicht gefunden (nur fuer Tests benoetigt)."
+    echo "  sudo apt install bats"
+fi
+
+### Verzeichnisse pruefen
 
 if [ ! -d "$LOCAL_PHOTO_DIR" ]; then
-  echo "Local photo folder does not exist: $LOCAL_PHOTO_DIR"
-  echo "Create it using: mkdir -p \"$LOCAL_PHOTO_DIR\""
-  exit 1
+    echo "Fehler: Lokales Foto-Verzeichnis existiert nicht: $LOCAL_PHOTO_DIR"
+    echo "  Anlegen mit: mkdir -p \"$LOCAL_PHOTO_DIR\""
+    exit 1
 fi
 
 if [ ! -d "$LOCAL_DARKTABLE_DB_DIR" ]; then
-  echo "Darktable database path does not exist: $LOCAL_DARKTABLE_DB_DIR"
-  echo "Start Darktable once or create the directory manually."
-  exit 1
+    echo "Fehler: Darktable-Datenbank-Verzeichnis existiert nicht: $LOCAL_DARKTABLE_DB_DIR"
+    echo "  Darktable einmal starten oder manuell anlegen."
+    exit 1
 fi
 
-# Check if server is reachable and remote dirs exist
+### Server-Erreichbarkeit pruefen
 
-if ping -c 1 "$SERVER_IP" &>/dev/null; then
-  echo "Server is reachable: $SERVER_IP"
+if ssh -o ConnectTimeout=5 -o BatchMode=yes \
+    -p "$SERVER_SSH_PORT" "$SERVER_USER@$SERVER_IP" true 2>/dev/null; then
+    echo "Server erreichbar: $SERVER_IP"
 
-  if ! ssh -p "$SERVER_SSH_PORT" "$SERVER_USER@$SERVER_IP" "[ -d '$SERVER_DB_DIR' ]"; then
-    echo "Remote directory missing on server: $SERVER_DB_DIR"
-    echo "Create it or adjust the path."
-    exit 1
-  fi
+    if ! ssh -o ConnectTimeout=5 -o BatchMode=yes \
+        -p "$SERVER_SSH_PORT" "$SERVER_USER@$SERVER_IP" \
+        "[ -d '$SERVER_DB_DIR' ]"; then
+        echo "Fehler: Server-Verzeichnis fehlt: $SERVER_DB_DIR"
+        exit 1
+    fi
 
-  if ! ssh -p "$SERVER_SSH_PORT" "$SERVER_USER@$SERVER_IP" "[ -d '$SERVER_PHOTO_DIR' ]"; then
-    echo "Remote directory missing on server: $SERVER_PHOTO_DIR"
-    echo "Create it or adjust the path."
-    exit 1
-  fi
+    if ! ssh -o ConnectTimeout=5 -o BatchMode=yes \
+        -p "$SERVER_SSH_PORT" "$SERVER_USER@$SERVER_IP" \
+        "[ -d '$SERVER_PHOTO_DIR' ]"; then
+        echo "Fehler: Server-Verzeichnis fehlt: $SERVER_PHOTO_DIR"
+        exit 1
+    fi
 else
-  echo "Server not reachable: $SERVER_IP"
-  echo "Sync will fail until server is online."
+    echo "Warnung: Server nicht erreichbar ($SERVER_IP)."
+    echo "  Sync wird fehlschlagen bis der Server online ist."
 fi
 
-### Install sync and wrapper scripts
+### Alte Systemd-Dateien entfernen (Unterstrich-Varianten)
+
+SYSTEMD_USER_DIR="$HOME/.config/systemd/user"
+OLD_SERVICE="$SYSTEMD_USER_DIR/darktable_sync.service"
+OLD_TIMER="$SYSTEMD_USER_DIR/darktable_sync.timer"
+
+if systemctl --user is-active darktable_sync.timer &>/dev/null; then
+    echo "Alten Timer deaktivieren..."
+    systemctl --user disable --now darktable_sync.timer || true
+fi
+
+for old_file in "$OLD_SERVICE" "$OLD_TIMER"; do
+    if [ -f "$old_file" ]; then
+        echo "Alte Datei entfernen: $old_file"
+        rm -f "$old_file"
+    fi
+done
+
+### Scripts installieren
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-cp "$SCRIPT_DIR/scripts/darktable_sync.sh" "$SYNC_SCRIPT"
+cp "$SCRIPT_DIR/scripts/darktable_common.sh" "$COMMON_SCRIPT"
+cp "$SCRIPT_DIR/scripts/darktable_sync.sh"   "$SYNC_SCRIPT"
 cp "$SCRIPT_DIR/scripts/darktable_wrapper.sh" "$WRAPPER_SCRIPT"
-chmod +x "$SYNC_SCRIPT" "$WRAPPER_SCRIPT"
+chmod +x "$COMMON_SCRIPT" "$SYNC_SCRIPT" "$WRAPPER_SCRIPT"
 
-### Install systemd user service and timer
-
-cp "$SCRIPT_DIR/systemd/darktable-sync.service" "$HOME/.config/systemd/user/darktable-sync.service"
-cp "$SCRIPT_DIR/systemd/darktable-sync.timer" "$HOME/.config/systemd/user/darktable-sync.timer"
+### Systemd Service installieren (kein Timer mehr)
 
+mkdir -p "$SYSTEMD_USER_DIR"
+cp "$SCRIPT_DIR/systemd/darktable-sync.service" "$SYSTEMD_USER_DIR/darktable-sync.service"
 systemctl --user daemon-reload
-systemctl --user enable darktable-sync.timer
-systemctl --user start darktable-sync.timer
 
-### Install desktop shortcuts
+### .env anlegen falls noch nicht vorhanden
+
+if [ ! -f "$CONFIG_ENV" ]; then
+    cp "$SCRIPT_DIR/.env.example" "$CONFIG_ENV"
+    chmod 600 "$CONFIG_ENV"
+    echo ""
+    echo "WICHTIG: Konfiguration anpassen:"
+    echo "  nano $CONFIG_ENV"
+fi
+
+### Desktop-Shortcuts installieren
 
 cp "$SCRIPT_DIR/desktop/darktable-with-sync.desktop" "$DESKTOP_SHORTCUT"
-cp "$SCRIPT_DIR/desktop/darktable-sync-only.desktop" "$SYNC_ONLY_SHORTCUT"
+cp "$SCRIPT_DIR/desktop/darktable-sync-only.desktop"  "$SYNC_ONLY_SHORTCUT"
 
 update-desktop-database "$APPLICATIONS_DIR" 2>/dev/null || true
 
-echo "Installation finished."
+echo ""
+echo "Installation abgeschlossen."
+echo "  Konfiguration:     $CONFIG_ENV"
+echo "  Sync-Script:       $SYNC_SCRIPT"
+echo "  Wrapper-Script:    $WRAPPER_SCRIPT"
+echo ""
+echo "Darktable ueber den Desktop-Shortcut 'Darktable (mit Sync)' starten"
+echo "oder direkt: $WRAPPER_SCRIPT"