Update sync_data.sh

sync_data.sh

@@ -1,120 +1,127 @@
 #!/bin/bash
 
-# 路径修正
-PYTHON_BIN="python3"
-LOG_PREFIX="[Backup-System]"
+# --- 1. 环境准备 ---
+# 自动识别 Python 路径
+if [ -f "/app/venv/bin/python" ]; then
+    PYTHON_BIN="/app/venv/bin/python"
+else
+    PYTHON_BIN="python3"
+fi
 
-echo "$LOG_PREFIX 脚本启动 - 正在初始化..."
+LOG_PREFIX="[Backup-System]"
 
-# 1. 检查环境变量
 if [ -z "$WEBDAV_URL" ] || [ -z "$WEBDAV_USERNAME" ] || [ -z "$WEBDAV_PASSWORD" ]; then
-    echo "$LOG_PREFIX [ERROR] 缺少 WebDAV 配置变量，将直接启动 Koishi。"
+    echo "$LOG_PREFIX 缺少变量，跳过备份逻辑直接启动。"
     yarn start
     exit 0
 fi
 
-FULL_WEBDAV_URL="${WEBDAV_URL}${WEBDAV_BACKUP_PATH:+/$WEBDAV_BACKUP_PATH}"
-echo "$LOG_PREFIX 目标地址: $FULL_WEBDAV_URL"
+# 规范化 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. 恢复备份逻辑
+# --- 2. 恢复逻辑 ---
 restore_backup() {
-    echo "$LOG_PREFIX [Restore] 正在连接 WebDAV 检索最新备份..."
+    echo "$LOG_PREFIX 开始检查 WebDAV 备份..."
     $PYTHON_BIN -c "
-import sys, os, tarfile, requests, subprocess
+import sys, os, tarfile, requests
 from webdav3.client import Client
 
 options = {
-    'webdav_hostname': '${FULL_WEBDAV_URL}',
+    'webdav_hostname': '${CLEAN_URL}',
     'webdav_login': '${WEBDAV_USERNAME}',
     'webdav_password': '${WEBDAV_PASSWORD}'
 }
 client = Client(options)
+remote_dir = '${WEBDAV_BACKUP_PATH}'
+
 try:
-    files = client.list()
-    backups = [f for f in files if f.endswith('.tar.gz') and f.startswith('komari_backup_')]
+    # 使用 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]
+    
     if not backups:
-        print('$LOG_PREFIX [Restore] 未发现备份文件，跳过恢复过程。')
+        print('$LOG_PREFIX 未发现备份。')
         sys.exit(0)
     
-    latest_backup = sorted(backups)[-1]
-    print(f'$LOG_PREFIX [Restore] 发现最新备份: {latest_backup}')
+    # 找到最新的文件名
+    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(':/', '://')
     
-    local_path = f'/tmp/{latest_backup}'
-    print(f'$LOG_PREFIX [Restore] 开始下载到 {local_path}...')
+    print(f'$LOG_PREFIX 准备下载: {latest_file_name}')
     
-    r = requests.get(f'${FULL_WEBDAV_URL}/{latest_backup}', auth=('${WEBDAV_USERNAME}', '${WEBDAV_PASSWORD}'), stream=True)
+    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=1024*1024): # 1MB chunk
-                if chunk: f.write(chunk)
+            for chunk in r.iter_content(chunk_size=1048576):
+                f.write(chunk)
         
-        print(f'$LOG_PREFIX [Restore] 下载完成。正在解压整个 /app 目录...')
+        print(f'$LOG_PREFIX 下载成功，解压到 /app ...')
         with tarfile.open(local_path, 'r:gz') as tar:
             tar.extractall('/app')
-        print(f'$LOG_PREFIX [Restore] 恢复成功！数据已更新。')
+        print(f'$LOG_PREFIX 恢复完成。')
     else:
-        print(f'$LOG_PREFIX [Restore] 下载失败，状态码: {r.status_code}')
+        print(f'$LOG_PREFIX 下载失败: HTTP {r.status_code} URL: {download_url}')
 except Exception as e:
-    print(f'$LOG_PREFIX [Restore] 异常发生: {str(e)}')
+    print(f'$LOG_PREFIX 恢复脚本报错: {str(e)}')
 "
 }
 
-# 3. 同步备份逻辑
+# --- 3. 定期备份逻辑 ---
 sync_data() {
     while true; do
-        # 初始等待，防止启动瞬间就备份
-        SYNC_INTERVAL=${SYNC_INTERVAL:-600}
-        echo "$LOG_PREFIX [Sync] 计划在 $SYNC_INTERVAL 秒后执行下一次备份..."
-        sleep $SYNC_INTERVAL
+        # 等待间隔
+        INTERVAL=${SYNC_INTERVAL:-600}
+        echo "$LOG_PREFIX 等待 $INTERVAL 秒后进行下一次同步..."
+        sleep $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"
+        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)"
 
-        # 使用 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
+        # 使用 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
-            end_time=$(date +%s)
-            duration=$((end_time - start_time))
-            echo "$LOG_PREFIX [Sync] 上传成功！耗时: ${duration}s"
-            
-            # 清理旧备份逻辑
-            echo "$LOG_PREFIX [Clean] 正在清理 WebDAV 上的冗余备份 (保留最近 5 个)..."
+            echo "$LOG_PREFIX 上传成功！"
+            # 清理旧备份 (保留 5 个)
             $PYTHON_BIN -c "
 from webdav3.client import Client
-options = {'webdav_hostname': '${FULL_WEBDAV_URL}', 'webdav_login': '${WEBDAV_USERNAME}', 'webdav_password': '${WEBDAV_PASSWORD}'}
+options = {'webdav_hostname': '${CLEAN_URL}', 'webdav_login': '${WEBDAV_USERNAME}', 'webdav_password': '${WEBDAV_PASSWORD}'}
 client = Client(options)
-backups = sorted([f for f in client.list() if f.startswith('komari_backup_') and f.endswith('.tar.gz')])
+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]:
-        client.clean(f)
-        print(f'$LOG_PREFIX [Clean] 已删除旧备份: {f}')
-else:
-    print(f'$LOG_PREFIX [Clean] 当前备份数量 ({len(backups)}), 无需清理。')
+        target = f'{remote_dir}/{f}' if remote_dir else f
+        client.clean(target)
+        print(f'$LOG_PREFIX 已删除旧备份: {f}')
 "
         else
-            echo "$LOG_PREFIX [ERROR] 上传失败！请检查网络连接或 WebDAV 空间。"
+            echo "$LOG_PREFIX 上传失败！"
         fi
-
+        
         rm -f "/tmp/${backup_file}"
-        echo "$LOG_PREFIX [Sync] ========================================"
+        echo "$LOG_PREFIX ======================================"
     done
 }
 
-# 执行流程
+# --- 4. 启动顺序 ---
 restore_backup
 sync_data &
-echo "$LOG_PREFIX 启动 Koishi 主程序..."
+echo "$LOG_PREFIX 启动 Koishi..."
 yarn start