Update sync_data.sh

sync_data.sh

@@ -1,143 +1,120 @@
 #!/bin/bash
-set -e
 
-#################################
-# 1. WebDAV 参数检查
-#################################
+# 路径修正
+PYTHON_BIN="python3"
+LOG_PREFIX="[Backup-System]"
+
+echo "$LOG_PREFIX 脚本启动 - 正在初始化..."
+
+# 1. 检查环境变量
 if [ -z "$WEBDAV_URL" ] || [ -z "$WEBDAV_USERNAME" ] || [ -z "$WEBDAV_PASSWORD" ]; then
-    echo "[WARN] WebDAV not configured, starting Koishi without restore."
-    exec yarn start
+    echo "$LOG_PREFIX [ERROR] 缺少 WebDAV 配置变量，将直接启动 Koishi。"
+    yarn start
+    exit 0
 fi
 
-WEBDAV_BACKUP_PATH=${WEBDAV_BACKUP_PATH:-""}
-FULL_WEBDAV_URL="$WEBDAV_URL"
-[ -n "$WEBDAV_BACKUP_PATH" ] && FULL_WEBDAV_URL="$WEBDAV_URL/$WEBDAV_BACKUP_PATH"
+FULL_WEBDAV_URL="${WEBDAV_URL}${WEBDAV_BACKUP_PATH:+/$WEBDAV_BACKUP_PATH}"
+echo "$LOG_PREFIX 目标地址: $FULL_WEBDAV_URL"
 
-#################################
-# 2. 启动前恢复备份（只此一次）
-#################################
-echo "[INFO] Restoring backup from WebDAV before Koishi startup..."
-
-# 检查并恢复备份
-python3 <<EOF
-import tarfile, sys, requests
+# 2. 恢复备份逻辑
+restore_backup() {
+    echo "$LOG_PREFIX [Restore] 正在连接 WebDAV 检索最新备份..."
+    $PYTHON_BIN -c "
+import sys, os, tarfile, requests, subprocess
 from webdav3.client import Client
 
 options = {
-    "webdav_hostname": "${FULL_WEBDAV_URL}",
-    "webdav_login": "${WEBDAV_USERNAME}",
-    "webdav_password": "${WEBDAV_PASSWORD}",
+    'webdav_hostname': '${FULL_WEBDAV_URL}',
+    'webdav_login': '${WEBDAV_USERNAME}',
+    'webdav_password': '${WEBDAV_PASSWORD}'
 }
 client = Client(options)
-
 try:
-    backups = [f for f in client.list()
-               if f.startswith("koishi_backup_") and f.endswith(".tar.gz")]
+    files = client.list()
+    backups = [f for f in files if f.endswith('.tar.gz') and f.startswith('komari_backup_')]
+    if not backups:
+        print('$LOG_PREFIX [Restore] 未发现备份文件，跳过恢复过程。')
+        sys.exit(0)
+    
+    latest_backup = sorted(backups)[-1]
+    print(f'$LOG_PREFIX [Restore] 发现最新备份: {latest_backup}')
+    
+    local_path = f'/tmp/{latest_backup}'
+    print(f'$LOG_PREFIX [Restore] 开始下载到 {local_path}...')
+    
+    r = requests.get(f'${FULL_WEBDAV_URL}/{latest_backup}', auth=('${WEBDAV_USERNAME}', '${WEBDAV_PASSWORD}'), stream=True)
+    if r.status_code == 200:
+        with open(local_path, 'wb') as f:
+            for chunk in r.iter_content(chunk_size=1024*1024): # 1MB chunk
+                if chunk: f.write(chunk)
+        
+        print(f'$LOG_PREFIX [Restore] 下载完成。正在解压整个 /app 目录...')
+        with tarfile.open(local_path, 'r:gz') as tar:
+            tar.extractall('/app')
+        print(f'$LOG_PREFIX [Restore] 恢复成功！数据已更新。')
+    else:
+        print(f'$LOG_PREFIX [Restore] 下载失败，状态码: {r.status_code}')
 except Exception as e:
-    print(f"[WARN] WebDAV error: {e}")
-    sys.exit(0)
-
-if not backups:
-    print("[INFO] No backup found, skipping restore.")
-    sys.exit(0)
-
-latest = sorted(backups)[-1]
-print(f"[INFO] Latest backup: {latest}")
-
-r = requests.get(
-    f"${FULL_WEBDAV_URL}/{latest}",
-    auth=("${WEBDAV_USERNAME}", "${WEBDAV_PASSWORD}"),
-    stream=True,
-)
-if r.status_code != 200:
-    print("[WARN] Failed to download backup")
-    sys.exit(0)
-
-tmp = f"/tmp/{latest}"
-with open(tmp, "wb") as f:
-    for chunk in r.iter_content(8192):
-        f.write(chunk)
-
-with tarfile.open(tmp, "r:gz") as tar:
-    tar.extractall("/app")
-
-print("[INFO] Restore completed.")
-EOF
-
-#################################
-# 3. 启动 Koishi 服务
-#################################
-echo "[INFO] Starting Koishi..."
-exec yarn start &
+    print(f'$LOG_PREFIX [Restore] 异常发生: {str(e)}')
+"
+}
 
-#################################
-# 4. 启动周期性备份任务（启动 Koishi 后）
-#################################
+# 3. 同步备份逻辑
 sync_data() {
     while true; do
-        echo "[INFO] Backup started at $(date)"
-        ts=$(date +%Y%m%d_%H%M%S)
-        file="koishi_backup_${ts}.tar.gz"
-
-        # 使用文件锁确保压缩期间不被其他进程干扰
-        exec 200>/tmp/koishi_backup.lock
-        flock -n 200 || { echo "[ERROR] Could not lock backup process, skipping this cycle."; return 1; }
-
-        # 执行备份操作
-        tar -czf "/tmp/$file" -C /app .
-
-        # 释放锁
-        flock -u 200
-
-        # 使用 Python WebDAV 客户端上传文件
-        python3 <<EOF
-import os
+        # 初始等待，防止启动瞬间就备份
+        SYNC_INTERVAL=${SYNC_INTERVAL:-600}
+        echo "$LOG_PREFIX [Sync] 计划在 $SYNC_INTERVAL 秒后执行下一次备份..."
+        sleep $SYNC_INTERVAL
+
+        echo "$LOG_PREFIX [Sync] ========================================"
+        echo "$LOG_PREFIX [Sync] 开始执行备份任务: $(date)"
+        
+        timestamp=$(date +%Y%m%d_%H%M%S)
+        backup_file="komari_backup_${timestamp}.tar.gz"
+        start_time=$(date +%s)
+
+        # 打包整个 /app 目录（包含 node_modules）
+        echo "$LOG_PREFIX [Sync] 正在打包 /app (包含所有依赖)..."
+        tar -czf "/tmp/${backup_file}" -C /app .
+        
+        file_size=$(du -h "/tmp/${backup_file}" | cut -f1)
+        echo "$LOG_PREFIX [Sync] 打包完成。文件大小: $file_size"
+
+        # 使用 curl 上传并显示进度 (仅在日志中显示简要)
+        echo "$LOG_PREFIX [Sync] 正在上传到 WebDAV..."
+        curl -u "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" -T "/tmp/${backup_file}" "$FULL_WEBDAV_URL/${backup_file}" --fail --silent --show-error
+        
+        if [ $? -eq 0 ]; then
+            end_time=$(date +%s)
+            duration=$((end_time - start_time))
+            echo "$LOG_PREFIX [Sync] 上传成功！耗时: ${duration}s"
+            
+            # 清理旧备份逻辑
+            echo "$LOG_PREFIX [Clean] 正在清理 WebDAV 上的冗余备份 (保留最近 5 个)..."
+            $PYTHON_BIN -c "
 from webdav3.client import Client
-
-options = {
-    "webdav_hostname": "${FULL_WEBDAV_URL}",
-    "webdav_login": "${WEBDAV_USERNAME}",
-    "webdav_password": "${WEBDAV_PASSWORD}",
-}
-client = Client(options)
-
-# 上传备份文件
-try:
-    with open("/tmp/$file", "rb") as f:
-        client.upload(os.path.join("${FULL_WEBDAV_URL}", "$file"), f)
-    print(f"[INFO] Backup uploaded successfully: {file}")
-except Exception as e:
-    print(f"[ERROR] Failed to upload backup: {e}")
-EOF
-
-        # 清理 WebDAV 上的旧备份（只保留最近 5 个）
-        python3 <<EOF
-from webdav3.client import Client
-
-options = {
-    "webdav_hostname": "${FULL_WEBDAV_URL}",
-    "webdav_login": "${WEBDAV_USERNAME}",
-    "webdav_password": "${WEBDAV_PASSWORD}",
-}
+options = {'webdav_hostname': '${FULL_WEBDAV_URL}', 'webdav_login': '${WEBDAV_USERNAME}', 'webdav_password': '${WEBDAV_PASSWORD}'}
 client = Client(options)
-
-# 获取备份文件并排序
-files = sorted(f for f in client.list() if f.startswith("koishi_backup_") and f.endswith(".tar.gz"))
-# 删除旧的备份文件
-for f in files[:-5]:
-    client.clean(f)
-    print(f"[INFO] Deleted old backup: {f}")
-EOF
-
-        # 删除本地临时文件
-        rm -f "/tmp/$file"
-
-        sleep ${SYNC_INTERVAL:-7200}  # 默认每两小时备份一次
+backups = sorted([f for f in client.list() if f.startswith('komari_backup_') and f.endswith('.tar.gz')])
+if len(backups) > 5:
+    for f in backups[:-5]:
+        client.clean(f)
+        print(f'$LOG_PREFIX [Clean] 已删除旧备份: {f}')
+else:
+    print(f'$LOG_PREFIX [Clean] 当前备份数量 ({len(backups)}), 无需清理。')
+"
+        else
+            echo "$LOG_PREFIX [ERROR] 上传失败！请检查网络连接或 WebDAV 空间。"
+        fi
+
+        rm -f "/tmp/${backup_file}"
+        echo "$LOG_PREFIX [Sync] ========================================"
     done
 }
 
-# 启动周期性备份任务
+# 执行流程
+restore_backup
 sync_data &
-
-# 确保后台进程正常退出
-wait
+echo "$LOG_PREFIX 启动 Koishi 主程序..."
+yarn start