Fix restore: sentinel file logika — restore jednom, pa cuva podatke

backup_restore.sh

@@ -8,6 +8,7 @@ BACKUP_INTERVAL_SECONDS="${HF_BACKUP_INTERVAL_SECONDS:-300}"
 BACKUP_NAME="openwebui-data.tar.gz"
 BACKUP_URL=""
 UPLOAD_URL=""
+SENTINEL="${DATA_DIR}/.hf_backup_restored"
 
 if [ -n "$HF_REPO" ]; then
   BACKUP_URL="https://huggingface.co/datasets/${HF_REPO}/resolve/main/${BACKUP_NAME}"
@@ -15,16 +16,10 @@ if [ -n "$HF_REPO" ]; then
 fi
 
 if [ -z "$HF_REPO" ] || [ -z "$HF_TOKEN" ]; then
-  echo "HF backup nije omogucen: postavi HF_BACKUP_REPO i HF_TOKEN u Space Secrets ako zelis restore/backup."
+  echo "HF backup nije omogucen: postavi HF_BACKUP_REPO i HF_TOKEN u Space Secrets."
   exit 0
 fi
 
-# Provjera: da li /data vec ima sadrzaj (persistent volume nije prazan)
-data_is_populated() {
-  FILE_COUNT=$(find "$DATA_DIR" -mindepth 1 -maxdepth 2 2>/dev/null | wc -l)
-  [ "$FILE_COUNT" -ge 2 ]
-}
-
 backup_archive() {
   local archive_path="$1"
   mkdir -p "$(dirname "$archive_path")"
@@ -34,13 +29,13 @@ backup_archive() {
 do_restore() {
   mkdir -p "$DATA_DIR"
 
-  # NOVA LOGIKA: Preskoci restore ako persistent volume vec ima podatke
-  if data_is_populated; then
-    echo "Persistent volume vec ima podatke ($(find "$DATA_DIR" -mindepth 1 -maxdepth 2 | wc -l) fajlova) — preskacem restore iz HF."
+  # Ako sentinel postoji, backup je vec jednom uspjesno restorovan — preskoci
+  if [ -f "$SENTINEL" ]; then
+    echo "Sentinel pronadjen — backup vec restorovan, preskacemo. Za force restore: obrisi ${SENTINEL}"
     return
   fi
 
-  echo "Pokusavam restore Open WebUI data iz ${HF_REPO}..."
+  echo "Sentinel nije pronadjen — pokusavam restore iz ${HF_REPO}..."
 
   HTTP_STATUS=$(curl -s -o /tmp/openwebui_restore.tar.gz -w "%{http_code}" \
     -L \
@@ -50,14 +45,17 @@ do_restore() {
   if [ "$HTTP_STATUS" = "200" ]; then
     FILESIZE=$(wc -c < /tmp/openwebui_restore.tar.gz)
     if [ "$FILESIZE" -gt 1000 ]; then
-      find "$DATA_DIR" -mindepth 1 -maxdepth 1 -exec rm -rf {} +
+      echo "Brisem stare podatke i raspakovavam backup (${FILESIZE} bytes)..."
+      find "$DATA_DIR" -mindepth 1 -maxdepth 1 -not -name '.hf_backup_restored' -exec rm -rf {} +
       tar -xzf /tmp/openwebui_restore.tar.gz -C "$DATA_DIR"
-      echo "Data restored: ${FILESIZE} bytes"
+      # Kreiraj sentinel — sljedeci restart ce preskociti restore
+      touch "$SENTINEL"
+      echo "✅ Restore uspesan! Sentinel kreiran."
     else
-      echo "Backup je premalen, preskacem restore."
+      echo "Backup je premalen (${FILESIZE} bytes), preskacem restore."
     fi
   else
-    echo "Backup ne postoji ili nije dostupan (HTTP ${HTTP_STATUS})."
+    echo "Backup nije dostupan (HTTP ${HTTP_STATUS}) — pokrecemo WebUI bez restore."
   fi
 }
 
@@ -72,7 +70,7 @@ backup_archive_to_hf() {
 
   FILESIZE=$(wc -c < "$ARCHIVE_PATH")
   if [ "$FILESIZE" -lt 1000 ]; then
-    echo "Arhiva je premala (${FILESIZE} bytes), preskacem backup."
+    echo "Arhiva premala (${FILESIZE} bytes), preskacem backup."
     return
   fi
 
@@ -86,31 +84,27 @@ backup_archive_to_hf() {
   if [ "$HTTP_STATUS" = "200" ] || [ "$HTTP_STATUS" = "201" ]; then
     echo "Backup uspesan."
   else
-    echo "Backup nije uspesan (HTTP ${HTTP_STATUS})."
+    echo "Backup neuspesan (HTTP ${HTTP_STATUS})."
     cat /tmp/backup_response.json 2>/dev/null || true
   fi
 }
 
-# Podrska za mode argument: restore | loop | all (default)
 MODE="${1:-all}"
 
 case "$MODE" in
   restore)
-    # Samo uradi restore, pa izadji (za sekvencijalni startup)
     do_restore
     ;;
   loop)
-    # Samo backup loop (bez restore)
-    echo "Periodicki backup svakih ${BACKUP_INTERVAL_SECONDS} sekundi je aktivan."
+    echo "Periodicki backup svakih ${BACKUP_INTERVAL_SECONDS} sekundi aktivan."
     while true; do
       sleep "$BACKUP_INTERVAL_SECONDS"
       backup_archive_to_hf
     done
     ;;
   all|*)
-    # Legacy mode: restore pa loop
     do_restore
-    echo "Periodicki backup svakih ${BACKUP_INTERVAL_SECONDS} sekundi je aktivan."
+    echo "Periodicki backup svakih ${BACKUP_INTERVAL_SECONDS} sekundi aktivan."
     while true; do
       sleep "$BACKUP_INTERVAL_SECONDS"
       backup_archive_to_hf