Update sync_data.sh

sync_data.sh

@@ -1,127 +1,124 @@
 #!/bin/bash
 
-# --- 1. 环境准备 ---
-# 自动识别 Python 路径
-if [ -f "/app/venv/bin/python" ]; then
-    PYTHON_BIN="/app/venv/bin/python"
-else
-    PYTHON_BIN="python3"
-fi
-
-LOG_PREFIX="[Backup-System]"
+# --- 1. 参数与环境检查 ---
+LOG_PREFIX="[Koishi-Cloud-Sync]"
 
 if [ -z "$WEBDAV_URL" ] || [ -z "$WEBDAV_USERNAME" ] || [ -z "$WEBDAV_PASSWORD" ]; then
-    echo "$LOG_PREFIX 缺少变量，跳过备份逻辑直接启动。"
-    yarn start
-    exit 0
+    echo "$LOG_PREFIX [WARN] WebDAV 未配置，直接启动 Koishi。"
+    exec yarn start
 fi
 
-# 规范化 WebDAV URL (确保没有结尾斜杠)
+# 确保路径不以斜杠结尾
 CLEAN_URL=$(echo "${WEBDAV_URL}" | sed 's:/*$::')
 WEBDAV_BACKUP_PATH=${WEBDAV_BACKUP_PATH:-""}
-# 这里的 FULL_URL 仅用于连接
 FULL_WEBDAV_URL="${CLEAN_URL}${WEBDAV_BACKUP_PATH:+/$WEBDAV_BACKUP_PATH}"
 
-# --- 2. 恢复逻辑 ---
+# 统一前缀名 (确保恢复和备份用的是同一个)
+FILE_PREFIX="koishi_backup_"
+
+# --- 2. 启动前恢复备份 ---
 restore_backup() {
-    echo "$LOG_PREFIX 开始检查 WebDAV 备份..."
-    $PYTHON_BIN -c "
+    echo "$LOG_PREFIX [Restore] 正在从 WebDAV 恢复数据..."
+    python3 <<EOF
 import sys, os, tarfile, requests
 from webdav3.client import Client
 
 options = {
-    'webdav_hostname': '${CLEAN_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)
-remote_dir = '${WEBDAV_BACKUP_PATH}'
 
 try:
-    # 使用 list 穿透到子目录
-    files = client.list(remote_dir) if remote_dir else client.list()
-    # 过滤文件名：webdav3 返回的文件可能包含路径前缀，取 os.path.basename
-    backups = [f for f in files if f.endswith('.tar.gz') and 'komari_backup_' in f]
+    # 这里的 list() 会受 hostname 里的子路径影响，处理文件名过滤
+    files = client.list()
+    backups = sorted([f for f in files if f.startswith("${FILE_PREFIX}") and f.endswith(".tar.gz")])
     
     if not backups:
-        print('$LOG_PREFIX 未发现备份。')
+        print("$LOG_PREFIX [Restore] WebDAV 上没有发现备份文件，跳过恢复。")
         sys.exit(0)
+
+    latest = backups[-1]
+    print(f"$LOG_PREFIX [Restore] 发现最新备份: {latest}")
+
+    # 构造下载链接
+    download_url = f"${FULL_WEBDAV_URL}/{latest}"
+    r = requests.get(download_url, auth=("${WEBDAV_USERNAME}", "${WEBDAV_PASSWORD}"), stream=True)
     
-    # 找到最新的文件名
-    latest_file_name = sorted(backups)[-1]
-    # 构建完整的下载 URL
-    full_path = f'{remote_dir}/{latest_file_name}' if remote_dir else latest_file_name
-    download_url = f'${CLEAN_URL}/{full_path}'.replace('//', '/').replace(':/', '://')
-    
-    print(f'$LOG_PREFIX 准备下载: {latest_file_name}')
-    
-    r = requests.get(download_url, auth=('${WEBDAV_USERNAME}', '${WEBDAV_PASSWORD}'), stream=True)
     if r.status_code == 200:
-        local_path = f'/tmp/{latest_file_name}'
-        with open(local_path, 'wb') as f:
-            for chunk in r.iter_content(chunk_size=1048576):
+        tmp_path = f"/tmp/{latest}"
+        with open(tmp_path, "wb") as f:
+            for chunk in r.iter_content(8192):
                 f.write(chunk)
         
-        print(f'$LOG_PREFIX 下载成功，解压到 /app ...')
-        with tarfile.open(local_path, 'r:gz') as tar:
-            tar.extractall('/app')
-        print(f'$LOG_PREFIX 恢复完成。')
+        with tarfile.open(tmp_path, "r:gz") as tar:
+            tar.extractall("/app")
+        print("$LOG_PREFIX [Restore] 数据恢复成功！")
     else:
-        print(f'$LOG_PREFIX 下载失败: HTTP {r.status_code} URL: {download_url}')
+        print(f"$LOG_PREFIX [Restore] 下载失败，状态码: {r.status_code}")
 except Exception as e:
-    print(f'$LOG_PREFIX 恢复脚本报错: {str(e)}')
-"
+    print(f"$LOG_PREFIX [Restore] 发生错误: {e}")
+EOF
 }
 
-# --- 3. 定期备份逻辑 ---
-sync_data() {
+# --- 3. 周期性备份任务 ---
+sync_loop() {
+    # 给系统留出启动时间
+    sleep 60
+    
     while true; do
-        # 等待间隔
-        INTERVAL=${SYNC_INTERVAL:-600}
-        echo "$LOG_PREFIX 等待 $INTERVAL 秒后进行下一次同步..."
-        sleep $INTERVAL
+        ts=$(date +%Y%m%d_%H%M%S)
+        file_name="${FILE_PREFIX}${ts}.tar.gz"
+        local_tmp="/tmp/${file_name}"
 
-        timestamp=$(date +%Y%m%d_%H%M%S)
-        backup_file="komari_backup_${timestamp}.tar.gz"
+        echo "$LOG_PREFIX [Sync] 正在打包数据 (包含 node_modules)..."
+        # 使用 /app 目录进行打包
+        tar -czf "$local_tmp" -C /app .
         
-        echo "$LOG_PREFIX ======================================"
-        echo "$LOG_PREFIX 开始备份: $backup_file"
-        
-        # 备份整个 /app
-        tar -czf "/tmp/${backup_file}" -C /app .
-        echo "$LOG_PREFIX 打包完成，大小: $(du -h /tmp/$backup_file | cut -f1)"
+        echo "$LOG_PREFIX [Sync] 打包完成 ($(du -h $local_tmp | cut -f1))，准备上传..."
 
-        # 使用 curl 上传 (处理路径拼接)
-        UPLOAD_URL="${FULL_WEBDAV_URL}/${backup_file}"
-        curl -u "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" -T "/tmp/${backup_file}" "$UPLOAD_URL" --fail
-        
-        if [ $? -eq 0 ]; then
-            echo "$LOG_PREFIX 上传成功！"
-            # 清理旧备份 (保留 5 个)
-            $PYTHON_BIN -c "
+        python3 <<EOF
 from webdav3.client import Client
-options = {'webdav_hostname': '${CLEAN_URL}', 'webdav_login': '${WEBDAV_USERNAME}', 'webdav_password': '${WEBDAV_PASSWORD}'}
+import os
+
+options = {
+    "webdav_hostname": "${FULL_WEBDAV_URL}",
+    "webdav_login": "${WEBDAV_USERNAME}",
+    "webdav_password": "${WEBDAV_PASSWORD}",
+}
 client = Client(options)
-remote_dir = '${WEBDAV_BACKUP_PATH}'
-files = client.list(remote_dir) if remote_dir else client.list()
-backups = sorted([f for f in files if f.endswith('.tar.gz') and 'komari_backup_' in f])
-if len(backups) > 5:
-    for f in backups[:-5]:
-        target = f'{remote_dir}/{f}' if remote_dir else f
-        client.clean(target)
-        print(f'$LOG_PREFIX 已删除旧备份: {f}')
-"
-        else
-            echo "$LOG_PREFIX 上传失败！"
-        fi
+
+try:
+    # webdav3 的 upload_file 第一个参数是远程文件名，第二个是本地路径
+    # 注意：如果 options 已经包含完整路径，此处只需传文件名
+    client.upload_file("$file_name", "$local_tmp")
+    print(f"$LOG_PREFIX [Sync] 上传成功: $file_name")
+    
+    # 清理旧备份
+    files = sorted([f for f in client.list() if f.startswith("${FILE_PREFIX}") and f.endswith(".tar.gz")])
+    if len(files) > 5:
+        for old_file in files[:-5]:
+            client.clean(old_file)
+            print(f"$LOG_PREFIX [Clean] 已删除旧备份: {old_file}")
+except Exception as e:
+    print(f"$LOG_PREFIX [Error] 上传过程中出错: {e}")
+EOF
+
+        rm -f "$local_tmp"
         
-        rm -f "/tmp/${backup_file}"
-        echo "$LOG_PREFIX ======================================"
+        # 默认 2 小时同步一次
+        echo "$LOG_PREFIX [Sync] 本次任务结束，等待下一次循环..."
+        sleep ${SYNC_INTERVAL:-7200}
     done
 }
 
-# --- 4. 启动顺序 ---
+# --- 执行流 ---
 restore_backup
-sync_data &
-echo "$LOG_PREFIX 启动 Koishi..."
-yarn start
+
+# 启动备份进程 (后台)
+sync_loop &
+
+# 启动 Koishi (前台)
+echo "$LOG_PREFIX 正在启动 Koishi 服务..."
+exec yarn start