martin/darktable-sync
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Rename NAS to server to make it more general

Browse Source
This commit is contained in:
Martin Tröger
2025-06-09 16:39:19 +02:00
parent d7ca1fa2a8
commit 3a6c4e28b3
3 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.example
+7 -7
View File
@@ -1,11 +1,11 @@
# NAS Connection Settings # Server Connection Settings
NAS_USER="your_nas_user" SERVER_USER="your_nas_user"
NAS_SSH_PORT=22 SERVER_SSH_PORT=22
NAS_IP="192.168.1.100" SERVER_IP="192.168.1.100"
# NAS Paths # Server Paths
NAS_DB_DIR="/path/on/nas/darktable_db" SERVER_DB_DIR="/path/on/nas/darktable_db"
NAS_PHOTO_DIR="/path/on/nas/photo_library" SERVER_PHOTO_DIR="/path/on/nas/photo_library"
# Local Paths # Local Paths
LOCAL_PHOTO_DIR="$HOME/Pictures/raw" LOCAL_PHOTO_DIR="$HOME/Pictures/raw"
README.md
+2
View File
@@ -4,6 +4,8 @@ Auto-sync your Darktable database and photos between different computers with a
Since only file synchronization is performed, only one Darktable instance should run at a time. Since only file synchronization is performed, only one Darktable instance should run at a time.
The installation is currently written and tested on (K)Ubuntu 25.04 only.
## Features ✨ ## Features ✨
- 🔄 Bidirectional sync between local machines and a server - 🔄 Bidirectional sync between local machines and a server
- ⏲️ Automatic sync every 5 minutes via systemd timer - ⏲️ Automatic sync every 5 minutes via systemd timer
install.sh
+33 -33
View File
@@ -3,11 +3,11 @@
set -e set -e
### 🔧 Default Configuration (can be overridden by .env file) ### 🔧 Default Configuration (can be overridden by .env file)
NAS_USER="${NAS_USER:-$USER}" # Default: current user SERVER_USER="${SERVER_USER:-$USER}" # Default: current user
NAS_SSH_PORT="${NAS_SSH_PORT:-22}" # Default: standard SSH port SERVER_SSH_PORT="${SERVER_SSH_PORT:-22}" # Default: standard SSH port
NAS_IP="${NAS_IP:-192.168.1.100}" # Default: common local network SERVER_IP="${SERVER_IP:-192.168.1.100}" # Default: common local network
NAS_DB_DIR="${NAS_DB_DIR:-/volume1/Darktable/darktable_db}" SERVER_DB_DIR="${SERVER_DB_DIR:-/volume1/Darktable/darktable_db}"
NAS_PHOTO_DIR="${NAS_PHOTO_DIR:-/volume1/Darktable/photo_library}" SERVER_PHOTO_DIR="${SERVER_PHOTO_DIR:-/volume1/Darktable/photo_library}"
LOCAL_PHOTO_DIR="${PHOTO_DIR:-$HOME/Pictures/raw}" LOCAL_PHOTO_DIR="${PHOTO_DIR:-$HOME/Pictures/raw}"
LOCAL_DARKTABLE_DB_DIR="${DARKTABLE_DB_DIR:-$HOME/.config/darktable}" LOCAL_DARKTABLE_DB_DIR="${DARKTABLE_DB_DIR:-$HOME/.config/darktable}"
BIN_DIR="${BIN_DIR:-$HOME/.local/bin}" BIN_DIR="${BIN_DIR:-$HOME/.local/bin}"
@@ -33,11 +33,11 @@ fi
### 📝 Show effective configuration ### 📝 Show effective configuration
echo "Using configuration:" echo "Using configuration:"
echo "NAS_USER: $NAS_USER" echo "SERVER_USER: $SERVER_USER"
echo "NAS_IP: $NAS_IP" echo "SERVER_IP: $SERVER_IP"
echo "NAS_SSH_PORT: $NAS_SSH_PORT" echo "SERVER_SSH_PORT: $SERVER_SSH_PORT"
echo "NAS_DB_DIR: $NAS_DB_DIR" echo "SERVER_DB_DIR: $SERVER_DB_DIR"
echo "NAS_PHOTO_DIR: $NAS_PHOTO_DIR" echo "SERVER_PHOTO_DIR: $SERVER_PHOTO_DIR"
echo "PHOTO_DIR: $LOCAL_PHOTO_DIR" echo "PHOTO_DIR: $LOCAL_PHOTO_DIR"
echo "DARKTABLE_DB_DIR:$LOCAL_DARKTABLE_DB_DIR" echo "DARKTABLE_DB_DIR:$LOCAL_DARKTABLE_DB_DIR"
echo "BIN_DIR: $BIN_DIR" echo "BIN_DIR: $BIN_DIR"
@@ -67,24 +67,24 @@ if [ ! -d "$LOCAL_DARKTABLE_DB_DIR" ]; then
exit 1 exit 1
fi fi
# Check if NAS is reachable # Check if Server is reachable
if ping -c 1 "$NAS_IP" &>/dev/null; then if ping -c 1 "$SERVER_IP" &>/dev/null; then
echo "✅ NAS is reachable: $NAS_IP" echo "✅ Server is reachable: $SERVER_IP"
if ! ssh -p "$NAS_SSH_PORT" "$NAS_USER@$NAS_IP" "[ -d '$NAS_DB_DIR' ]"; then if ! ssh -p "$SERVER_SSH_PORT" "$SERVER_USER@$SERVER_IP" "[ -d '$SERVER_DB_DIR' ]"; then
echo "❌ Remote directory missing on NAS: $NAS_DB_DIR" echo "❌ Remote directory missing on Server: $SERVER_DB_DIR"
echo "👉 Please create it or adjust the path." echo "👉 Please create it or adjust the path."
exit 1 exit 1
fi fi
if ! ssh -p "$NAS_SSH_PORT" "$NAS_USER@$NAS_IP" "[ -d '$NAS_PHOTO_DIR' ]"; then if ! ssh -p "$SERVER_SSH_PORT" "$SERVER_USER@$SERVER_IP" "[ -d '$SERVER_PHOTO_DIR' ]"; then
echo "❌ Remote directory missing on NAS: $NAS_PHOTO_DIR" echo "❌ Remote directory missing on Server: $SERVER_PHOTO_DIR"
echo "👉 Please create it or adjust the path." echo "👉 Please create it or adjust the path."
exit 1 exit 1
fi fi
else else
echo "⚠️ NAS not reachable: $NAS_IP" echo "⚠️ Server not reachable: $SERVER_IP"
echo "➡️ Sync will fail until NAS is online." echo "➡️ Sync will fail until Server is online."
fi fi
### ✅ Create sync script ### ✅ Create sync script
@@ -119,37 +119,37 @@ if [[ "\$1" == "--with-notify-start-stop" ]]; then
SHOW_NOTIFY_START_STOP=true SHOW_NOTIFY_START_STOP=true
fi fi
if ping -c 1 $NAS_IP &>/dev/null; then if ping -c 1 $SERVER_IP &>/dev/null; then
export DISPLAY=:0 export DISPLAY=:0
SYNC_LOG=\$(mktemp) SYNC_LOG=\$(mktemp)
log "🔃 NAS is reachable – starting sync..." log "🔃 Server is reachable – starting sync..."
log "Log file: \$SYNC_LOG" log "Log file: \$SYNC_LOG"
if [ "\$SHOW_NOTIFY_START_STOP" = true ]; then if [ "\$SHOW_NOTIFY_START_STOP" = true ]; then
notify-send "Darktable Sync" "🔄 Sync started..." -t 3000 notify-send "Darktable Sync" "🔄 Sync started..." -t 3000
fi fi
log "⬆️ Uploading Darktable DB to NAS..." log "⬆️ Uploading Darktable DB to Server..."
UPLOAD_LOG1=\$(mktemp) UPLOAD_LOG1=\$(mktemp)
rsync -avh --itemize-changes -e "ssh -p $NAS_SSH_PORT" "$LOCAL_DARKTABLE_DB_DIR/" "$NAS_USER@$NAS_IP:$NAS_DB_DIR/" 2>&1 | tee -a "\$SYNC_LOG" "\$UPLOAD_LOG1" rsync -avh --itemize-changes -e "ssh -p $SERVER_SSH_PORT" "$LOCAL_DARKTABLE_DB_DIR/" "$SERVER_USER@$SERVER_IP:$SERVER_DB_DIR/" 2>&1 | tee -a "\$SYNC_LOG" "\$UPLOAD_LOG1"
SENT1=\$(count_synced_files "\$UPLOAD_LOG1" "up") SENT1=\$(count_synced_files "\$UPLOAD_LOG1" "up")
rm "\$UPLOAD_LOG1" rm "\$UPLOAD_LOG1"
log "⬆️ Uploading photos to NAS..." log "⬆️ Uploading photos to Server..."
UPLOAD_LOG2=\$(mktemp) UPLOAD_LOG2=\$(mktemp)
rsync -avh --itemize-changes -e "ssh -p $NAS_SSH_PORT" "$LOCAL_PHOTO_DIR/" "$NAS_USER@$NAS_IP:$NAS_PHOTO_DIR/" 2>&1 | tee -a "\$SYNC_LOG" "\$UPLOAD_LOG2" rsync -avh --itemize-changes -e "ssh -p $SERVER_SSH_PORT" "$LOCAL_PHOTO_DIR/" "$SERVER_USER@$SERVER_IP:$SERVER_PHOTO_DIR/" 2>&1 | tee -a "\$SYNC_LOG" "\$UPLOAD_LOG2"
SENT2=\$(count_synced_files "\$UPLOAD_LOG2" "up") SENT2=\$(count_synced_files "\$UPLOAD_LOG2" "up")
rm "\$UPLOAD_LOG2" rm "\$UPLOAD_LOG2"
log "⬇️ Downloading DB back from NAS..." log "⬇️ Downloading DB back from Server..."
DOWNLOAD_LOG1=\$(mktemp) DOWNLOAD_LOG1=\$(mktemp)
rsync -avh --itemize-changes -e "ssh -p $NAS_SSH_PORT" "$NAS_USER@$NAS_IP:$NAS_DB_DIR/" "$LOCAL_DARKTABLE_DB_DIR/" 2>&1 | tee -a "\$SYNC_LOG" "\$DOWNLOAD_LOG1" rsync -avh --itemize-changes -e "ssh -p $SERVER_SSH_PORT" "$SERVER_USER@$SERVER_IP:$SERVER_DB_DIR/" "$LOCAL_DARKTABLE_DB_DIR/" 2>&1 | tee -a "\$SYNC_LOG" "\$DOWNLOAD_LOG1"
RECEIVED1=\$(count_synced_files "\$DOWNLOAD_LOG1" "down") RECEIVED1=\$(count_synced_files "\$DOWNLOAD_LOG1" "down")
rm "\$DOWNLOAD_LOG1" rm "\$DOWNLOAD_LOG1"
log "⬇️ Downloading photos from NAS..." log "⬇️ Downloading photos from Server..."
DOWNLOAD_LOG2=\$(mktemp) DOWNLOAD_LOG2=\$(mktemp)
rsync -avh --itemize-changes -e "ssh -p $NAS_SSH_PORT" "$NAS_USER@$NAS_IP:$NAS_PHOTO_DIR/" "$LOCAL_PHOTO_DIR/" 2>&1 | tee -a "\$SYNC_LOG" "\$DOWNLOAD_LOG2" rsync -avh --itemize-changes -e "ssh -p $SERVER_SSH_PORT" "$SERVER_USER@$SERVER_IP:$SERVER_PHOTO_DIR/" "$LOCAL_PHOTO_DIR/" 2>&1 | tee -a "\$SYNC_LOG" "\$DOWNLOAD_LOG2"
RECEIVED2=\$(count_synced_files "\$DOWNLOAD_LOG2" "down") RECEIVED2=\$(count_synced_files "\$DOWNLOAD_LOG2" "down")
rm "\$DOWNLOAD_LOG2" rm "\$DOWNLOAD_LOG2"
@@ -170,7 +170,7 @@ if ping -c 1 $NAS_IP &>/dev/null; then
rm -f "\$SYNC_LOG" rm -f "\$SYNC_LOG"
else else
log "❌ NAS not reachable – skipping sync." log "❌ Server not reachable – skipping sync."
fi fi
EOF EOF
@@ -232,7 +232,7 @@ Type=Application
Terminal=false Terminal=false
Categories=Graphics; Categories=Graphics;
StartupNotify=true StartupNotify=true
Keywords=Darktable;Photo;Sync;NAS;Rsync; Keywords=Darktable;Photo;Sync;Server;Rsync;
EOF EOF
chmod +x "$DESKTOP_SHORTCUT" chmod +x "$DESKTOP_SHORTCUT"
@@ -247,7 +247,7 @@ Type=Application
Terminal=false Terminal=false
Categories=Utility; Categories=Utility;
StartupNotify=true StartupNotify=true
Keywords=Darktable;Photo;Sync;NAS;Schedule; Keywords=Darktable;Photo;Sync;Server;Schedule;
EOF EOF
chmod +x "$SYNC_ONLY_SHORTCUT" chmod +x "$SYNC_ONLY_SHORTCUT"
@@ -262,4 +262,4 @@ echo ""
echo "✅ Setup complete." echo "✅ Setup complete."
echo "" echo ""
echo "🖱 You can start Darktable via 'Darktable with Sync' in your application menu." echo "🖱 You can start Darktable via 'Darktable with Sync' in your application menu."
echo "🕒 Sync will run every 5 minutes automatically when the NAS is online." echo "🕒 Sync will run every 5 minutes automatically when the Server is online."