Update sync_data.sh

sync_data.sh

@@ -23,54 +23,32 @@ restore_from_webdav() {
     RESTORE_DIR="$WORK_DIR/webdav_restore"
     mkdir -p "$RESTORE_DIR"
     
-    # 尝试下载最近的备份文件（按时间倒序）
-    DOWNLOAD_SUCCESS=0  # 0 = 失败, 1 = 成功
+    # 获取WebDAV上所有备份文件列表
+    echo "获取 WebDAV 备份文件列表..."
+    BACKUP_LIST=$(curl -s --user "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" "$WEBDAV_URL/" | grep -o 'mcp_backup_[0-9]*_[0-9]*\.tar\.gz' | sort -r)
     
-    # 计算同步间隔的分钟数
-    SYNC_INTERVAL_MINUTES=$((${SYNC_INTERVAL:-7200} / 60))
-    
-    echo "根据同步间隔 ${SYNC_INTERVAL:-7200} 秒（${SYNC_INTERVAL_MINUTES}分钟）查找备份文件..."
-    
-    # 尝试最近几个同步周期的备份
-    for i in $(seq 0 20); do  # 最多尝试20个周期
-        # 计算备份时间点（向前推 i 个同步间隔）
-        MINUTES_AGO=$((i * SYNC_INTERVAL_MINUTES))
-        BACKUP_TIME=$(date -d "$MINUTES_AGO minutes ago" +'%Y%m%d_%H%M')
-        BACKUP_FILENAME="mcp_backup_$BACKUP_TIME.tar.gz"
-        
-        echo "尝试下载备份: $BACKUP_FILENAME"
-        if curl -f --user "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" "$WEBDAV_URL/$BACKUP_FILENAME" -o "$RESTORE_DIR/$BACKUP_FILENAME" 2>/dev/null; then
-            BACKUP_FILE="$BACKUP_FILENAME"
-            DOWNLOAD_SUCCESS=1
-            echo "下载备份成功: $BACKUP_FILENAME"
-            break
-        fi
-    done
-    
-    # 如果按间隔没找到，尝试最近几个小时的备份（每5分钟一个点）
-    if [ "$DOWNLOAD_SUCCESS" = "0" ]; then
-        echo "按同步间隔未找到备份，尝试最近几个小时的备份..."
-        for minutes in $(seq 0 5 300); do  # 0到300分钟，每5分钟一个点
-            BACKUP_TIME=$(date -d "$minutes minutes ago" +'%Y%m%d_%H%M')
-            BACKUP_FILENAME="mcp_backup_$BACKUP_TIME.tar.gz"
-            
-            if curl -f --user "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" "$WEBDAV_URL/$BACKUP_FILENAME" -o "$RESTORE_DIR/$BACKUP_FILENAME" 2>/dev/null; then
-                BACKUP_FILE="$BACKUP_FILENAME"
-                DOWNLOAD_SUCCESS=1
-                echo "找到备份文件: $BACKUP_FILENAME"
-                break
-            fi
-        done
+    if [ -z "$BACKUP_LIST" ]; then
+        echo "未找到任何备份文件"
+        rm -rf "$RESTORE_DIR"
+        return 1
     fi
     
-    if [ "$DOWNLOAD_SUCCESS" = "0" ]; then
-        echo "无法找到任何可用的备份文件"
+    echo "找到以下备份文件："
+    echo "$BACKUP_LIST" | head -5 | while read file; do echo "  - $file"; done
+    if [ $(echo "$BACKUP_LIST" | wc -l) -gt 5 ]; then
+        echo "  ... 等共 $(echo "$BACKUP_LIST" | wc -l) 个文件"
     fi
     
-    if [ "$DOWNLOAD_SUCCESS" = "1" ]; then
+    # 尝试下载最新的备份文件
+    LATEST_BACKUP=$(echo "$BACKUP_LIST" | head -1)
+    echo "尝试下载最新备份: $LATEST_BACKUP"
+    
+    if curl -f --user "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" "$WEBDAV_URL/$LATEST_BACKUP" -o "$RESTORE_DIR/$LATEST_BACKUP" 2>/dev/null; then
+        echo "下载备份成功: $LATEST_BACKUP"
+        
         # 解压缩备份文件
         cd "$RESTORE_DIR"
-        tar -xzf "$BACKUP_FILE" && {
+        tar -xzf "$LATEST_BACKUP" && {
             echo "解压缩备份文件成功"
             
             # 恢复配置文件
@@ -97,11 +75,47 @@ restore_from_webdav() {
             echo "解压缩备份文件失败"
         }
         cd - > /dev/null
+    else
+        echo "下载最新备份失败，尝试其他备份文件..."
+        
+        # 尝试前3个备份文件
+        SUCCESS=0
+        for backup_file in $(echo "$BACKUP_LIST" | head -3 | tail -n +2); do
+            echo "尝试下载: $backup_file"
+            if curl -f --user "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" "$WEBDAV_URL/$backup_file" -o "$RESTORE_DIR/$backup_file" 2>/dev/null; then
+                echo "下载成功，开始解压..."
+                cd "$RESTORE_DIR"
+                if tar -xzf "$backup_file"; then
+                    echo "解压成功，恢复文件..."
+                    
+                    # 恢复配置文件
+                    if [ -d "config" ] && [ "$(ls -A config 2>/dev/null)" ]; then
+                        mkdir -p /mcp-proxy-server/config
+                        cp -r config/* /mcp-proxy-server/config/
+                        echo "config 目录恢复成功"
+                    fi
+                    
+                    if [ -d "tools" ] && [ "$(ls -A tools 2>/dev/null)" ]; then
+                        mkdir -p /tools
+                        cp -r tools/* /tools/
+                        echo "tools 目录恢复成功"
+                    fi
+                    
+                    SUCCESS=1
+                    break
+                fi
+                cd - > /dev/null
+            fi
+        done
+        
+        if [ "$SUCCESS" = "0" ]; then
+            echo "无法下载任何可用的备份文件"
+        fi
     fi
     
     # 清理临时目录
     rm -rf "$RESTORE_DIR"
-    return $DOWNLOAD_SUCCESS
+    return 0
 }
 
 # 解析仓库名和用户名
@@ -144,6 +158,7 @@ if [ "$RESTORE_SOURCE" = "webdav" ]; then
 elif [ "$RESTORE_SOURCE" = "github" ] || [ "$RESTORE_SOURCE" = "auto" ]; then
     # 从 GitHub 恢复（根据环境变量决定是否包含tools）
     GITHUB_RESTORED=0
+    GITHUB_TOOLS_RESTORED=0
     
     if [ "$GITHUB_BACKUP_TOOLS" = "true" ]; then
         echo "从 GitHub 恢复配置（config 和 tools 目录）..."
@@ -170,6 +185,7 @@ elif [ "$RESTORE_SOURCE" = "github" ] || [ "$RESTORE_SOURCE" = "auto" ]; then
             cp -r "$GITHUB_DATA_DIR/tools"/* /tools/
             echo "GitHub: tools 目录恢复成功"
             GITHUB_RESTORED=1
+            GITHUB_TOOLS_RESTORED=1
         else
             echo "GitHub 仓库中没有 tools 目录或目录为空"
         fi
@@ -177,13 +193,17 @@ elif [ "$RESTORE_SOURCE" = "github" ] || [ "$RESTORE_SOURCE" = "auto" ]; then
         echo "跳过 tools 目录恢复（由 GITHUB_BACKUP_TOOLS=false 控制）"
     fi
     
-    # 如果是 auto 模式，GitHub 恢复后，还可以从 WebDAV 补充恢复
-    if [ "$RESTORE_SOURCE" = "auto" ] && [ "$GITHUB_RESTORED" = "0" ]; then
-        echo "GitHub 中没有找到任何配置，尝试从 WebDAV 恢复..."
-        restore_from_webdav || echo "WebDAV 恢复失败，将在同步时重新备份"
-    elif [ "$RESTORE_SOURCE" = "auto" ] && [ "$GITHUB_BACKUP_TOOLS" = "false" ]; then
-        echo "从 WebDAV 补充恢复 tools 目录..."
-        restore_from_webdav || echo "WebDAV 恢复失败"
+    # auto 模式的补充恢复逻辑
+    if [ "$RESTORE_SOURCE" = "auto" ]; then
+        if [ "$GITHUB_RESTORED" = "0" ]; then
+            # GitHub完全没有恢复任何内容，尝试完整WebDAV恢复
+            echo "GitHub 中没有找到任何配置，尝试从 WebDAV 恢复..."
+            restore_from_webdav || echo "WebDAV 恢复失败，将在同步时重新备份"
+        elif [ "$GITHUB_TOOLS_RESTORED" = "0" ]; then
+            # GitHub恢复了config但没有tools，从WebDAV补充恢复tools
+            echo "GitHub 中没有 tools 目录，尝试从 WebDAV 补充恢复..."
+            restore_from_webdav || echo "WebDAV 恢复失败"
+        fi
     elif [ "$GITHUB_RESTORED" = "1" ]; then
         echo "从 GitHub 恢复配置完成"
     else