Upload 4 files

entrypoint.sh

@@ -95,27 +95,84 @@ echo "Syncing files from Google Drive..."
 rclone copy "$REMOTE_PATH" "$DATA_DIR" --config "$CONFIG_PATH" --drive-skip-shortcuts --drive-acknowledge-abuse $SHARED_FLAG || true
 
 # 3. Start background sync loops
-# Loop A: Sync files in /data to Google Drive when modified
+# Loop A: Sync files in /data to Google Drive when modified (Debounced & Robust)
 (
     echo "Starting file sync daemon..."
+    LAST_EVENT_FILE="/tmp/last_event_time"
+    PENDING_FILE="/tmp/sync_pending"
+    DEBOUNCE_SECS=10
+
+    # Clear any old state
+    rm -f "$LAST_EVENT_FILE" "$PENDING_FILE"
+
+    # Start inotifywait in monitor mode to ensure we don't miss any events while syncing
+    inotifywait -r -m -e close_write,delete,move "$DATA_DIR" 2>/dev/null | while read -r _; do
+        date +%s > "$LAST_EVENT_FILE"
+        if [ ! -f "$PENDING_FILE" ]; then
+            touch "$PENDING_FILE"
+        fi
+    done &
+
+    # Background runner that waits for a quiet period before syncing
     while true; do
-        # Monitor /data for write, create, delete, or move events
-        inotifywait -r -e modify,create,delete,move "$DATA_DIR"
-        sleep 5
-        echo "Changes detected in $DATA_DIR, copying to Google Drive ($REMOTE_PATH)..."
-        rclone copy "$DATA_DIR" "$REMOTE_PATH" --config "$CONFIG_PATH" --drive-skip-shortcuts --drive-acknowledge-abuse $SHARED_FLAG
+        if [ -f "$PENDING_FILE" ]; then
+            last_time=$(cat "$LAST_EVENT_FILE" 2>/dev/null || echo 0)
+            now=$(date +%s)
+            elapsed=$((now - last_time))
+            if [ "$elapsed" -ge "$DEBOUNCE_SECS" ]; then
+                rm -f "$PENDING_FILE"
+                echo "Changes detected in $DATA_DIR, syncing to Google Drive ($REMOTE_PATH)..."
+                if rclone copy "$DATA_DIR" "$REMOTE_PATH" --config "$CONFIG_PATH" --drive-skip-shortcuts --drive-acknowledge-abuse $SHARED_FLAG; then
+                    echo "File sync successful."
+                else
+                    echo "File sync failed or partially completed (e.g. active uploads). Will retry..."
+                    # Set last event to now to debounce the next retry
+                    date +%s > "$LAST_EVENT_FILE"
+                    touch "$PENDING_FILE"
+                fi
+            fi
+        fi
+        sleep 2
     done
 ) &
 
-# Loop B: Sync database /tmp/filebrowser.db to Google Drive when modified
+# Loop B: Sync database /tmp/filebrowser.db to Google Drive when modified (Debounced & Robust)
 (
     echo "Starting database sync daemon..."
+    DB_LAST_EVENT="/tmp/db_last_event"
+    DB_PENDING="/tmp/db_sync_pending"
+    DEBOUNCE_SECS=3
+
+    # Clear any old state
+    rm -f "$DB_LAST_EVENT" "$DB_PENDING"
+
+    # Start inotifywait in monitor mode
+    inotifywait -m -e modify "$DB_PATH" 2>/dev/null | while read -r _; do
+        date +%s > "$DB_LAST_EVENT"
+        if [ ! -f "$DB_PENDING" ]; then
+            touch "$DB_PENDING"
+        fi
+    done &
+
+    # Background runner for database sync
     while true; do
-        # Monitor SQLite database file for modification events
-        inotifywait -e modify "$DB_PATH"
-        sleep 2
-        echo "Database modified, uploading to Google Drive ($REMOTE_PATH)..."
-        rclone copyto "$DB_PATH" "$REMOTE_PATH/.filebrowser.db" --config "$CONFIG_PATH" $SHARED_FLAG
+        if [ -f "$DB_PENDING" ]; then
+            last_time=$(cat "$DB_LAST_EVENT" 2>/dev/null || echo 0)
+            now=$(date +%s)
+            elapsed=$((now - last_time))
+            if [ "$elapsed" -ge "$DEBOUNCE_SECS" ]; then
+                rm -f "$DB_PENDING"
+                echo "Database modified, uploading to Google Drive ($REMOTE_PATH)..."
+                if rclone copyto "$DB_PATH" "$REMOTE_PATH/.filebrowser.db" --config "$CONFIG_PATH" $SHARED_FLAG; then
+                    echo "Database sync successful."
+                else
+                    echo "Database sync failed. Will retry..."
+                    date +%s > "$DB_LAST_EVENT"
+                    touch "$DB_PENDING"
+                fi
+            fi
+        fi
+        sleep 1
     done
 ) &