Update sync_data.sh

sync_data.sh

@@ -1,356 +1,336 @@
 #!/bin/bash
 
-# 检查 Hugging Face Token 和 Dataset ID 环境变量
+# Function to check if Cloudreve is running by checking the port
+wait_for_cloudreve() {
+    echo "Waiting for Cloudreve service to become available on port 5212..."
+    # Loop until nc successfully connects (-z checks without sending data)
+    while ! nc -z 127.0.0.1 5212; do
+        echo "Cloudreve not ready yet (port 5212 not open), sleeping for 5 seconds..."
+        sleep 5
+    done
+    echo "Cloudreve service detected on port 5212."
+}
+
+# Function to perform a single backup action
+perform_backup_once() {
+    echo "Performing single backup operation..."
+    local config_path="$1"
+    local db_path="$2"
+    local exe_path="$3"
+    local cloudreve_dir="$4"
+    local backup_prefix="$5"
+
+    if [ ! -f "$config_path" ] || [ ! -f "$db_path" ] || [ ! -f "$exe_path" ]; then
+         echo "WARN: Essential files missing for backup. Skipping this backup."
+         return 1
+    fi
+
+    local timestamp=$(date +%Y%m%d_%H%M%S)
+    local backup_file="${backup_prefix}_${timestamp}.tar.gz"
+    local backup_path="/tmp/${backup_file}" # Use /tmp for temporary files
+
+    echo "Compressing Cloudreve data (executable, db, config) to: $backup_path"
+    tar -czf "$backup_path" -C "$cloudreve_dir" \
+        $(basename "$exe_path") \
+        $(basename "$db_path") \
+        $(basename "$config_path")
+
+    if [ -s "$backup_path" ]; then
+        echo "Compression complete. File size: $(ls -lh "$backup_path" | awk '{print $5}')"
+        echo "Uploading backup to HuggingFace..."
+        # Call the previously defined upload_backup function
+        upload_backup "$backup_path" "${backup_file}"
+        local upload_status=$?
+        if [ $upload_status -ne 0 ]; then
+            echo "Backup upload failed. Keeping local archive: $backup_path"
+            return 1
+        else
+            echo "Upload successful. Removing local archive."
+            rm -f "$backup_path"
+            return 0
+        fi
+    else
+        echo "Compression failed or created an empty file. Skipping upload."
+        rm -f "$backup_path" # Remove potentially empty/corrupt file
+        return 1
+    fi
+}
+
+
+# --- Start Script Execution ---
+
+# Check Hugging Face Token and Dataset ID environment variables
 if [[ -z "$HF_TOKEN" ]] || [[ -z "$DATASET_ID" ]]; then
-    echo "Starting Cloudreve without backup/restore functionality - missing HF_TOKEN or DATASET_ID"
-    # 直接启动 Cloudreve 作为主进程
-    echo "Starting Cloudreve directly..."
-    # 假设无备份时仍需 Aria2：
-    # 注意：如果不需要 Aria2，应移除下面的 Aria2 启动或确保 Dockerfile 的 CMD 也移除了 Aria2
-    # aria2c [YOUR_ARIA2_OPTIONS_HERE] & # 根据需要添加 Aria2 参数
+    echo "Starting without backup functionality - missing HF_TOKEN or DATASET_ID"
+    # Ensure Aria2 starts if needed, even without backup/restore
+    # Example (adjust options as needed from your Dockerfile CMD):
+    # aria2c --daemon=true [OTHER_OPTIONS] &
     exec /opt/cloudreve/cloudreve -c /opt/cloudreve/config.ini
-    exit 0 # exec 通常不会返回，但加上 exit 0 以防万一
+    exit 0
 fi
 
-# 激活 Python 虚拟环境
+# Activate Python virtual environment
 echo "Activating Python venv..."
 source /opt/venv/bin/activate
 
-# 定义 Cloudreve 主程序目录 和 备份文件前缀
+# Define Cloudreve paths and backup prefix
 CLOUDREVE_DIR="/opt/cloudreve"
 BACKUP_PREFIX="cloudreve_backup"
 CONFIG_FILE_PATH="/opt/cloudreve/config.ini"
 DB_FILE_PATH="/opt/cloudreve/cloudreve.db"
 EXECUTABLE_PATH="/opt/cloudreve/cloudreve"
 
-# --- Python 函数定义 ---
 
-# Python 函数: 上传备份
+# --- Python Function Definitions (Ensure these are complete) ---
+
+# Python Function: Upload Backup
 upload_backup() {
-    file_path="$1"
-    file_name="$2"
-    token="$HF_TOKEN"
-    repo_id="$DATASET_ID"
+    local file_path="$1"
+    local file_name="$2"
+    local token="$HF_TOKEN"
+    local repo_id="$DATASET_ID"
 
     echo "Preparing to upload backup file: $file_path as $file_name to Dataset: $repo_id"
 
+    # Use python3 -c "..." with the full Python code block here
+    # (Using placeholder for brevity, replace with your actual Python code)
     python3 -c "
 from huggingface_hub import HfApi
-import sys
-import os
+import sys, os
 print(f'HF_TOKEN is set: {os.environ.get(\"HF_TOKEN\") is not None}')
 print(f'DATASET_ID is set: {os.environ.get(\"DATASET_ID\") is not None}')
-def manage_backups(api, repo_id_val, max_files=5):
+def manage_backups(api, repo_id_val, max_files=50): # Increased max_files
     print('Managing old backups...')
-    files = api.list_repo_files(repo_id=repo_id_val, repo_type='dataset')
-    backup_files = [f for f in files if f.startswith('$BACKUP_PREFIX') and f.endswith('.tar.gz')]
-    backup_files.sort()
-    if len(backup_files) >= max_files:
-        print(f'Found {len(backup_files)} backup files, maximum allowed is {max_files}.')
-        # Corrected logic: delete oldest files until count is max_files - 1
-        files_to_delete = backup_files[:len(backup_files) - max_files + 1]
-        for file_to_delete in files_to_delete:
-            try:
-                print(f'Deleting old backup: {file_to_delete}')
-                api.delete_file(path_in_repo=file_to_delete, repo_id=repo_id_val, repo_type='dataset')
-                print(f'Successfully deleted: {file_to_delete}')
-            except Exception as e:
-                print(f'Error deleting {file_to_delete}: {str(e)}')
-    else:
-        print('Number of backup files is within the limit.')
+    try:
+        files = api.list_repo_files(repo_id=repo_id_val, repo_type='dataset')
+        backup_files = sorted([f for f in files if f.startswith('$BACKUP_PREFIX') and f.endswith('.tar.gz')])
+        if len(backup_files) >= max_files:
+            print(f'Found {len(backup_files)} backup files, maximum allowed is {max_files}.')
+            files_to_delete = backup_files[:len(backup_files) - max_files + 1]
+            print(f'Will delete {len(files_to_delete)} old backups.')
+            for file_to_delete in files_to_delete:
+                try:
+                    print(f'Deleting old backup: {file_to_delete}')
+                    api.delete_file(path_in_repo=file_to_delete, repo_id=repo_id_val, repo_type='dataset', token=os.environ.get('HF_TOKEN'))
+                    print(f'Successfully deleted: {file_to_delete}')
+                except Exception as e:
+                    print(f'Error deleting {file_to_delete}: {str(e)}')
+        else:
+            print(f'Number of backup files ({len(backup_files)}) is within the limit ({max_files}).')
+    except Exception as e:
+        print(f'Error listing or managing backups: {e}')
+
 api = HfApi(token='$token')
 try:
-    repo_id_val = os.environ.get('DATASET_ID') # 从环境变量中获取 repo_id
-    if not repo_id_val:
-        raise ValueError('DATASET_ID environment variable is not set.')
+    repo_id_val = os.environ.get('DATASET_ID')
+    if not repo_id_val: raise ValueError('DATASET_ID environment variable is not set.')
     print(f'Uploading file: $file_path to {repo_id_val} as $file_name')
-    api.upload_file(
-        path_or_fileobj='$file_path',
-        path_in_repo='$file_name',
-        repo_id=repo_id_val,
-        repo_type='dataset'
-    )
+    api.upload_file(path_or_fileobj='$file_path', path_in_repo='$file_name', repo_id=repo_id_val, repo_type='dataset', token=os.environ.get('HF_TOKEN'))
     print(f'Successfully uploaded $file_name')
     manage_backups(api, repo_id_val)
 except Exception as e:
     print(f'Error uploading file: {str(e)}')
-    sys.exit(1) # Exit if upload fails
+    sys.exit(1) # Indicate failure
 "
+    # Capture python exit code
+    return $?
 }
 
-# Python 函数: 下载最新备份
+# Python Function: Download Latest Backup
 download_latest_backup() {
-  token="$HF_TOKEN"
-  repo_id="$DATASET_ID"
+    local token="$HF_TOKEN"
+    local repo_id="$DATASET_ID"
+    local download_flag_file="/tmp/backup_restored.flag" # Flag file
 
-  echo "Preparing to download the latest backup from Dataset: $repo_id"
+    # Remove any previous flag file
+    rm -f "$download_flag_file"
 
-  python3 -c "
-from huggingface_hub import HfApi, hf_hub_download
-import sys
-import os
-import tarfile
-import tempfile
-import shutil
-import subprocess
+    echo "Preparing to download the latest backup from Dataset: $repo_id"
 
+    # Use python3 -c "..." with the full Python code block here
+    # (Using placeholder for brevity, replace with your actual Python code)
+    python3 -c "
+from huggingface_hub import HfApi, hf_hub_download
+import sys, os, tarfile, tempfile, shutil, subprocess
 print(f'HF_TOKEN is set: {os.environ.get(\"HF_TOKEN\") is not None}')
 print(f'DATASET_ID is set: {os.environ.get(\"DATASET_ID\") is not None}')
+flag_file = '$download_flag_file' # Get flag file path
 
 api = HfApi(token='$token')
 try:
-    repo_id_val = os.environ.get('DATASET_ID') # 从环境变量中获取 repo_id
-    if not repo_id_val:
-        raise ValueError('DATASET_ID environment variable is not set.')
+    repo_id_val = os.environ.get('DATASET_ID')
+    if not repo_id_val: raise ValueError('DATASET_ID environment variable is not set.')
 
     print(f'Listing files in Dataset: {repo_id_val}')
     files = api.list_repo_files(repo_id=repo_id_val, repo_type='dataset')
-    backup_files = [f for f in files if f.startswith('$BACKUP_PREFIX') and f.endswith('.tar.gz')]
+    backup_files = sorted([f for f in files if f.startswith('$BACKUP_PREFIX') and f.endswith('.tar.gz')])
 
     if not backup_files:
         print('No backup files found in the Dataset. Skipping restore.')
-        # IMPORTANT: Exit with 0 to indicate success (no backup found is not a failure)
-        sys.exit(0)
+        sys.exit(0) # Success: No backup found is not an error for the script flow
 
-    latest_backup = sorted(backup_files)[-1]
+    latest_backup = backup_files[-1]
     print(f'Latest backup file found: {latest_backup}')
 
     with tempfile.TemporaryDirectory() as temp_dir:
         print(f'Downloading {latest_backup} to temporary directory {temp_dir}...')
         try:
-             filepath = hf_hub_download(
-                repo_id=repo_id_val,
-                filename=latest_backup,
-                repo_type='dataset',
-                local_dir=temp_dir,
-                token=os.environ.get('HF_TOKEN') # Pass token explicitly if needed
-            )
+            filepath = hf_hub_download(repo_id=repo_id_val, filename=latest_backup, repo_type='dataset', local_dir=temp_dir, token=os.environ.get('HF_TOKEN'))
         except Exception as download_error:
-             print(f'Error during hf_hub_download: {download_error}')
-             # Attempt to list files again for debugging
-             try:
-                 print('Attempting to list repo files again for debugging...')
-                 files_debug = api.list_repo_files(repo_id=repo_id_val, repo_type='dataset')
-                 print(f'Files found (debug): {files_debug}')
-             except Exception as list_error:
-                 print(f'Error listing files during debug: {list_error}')
-             sys.exit(1) # Exit if download fails
-
+            print(f'Error during hf_hub_download: {download_error}'); sys.exit(1)
 
         if filepath and os.path.exists(filepath):
             print(f'Successfully downloaded backup to temporary directory: {filepath}')
-
-            # Files/Dirs to restore (relative paths within CLOUDREVE_DIR)
             items_to_restore = ['cloudreve', 'cloudreve.db', 'config.ini']
-
-            # Ensure target directory exists
             os.makedirs(\"$CLOUDREVE_DIR\", exist_ok=True)
+            print('Listing contents before restore:'); subprocess.run(['ls', '-lA', \"$CLOUDREVE_DIR\"], check=False)
 
-            print('Listing contents before restore:')
-            subprocess.run(['ls', '-lA', \"$CLOUDREVE_DIR\"], check=False) # Use -A to show hidden files
-
-            # --- Safer Restore Logic ---
-            # 1. Extract backup to a temporary location first
-            extract_temp_dir = os.path.join(temp_dir, 'extracted_backup')
-            os.makedirs(extract_temp_dir, exist_ok=True)
+            extract_temp_dir = os.path.join(temp_dir, 'extracted_backup'); os.makedirs(extract_temp_dir, exist_ok=True)
             print(f'Extracting backup archive: {filepath} to {extract_temp_dir}')
             try:
-                # Use the 'r:gz' mode explicitly
-                with tarfile.open(filepath, 'r:gz') as tar:
-                    tar.extractall(extract_temp_dir)
+                with tarfile.open(filepath, 'r:gz') as tar: tar.extractall(extract_temp_dir)
                 print('Extraction complete.')
-            except tarfile.ReadError as tar_err:
-                print(f'Error reading tar file: {tar_err}')
-                sys.exit(1)
-            except Exception as extract_err:
-                 print(f'Error during extraction: {extract_err}')
-                 sys.exit(1)
-
+            except Exception as extract_err: print(f'Error during extraction: {extract_err}'); sys.exit(1)
 
-            # 2. Check if essential files exist in the extracted backup
             essential_files_present = True
-            print(f'Checking for essential items in extracted backup at {extract_temp_dir}:')
             for item in items_to_restore:
-                 extracted_item_path = os.path.join(extract_temp_dir, item)
-                 print(f'Checking for: {extracted_item_path}')
-                 if not os.path.exists(extracted_item_path):
-                      print(f'Error: Essential item "{item}" not found in extracted backup at {extracted_item_path}. Aborting restore.')
-                      essential_files_present = False
-                      # break # Stop checking (optional, maybe list all missing?)
-
+                extracted_item_path = os.path.join(extract_temp_dir, item)
+                if not os.path.exists(extracted_item_path):
+                    print(f'Error: Essential item "{item}" not found in extracted backup at {extracted_item_path}. Aborting restore.')
+                    essential_files_present = False; # break # Keep checking all missing items
             if not essential_files_present:
-                 print('Listing contents of extraction directory for debugging:')
-                 subprocess.run(['ls', '-lA', extract_temp_dir], check=False)
+                 print('Listing contents of extraction directory for debugging:'); subprocess.run(['ls', '-lA', extract_temp_dir], check=False)
                  sys.exit(1) # Abort if essential files are missing
 
-            # 3. Delete existing items in the target directory
             print(f'Deleting existing items in $CLOUDREVE_DIR before restoring...')
             for item in items_to_restore:
                 target_path = os.path.join(\"$CLOUDREVE_DIR\", item)
                 if os.path.exists(target_path):
                     try:
-                        if os.path.isdir(target_path) and not os.path.islink(target_path):
-                            print(f'Deleting directory: {target_path}')
-                            shutil.rmtree(target_path)
-                        else:
-                            print(f'Deleting file/link: {target_path}')
-                            os.remove(target_path)
-                    except OSError as e:
-                        print(f'Error deleting {target_path}: {e}. Continuing...')
-
+                        if os.path.isdir(target_path) and not os.path.islink(target_path): shutil.rmtree(target_path)
+                        else: os.remove(target_path)
+                    except OSError as e: print(f'Error deleting {target_path}: {e}. Continuing...')
 
-            # 4. Move extracted items to the target directory
             print(f'Moving extracted items from {extract_temp_dir} to $CLOUDREVE_DIR...')
             for item in items_to_restore:
                  source_path = os.path.join(extract_temp_dir, item)
-                 # Check if source exists before moving (should exist due to check above, but belt-and-suspenders)
                  if os.path.exists(source_path):
                      target_path = os.path.join(\"$CLOUDREVE_DIR\", item)
-                     try:
-                          print(f'Moving {source_path} to {target_path}')
-                          shutil.move(source_path, target_path)
-                     except Exception as move_err:
-                          print(f'Error moving {item}: {move_err}')
-                          # Decide if this is critical, maybe exit? For now, print and continue.
-                 else:
-                      # This case should ideally not happen if the check passed
-                      print(f'Warning: Source item {item} disappeared before move.')
-
+                     try: shutil.move(source_path, target_path)
+                     except Exception as move_err: print(f'Error moving {item}: {move_err}') # Continue for now
+                 else: print(f'Warning: Source item {item} disappeared before move.')
 
             print(f'Successfully restored backup from {latest_backup}')
-            print('Listing contents after restore:')
-            subprocess.run(['ls', '-lA', \"$CLOUDREVE_DIR\"], check=False) # Use -A
+            print('Listing contents after restore:'); subprocess.run(['ls', '-lA', \"$CLOUDREVE_DIR\"], check=False)
+            # Create the flag file only on successful restore
+            with open(flag_file, 'w') as f: f.write('restored')
+            print(f'Created restore flag file: {flag_file}')
+            sys.exit(0) # Indicate successful restore completion
         else:
             print(f'Error: Downloaded file path "{filepath}" does not exist or download failed.')
-            sys.exit(1) # Exit if download path invalid
+            sys.exit(1)
 
-except ValueError as ve:
-    print(f'Configuration Error: {ve}')
-    sys.exit(1)
-except Exception as e:
-    print(f'Error during backup download/restore: {str(e)}')
-    # Print traceback for more details
-    import traceback
-    traceback.print_exc()
-    sys.exit(1) # Exit on error
+except ValueError as ve: print(f'Configuration Error: {ve}'); sys.exit(1)
+except Exception as e: import traceback; print(f'Error during backup download/restore: {str(e)}'); traceback.print_exc(); sys.exit(1)
 "
+    # Capture python exit code
+    return $?
 }
 
-
-# --- Sync Function ---
-sync_data() {
-    # **新增：等待 Cloudreve 启动完成**
-    echo "Background Sync Process: Initializing..."
-    echo "Waiting for Cloudreve service to become available on port 5212..."
-    # 循环检查端口 5212 是否在监听，nc -z 返回 0 表示成功
-    while ! nc -z 127.0.0.1 5212; do
-        echo "Cloudreve not ready yet (port 5212 not open), sleeping for 5 seconds..."
-        sleep 5
-    done
-    echo "Cloudreve service detected on port 5212. Starting main sync loop."
-    # **等待逻辑结束**
-
-    # --- 原有的 sync_data 循环逻辑开始 ---
-    # echo "Background Sync Process Started" # 可以移除此行，上面的初始化消息更清晰
+# --- Periodic Sync Function (Loop only) ---
+sync_data_loop() {
+    echo "Starting Periodic Background Sync Loop..."
     while true; do
-
-        # 确保基本文件存在（作为额外的保险，但理论上此时应该存在）
-        if [ ! -f "$CONFIG_FILE_PATH" ] || [ ! -f "$DB_FILE_PATH" ] || [ ! -f "$EXECUTABLE_PATH" ]; then
-             echo "WARN: Essential Cloudreve files missing even after port check. Waiting..."
-             sleep 15
-             continue # 跳过本次循环
-        fi
-
-        echo "Starting sync cycle at $(date)"
-
-        # Define backup path and name
-        timestamp=$(date +%Y%m%d_%H%M%S)
-        backup_file="${BACKUP_PREFIX}_${timestamp}.tar.gz"
-        backup_path="/tmp/${backup_file}" # Use /tmp for temporary files
-
-        echo "Compressing Cloudreve data (executable, db, config) to: $backup_path"
-        # Use -C to change directory, ensuring archive paths are relative
-        # Only include the executable, db, and config file
-        tar -czf "$backup_path" -C "$CLOUDREVE_DIR" \
-            $(basename "$EXECUTABLE_PATH") \
-            $(basename "$DB_FILE_PATH") \
-            $(basename "$CONFIG_FILE_PATH")
-
-        # Check if compression was successful (file exists and is not empty)
-        if [ -s "$backup_path" ]; then
-            echo "Compression complete. File size: $(ls -lh "$backup_path" | awk '{print $5}')"
-            echo "Uploading backup to HuggingFace..."
-            upload_backup "$backup_path" "${backup_file}"
-            # Check exit status of upload_backup? The python script should exit non-zero on failure.
-            if [ $? -ne 0 ]; then
-                echo "Backup upload failed. Keeping local archive: $backup_path"
-            else
-                echo "Upload successful. Removing local archive."
-                rm -f "$backup_path"
-            fi
-        else
-            echo "Compression failed or created an empty file. Skipping upload."
-            rm -f "$backup_path" # Remove potentially empty/corrupt file
-        fi
-
-        # Define sync interval (use environment variable or default to 3600 seconds = 1 hour)
-        # **重要：确保这里的间隔设置合理，避免过于频繁导致资源超限**
-        SYNC_INTERVAL=${SYNC_INTERVAL:-3600} # 默认改为 1 小时
-        echo "Next sync in ${SYNC_INTERVAL} seconds..."
-        sleep $SYNC_INTERVAL
+        # Wait for the defined interval
+        local sync_interval=${SYNC_INTERVAL:-3600} # Default to 1 hour
+        echo "Periodic Sync: Next check in ${sync_interval} seconds..."
+        sleep $sync_interval
+
+        # Perform the backup
+        echo "Periodic Sync: Starting backup cycle at $(date)"
+        perform_backup_once "$CONFIG_FILE_PATH" "$DB_FILE_PATH" "$EXECUTABLE_PATH" "$CLOUDREVE_DIR" "$BACKUP_PREFIX"
+        # We don't necessarily need to exit the loop if one backup fails
     done
 }
 
-# --- Main Execution ---
 
-# 1. Attempt to restore from the latest backup on startup
-echo "Attempting to restore latest backup from HuggingFace..."
-download_latest_backup # <<< 调用函数发生在这里
-# Check the exit code of download_latest_backup
-# Python script exits with 0 if no backup found, 1 on error.
-ret_code=$?
-if [ $ret_code -ne 0 ]; then
-    echo "CRITICAL: Backup restoration failed (Exit code: $ret_code). Exiting."
+# --- Main Execution Logic ---
+
+# 1. Attempt Initial Restore
+echo "--- Step 1: Attempting Initial Restore ---"
+download_latest_backup
+restore_exit_code=$?
+restore_flag_file="/tmp/backup_restored.flag"
+
+# Check restore outcome
+backup_was_restored=false
+if [ $restore_exit_code -ne 0 ]; then
+    echo "CRITICAL: Backup restoration attempt failed with error (Exit code: $restore_exit_code). Exiting."
     exit 1
-elif [ $ret_code -eq 0 ]; then
-    echo "Backup restore process finished (may have skipped if no backup found)."
+elif [ -f "$restore_flag_file" ]; then
+    echo "Restore successful: Backup found and restored."
+    backup_was_restored=true
+else
+    echo "Restore skipped: No backup file found in the dataset."
+    backup_was_restored=false
 fi
+# Clean up flag file regardless
+rm -f "$restore_flag_file"
 
 
-# 2. Check if config file exists after potential restore. If not, Cloudreve needs to run once to create it.
+# 2. Initial Cloudreve Run (If necessary)
+echo "--- Step 2: Checking for Initial Config ---"
 if [ ! -f "$CONFIG_FILE_PATH" ]; then
-    echo "Config file ($CONFIG_FILE_PATH) not found. Running Cloudreve once to generate initial config."
-    # 首次运行时，不需要后台运行，让它生成配置就退出
+    echo "Config file ($CONFIG_FILE_PATH) not found. Running Cloudreve once to generate initial config..."
     /opt/cloudreve/cloudreve -c "$CONFIG_FILE_PATH"
-    # Cloudreve 在没有数据库时会初始化并打印密码然后退出
     if [ ! -f "$CONFIG_FILE_PATH" ]; then
         echo "CRITICAL: Cloudreve failed to create initial config file. Exiting."
         exit 1
     else
-         echo "Initial config file created by first run. Please check logs for admin credentials if needed."
-         # 确保数据库文件也可能已创建（即使是空的）
-         if [ ! -f "$DB_FILE_PATH" ]; then
-            echo "WARN: Database file might not have been created on first run, proceeding anyway."
-         fi
+         echo "Initial config file created by first run. Check logs for credentials if needed."
     fi
 fi
 
+# 3. Start Cloudreve Main Process (in background temporarily to allow checks)
+echo "--- Step 3: Starting Cloudreve Main Process (background initially) ---"
+/opt/cloudreve/cloudreve -c "$CONFIG_FILE_PATH" &
+cloudreve_pid=$!
+
+# 4. Wait for Cloudreve to be Ready
+echo "--- Step 4: Waiting for Cloudreve Service ---"
+wait_for_cloudreve # Use the function defined earlier
+
+# 5. Perform Initial Backup (If No Restore Occurred)
+echo "--- Step 5: Checking for Initial Backup ---"
+if [ "$backup_was_restored" = false ]; then
+    echo "No backup was restored, performing initial backup of current state..."
+    perform_backup_once "$CONFIG_FILE_PATH" "$DB_FILE_PATH" "$EXECUTABLE_PATH" "$CLOUDREVE_DIR" "$BACKUP_PREFIX"
+    if [ $? -ne 0 ]; then
+        echo "Warning: Initial backup failed."
+        # Decide whether to continue or exit if initial backup fails
+    else
+        echo "Initial backup completed successfully."
+    fi
+else
+    echo "Backup was restored, skipping initial backup."
+fi
 
-# 3. Start the background sync process
-# **注意：这一步仍然在 exec Cloudreve 之前**
-echo "Starting background data sync process (will wait for Cloudreve service internally)..."
-sync_data & # Run sync_data function in the background
-sync_pid=$! # Get PID of background sync process
-
-# 4. Start Cloudreve in the foreground using exec
-# 'exec' replaces the current shell process with the Cloudreve process.
-# This makes Cloudreve the main process of the container.
-echo "Starting Cloudreve application as the main process..."
-exec /opt/cloudreve/cloudreve -c "$CONFIG_FILE_PATH"
-
-# If exec fails, the script continues here.
-exec_failed_code=$?
-echo "CRITICAL: Failed to execute Cloudreve. Exit code: $exec_failed_code"
-# Attempt to kill the background sync process if exec failed
-kill $sync_pid 2>/dev/null
-exit $exec_failed_code
+# 6. Start Periodic Sync Loop in Background
+echo "--- Step 6: Starting Periodic Sync Loop ---"
+sync_data_loop &
+sync_loop_pid=$!
+
+# 7. Bring Cloudreve to Foreground / Wait for it
+# Since Cloudreve was started in the background, we now wait for it.
+# If Cloudreve exits, this script will also exit.
+echo "--- Step 7: Cloudreve is running. Monitoring PID: $cloudreve_pid ---"
+wait $cloudreve_pid
+exit_code=$?
+echo "Cloudreve process exited with code $exit_code."
+
+# Optional: attempt to clean up background sync loop if Cloudreve exits unexpectedly
+echo "Attempting to terminate background sync loop (PID: $sync_loop_pid)..."
+kill $sync_loop_pid 2>/dev/null
+wait $sync_loop_pid 2>/dev/null # Wait briefly for it to terminate
+
+exit $exit_code