Update sync_data.sh

sync_data.sh

@@ -1,86 +1,57 @@
 #!/bin/bash
-set -euo pipefail
+set -e
 
-DB_PATH="/app/db/webui.db"
-DB_DIR="/app/db"
+DB_PATH="/app/data/webui.db"
+REPO_DIR="/app/db/temp_repo"
+LOG_FILE="/app/db/sync.log"
 
-# Check required environment variables
-if [ -z "${G_NAME:-}" ] || [ -z "${G_TOKEN:-}" ] || [ -z "${GPG_PASSPHRASE:-}" ]; then
-    echo "ERROR: Missing required environment variables G_NAME, G_TOKEN, or GPG_PASSPHRASE"
-    exit 1
-fi
-
-# Validate tool availability
-command -v inotifywait >/dev/null 2>&1 || { echo >&2 "inotifywait is not installed."; exit 1; }
-command -v gpg >/dev/null 2>&1 || { echo >&2 "gpg is not installed."; exit 1; }
+echo "Configuring for HuggingFace Space deployment" | tee -a $LOG_FILE
 
-# Parse repository info
-IFS='/' read -r GITHUB_USER GITHUB_REPO <<< "$G_NAME"
+# Construct repo URL using token
 REPO_URL="https://${G_TOKEN}@github.com/${G_NAME}.git"
 
-# Create db directory
-mkdir -p "$DB_DIR"
-
-# Initialize database
-if [ ! -f "$DB_PATH" ]; then
-    echo "Initializing encrypted database..."
-    if git clone "$REPO_URL" "$DB_DIR/temp_repo"; then
-        if [ -f "$DB_DIR/temp_repo/webui.db.gpg" ]; then
-            echo "$GPG_PASSPHRASE" | gpg --batch --passphrase-fd 0 -o "$DB_PATH" -d "$DB_DIR/temp_repo/webui.db.gpg"
-            echo "Database restored from GitHub"
-        else
-            touch "$DB_PATH"
-            echo "Created new empty database"
-        fi
-        rm -rf "$DB_DIR/temp_repo"
-    else
-        touch "$DB_PATH"
-        echo "Created new empty database"
-    fi
+# Clean old repo (if container restarted)
+rm -rf $REPO_DIR
+
+# Clone fresh copy
+echo "Cloning repo $G_NAME..." | tee -a $LOG_FILE
+git clone "$REPO_URL" "$REPO_DIR"
+cd $REPO_DIR
+git config user.email "bot@huggingface.space"
+git config user.name "HF Space Bot"
+cd -
+
+# If encrypted DB exists in repo, restore it
+if [ -f "$REPO_DIR/webui.db.gpg" ]; then
+    echo "Found encrypted DB in repo, decrypting..." | tee -a $LOG_FILE
+    gpg --batch --yes --passphrase "$GPG_PASSPHRASE" -o "$DB_PATH" -d "$REPO_DIR/webui.db.gpg" || \
+        echo "Failed to decrypt DB, starting fresh" | tee -a $LOG_FILE
+else
+    echo "No DB found in repo, starting with new empty DB" | tee -a $LOG_FILE
+    mkdir -p /app/data
+    touch "$DB_PATH"
 fi
 
-# Configure Git
-git config --global user.name "Encrypted DB Sync"
-git config --global user.email "encrypted-sync@bot.com"
+# ---------------------------
+# Runtime loop: sync every 5 min
+# ---------------------------
+while true; do
+    echo "[$(date)] Starting sync..." | tee -a $LOG_FILE
 
-# Change to db directory
-cd "$DB_DIR" || exit 1
+    if [ -f "$DB_PATH" ]; then
+        # Encrypt current DB
+        gpg --batch --yes --passphrase "$GPG_PASSPHRASE" -c "$DB_PATH"
+        mv "$DB_PATH.gpg" "$REPO_DIR/webui.db.gpg"
 
-# Synchronization function with retry logic
-sync_loop() {
-    while true; do
-        # Monitor for database changes
-        inotifywait -qq -e modify "$DB_PATH"
-        
-        # Get current time
-        CURRENT_TIME=$(date '+%Y-%m-%d %H:%M:%S')
-        echo "[$CURRENT_TIME] Local changes detected, starting sync..."
-        
-        # Pull latest changes
-        git pull origin main 2>/dev/null || git pull origin master || true
-        
-        # Encrypt database
-        echo "$GPG_PASSPHRASE" | gpg --batch --passphrase-fd 0 -o webui.db.gpg -c "$DB_PATH"
-        
-        # Commit changes
+        cd "$REPO_DIR"
         git add webui.db.gpg
-        git commit -m "Auto-sync: Encrypted webui.db updated at $CURRENT_TIME" || true
-        
-        # Push with exponential backoff
-        MAX_RETRIES=3
-        RETRY_DELAY=5
-        for ((i=1; i<=MAX_RETRIES; i++)); do
-            if git push origin HEAD; then
-                echo "GitHub push successful"
-                break
-            else
-                echo "Push attempt $i failed, retrying in $RETRY_DELAY seconds..."
-                sleep $RETRY_DELAY
-                RETRY_DELAY=$((RETRY_DELAY * 2))  # Exponential backoff
-            fi
-        done
-    done
-}
+        git commit -m "DB sync: $(date)" || echo "No changes to commit" | tee -a $LOG_FILE
+        git push origin HEAD:main || echo "Git push failed" | tee -a $LOG_FILE
+        cd -
+    else
+        echo "[$(date)] Warning: DB file missing, skipping sync" | tee -a $LOG_FILE
+    fi
 
-# Start synchronization
-sync_loop &
+    echo "[$(date)] Sync done, sleeping 5 mins..." | tee -a $LOG_FILE
+    sleep 300
+done