Update sync_data.sh

sync_data.sh

@@ -1,165 +1,103 @@
 #!/bin/bash
-# sync_data.sh
+set -euo pipefail
 
-# 设置环境变量
-DATA_DIR=${DATA_DIR:-"/app/data"}
-BACKUP_DIR=${BACKUP_DIR:-"/app/backup"}
-LOG_FILE="$BACKUP_DIR/sync.log"
-WEBDAV_URL=${WEBDAV_URL}
-WEBDAV_USERNAME=${WEBDAV_USERNAME}
-WEBDAV_PASSWORD=${WEBDAV_PASSWORD}
-WEBDAV_BACKUP_PATH=${WEBDAV_BACKUP_PATH:-alist_backups}
-SYNC_INTERVAL=${SYNC_INTERVAL:-3600}
+# 日志记录
+exec > >(tee -a "${LOG_DIR}/sync.log") 2>&1
 
-# 创建日志文件
-exec > >(tee -a "$LOG_FILE") 2>&1
-
-# 函数：记录日志
-log() {
-    echo "$(date '+%Y-%m-%d %H:%M:%S') - $1"
+# WebDAV配置检查
+check_webdav() {
+    [ -z "${WEBDAV_URL}" ] && { echo "WEBDAV_URL未设置"; return 1; }
+    [ -z "${WEBDAV_USERNAME}" ] && { echo "WEBDAV_USERNAME未设置"; return 1; }
+    [ -z "${WEBDAV_PASSWORD}" ] && { echo "WEBDAV_PASSWORD未设置"; return 1; }
+    return 0
 }
 
-# 激活虚拟环境
-source /app/venv/bin/activate
-
-# 函数：恢复备份
-restore_backup() {
-    log "开始恢复最新备份..."
-
-    # 检查 WebDAV 配置
-    if [ -z "$WEBDAV_URL" ] || [ -z "$WEBDAV_USERNAME" ] || [ -z "$WEBDAV_PASSWORD" ]; then
-        log "WebDAV 配置缺失，跳过恢复"
-        return
-    fi
+# 恢复备份
+restore() {
+    echo "$(date '+%Y-%m-%d %H:%M:%S') - 开始恢复备份..."
+    check_webdav || return 0
 
-    # 查找最新备份文件
-    LATEST_BACKUP=$(python3 -c "
+    python3 <<EOF
 import os
+import sys
 from webdav3.client import Client
-options = {
-    'webdav_hostname': '$WEBDAV_URL',
-    'webdav_login': '$WEBDAV_USERNAME',
-    'webdav_password': '$WEBDAV_PASSWORD',
-    'webdav_root': '$WEBDAV_BACKUP_PATH'
-}
-client = Client(options)
-backups = [f for f in client.list() if f.startswith('alist_backup_') and f.endswith('.tar.gz')]
-if backups:
-    print(sorted(backups)[-1])
-else:
-    print('')
-")
-
-    if [ -z "$LATEST_BACKUP" ]; then
-        log "未找到备份文件"
-        return
-    fi
-
-    # 下载备份文件
-    log "下载最新备份: $LATEST_BACKUP"
-    python3 -c "
-import requests
-from webdav3.client import Client
-options = {
-    'webdav_hostname': '$WEBDAV_URL',
-    'webdav_login': '$WEBDAV_USERNAME',
-    'webdav_password': '$WEBDAV_PASSWORD',
-    'webdav_root': '$WEBDAV_BACKUP_PATH'
-}
-client = Client(options)
-with client.download_to_stream('$LATEST_BACKUP', '/tmp/latest_backup.tar.gz') as response:
-    with open('/tmp/latest_backup.tar.gz', 'wb') as f:
-        for chunk in response.iter_content(chunk_size=8192):
-            f.write(chunk)
-print('备份下载完成')
-"
 
-    # 恢复备份
-    if [ -f "/tmp/latest_backup.tar.gz" ]; then
-        log "解压备份文件到 $DATA_DIR"
-        mkdir -p "$DATA_DIR"
-        tar -xzf /tmp/latest_backup.tar.gz -C "$DATA_DIR" --strip-components=1
-        chown -R user:user "$DATA_DIR"
-        log "备份恢复完成"
-    else
-        log "备份文件不存在，跳过恢复"
-    fi
+try:
+    # 初始化客户端
+    client = Client({
+        'webdav_hostname': os.getenv('WEBDAV_URL'),
+        'webdav_login': os.getenv('WEBDAV_USERNAME'),
+        'webdav_password': os.getenv('WEBDAV_PASSWORD'),
+        'verbose': True
+    })
+
+    # 查找最新备份
+    backups = [f for f in client.list() 
+              if f.startswith('alist_backup_') and f.endswith('.tar.gz')]
+    if not backups:
+        print("未找到备份文件")
+        sys.exit(0)
+
+    latest = sorted(backups)[-1]
+    print(f"找到备份文件: {latest}")
+
+    # 下载备份（使用正确API）
+    local_path = f"/tmp/{latest}"
+    if client.check(latest):
+        client.download_file(latest, local_path)
+        print(f"下载完成: {local_path}")
+    else:
+        print("备份文件不存在")
+        sys.exit(1)
+
+    # 解压备份
+    os.system(f"mkdir -p {os.getenv('DATA_DIR')} {os.getenv('CONFIG_DIR')}")
+    os.system(f"tar -xzf {local_path} -C /")
+    os.remove(local_path)
+    print("恢复完成！")
+
+except Exception as e:
+    print(f"恢复失败: {str(e)}")
+    sys.exit(1)
+EOF
 }
 
-# 函数：同步备份
-sync_backup() {
+# 定时同步
+sync() {
     while true; do
-        log "开始同步备份..."
-        TIMESTAMP=$(date +%Y%m%d_%H%M%S)
-        BACKUP_FILE="alist_backup_${TIMESTAMP}.tar.gz"
-
-        # 创建备份
-        if [ -d "$DATA_DIR" ]; then
-            log "压缩数据目录: $DATA_DIR"
-            tar -czf "/tmp/$BACKUP_FILE" -C "$DATA_DIR" .
-            log "上传备份到 WebDAV: $BACKUP_FILE"
-            python3 -c "
+        echo "$(date '+%Y-%m-%d %H:%M:%S') - 开始同步数据..."
+        backup_file="alist_backup_$(date +%Y%m%d_%H%M%S).tar.gz"
+        
+        # 打包数据
+        tar -czf "/tmp/${backup_file}" -C / app/data app/config
+
+        # 上传备份
+        python3 <<EOF
 from webdav3.client import Client
-options = {
-    'webdav_hostname': '$WEBDAV_URL',
-    'webdav_login': '$WEBDAV_USERNAME',
-    'webdav_password': '$WEBDAV_PASSWORD',
-    'webdav_root': '$WEBDAV_BACKUP_PATH'
-}
-client = Client(options)
-with open('/tmp/$BACKUP_FILE', 'rb') as f:
-    client.upload_stream(f, '$BACKUP_FILE')
-print('备份上传完成')
-"
-            log "清理本地备份文件"
-            rm -f "/tmp/$BACKUP_FILE"
-        else
-            log "数据目录不存在，跳过备份"
-        fi
-
-        # 清理旧备份
-        log "清理旧备份（保留最近 5 个）"
-        python3 -c "
-from webdav3.client import Client
-options = {
-    'webdav_hostname': '$WEBDAV_URL',
-    'webdav_login': '$WEBDAV_USERNAME',
-    'webdav_password': '$WEBDAV_PASSWORD',
-    'webdav_root': '$WEBDAV_BACKUP_PATH'
-}
-client = Client(options)
-backups = sorted([f for f in client.list() if f.startswith('alist_backup_')], reverse=True)
-if len(backups) > 5:
-    for f in backups[5:]:
-        client.clean(f)
-        print(f'已删除旧备份: {f}')
-"
-        log "同步完成，等待下一次同步..."
-        sleep $SYNC_INTERVAL
+client = Client({
+    'webdav_hostname': '${WEBDAV_URL}',
+    'webdav_login': '${WEBDAV_USERNAME}',
+    'webdav_password': '${WEBDAV_PASSWORD}'
+})
+client.upload_file('${backup_file}', '/tmp/${backup_file}')
+print('上传成功')
+EOF
+
+        # 清理
+        rm -f "/tmp/${backup_file}"
+        sleep ${SYNC_INTERVAL}
     done
 }
 
-# 主逻辑
-case "$1" in
+# 执行子命令
+case "${1:-}" in
     restore)
-        restore_backup
+        restore
         ;;
-    *)
-        # 启动 Aria2
-        log "启动 Aria2..."
-        aria2c --enable-rpc --rpc-listen-all --rpc-allow-origin-all --rpc-listen-port=6800 --daemon &
-
-        # 恢复备份
-        restore_backup &
-
-        # 启动 Alist
-        log "启动 Alist..."
-        ./alist server --data /app/data &
-
-        # 启动同步任务
-        sync_backup &
-
-        # 等待所有后台任务完成（实际上不会完成）
-        wait
+    sync)
+        sync
         ;;
-esac
+    *)
+        echo "Usage: $0 {restore|sync}"
+        exit 1
+esac