Update sync_data.sh

sync_data.sh

@@ -1,151 +1,131 @@
 #!/bin/bash
-# sync_data.sh
 
-# 设置环境变量
-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_FILE") 2>&1
+# 检查环境变量
+if [ -z "$WEBDAV_URL" ] || [ -z "$WEBDAV_USERNAME" ] || [ -z "$WEBDAV_PASSWORD" ]; then
+    echo "Starting without backup functionality - missing WEBDAV_URL, WEBDAV_USERNAME, or WEBDAV_PASSWORD"
+    exit 0
+fi
 
-# 函数：记录日志
-log() {
-    echo "$(date '+%Y-%m-%d %H:%M:%S') - $1"
-}
+# 设置备份路径
+WEBDAV_BACKUP_PATH=${WEBDAV_BACKUP_PATH:-""}
+FULL_WEBDAV_URL="${WEBDAV_URL}"
+if [ -n "$WEBDAV_BACKUP_PATH" ]; then
+    FULL_WEBDAV_URL="${WEBDAV_URL}/${WEBDAV_BACKUP_PATH}"
+fi
 
 # 激活虚拟环境
-source /app/venv/bin/activate
-
-# 函数：恢复备份
-restore_backup() {
-    log "开始恢复最新备份..."
-
-    # 检查 WebDAV 配置
-    if [ -z "$WEBDAV_URL" ] || [ -z "$WEBDAV_USERNAME" ] || [ -z "$WEBDAV_PASSWORD" ]; then
-        log "WebDAV 配置缺失，跳过恢复"
-        return
-    fi
-
-    # 查找最新备份文件
-    LATEST_BACKUP=$(python3 -c "
-import os
-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('')
-")
+source $VIRTUAL_ENV/bin/activate
 
-    if [ -z "$LATEST_BACKUP" ]; then
-        log "未找到备份文件"
-        return
-    fi
+# 定义数据目录和配置目录
+DATA_DIR=${DATA_DIR:-"/app/data"}
+CONFIG_DIR=${CONFIG_DIR:-"/app/config"}
 
-    # 下载备份文件
-    log "下载最新备份: $LATEST_BACKUP"
+# 下载最新备份并恢复
+restore_backup() {
+    echo "开始从 WebDAV 下载最新备份..."
     python3 -c "
+import sys
+import os
+import tarfile
 import requests
+import shutil
 from webdav3.client import Client
 options = {
-    'webdav_hostname': '$WEBDAV_URL',
+    'webdav_hostname': '$FULL_WEBDAV_URL',
     'webdav_login': '$WEBDAV_USERNAME',
-    'webdav_password': '$WEBDAV_PASSWORD',
-    'webdav_root': '$WEBDAV_BACKUP_PATH'
+    'webdav_password': '$WEBDAV_PASSWORD'
 }
 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('备份下载完成')
+backups = [file for file in client.list() if file.endswith('.tar.gz') and file.startswith('alist_backup_')]
+if not backups:
+    print('没有找到备份文件')
+    sys.exit()
+latest_backup = sorted(backups)[-1]
+print(f'最新备份文件：{latest_backup}')
+with requests.get(f'$FULL_WEBDAV_URL/{latest_backup}', auth=('$WEBDAV_USERNAME', '$WEBDAV_PASSWORD'), stream=True) as r:
+    if r.status_code == 200:
+        with open(f'/tmp/{latest_backup}', 'wb') as f:
+            for chunk in r.iter_content(chunk_size=8192):
+                f.write(chunk)
+        print(f'成功下载备份文件到 /tmp/{latest_backup}')
+        if os.path.exists(f'/tmp/{latest_backup}'):
+            # 如果目录已存在，先删除它
+            if os.path.exists('$DATA_DIR'):
+                shutil.rmtree('$DATA_DIR')
+            if os.path.exists('$CONFIG_DIR'):
+                shutil.rmtree('$CONFIG_DIR')
+            
+            os.makedirs('$DATA_DIR', exist_ok=True)
+            os.makedirs('$CONFIG_DIR', exist_ok=True)
+            
+            # 解压备份文件
+            with tarfile.open(f'/tmp/{latest_backup}', 'r:gz') as tar:
+                tar.extractall('/')
+            
+            print(f'成功从 {latest_backup} 恢复备份')
+        else:
+            print('下载的备份文件不存在')
+    else:
+        print(f'下载备份失败：{r.status_code}')
 "
-
-    # 恢复备份
-    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
 }
 
-# 函数：同步备份
-sync_backup() {
+# 首次启动时下载最新备份
+echo "Downloading latest backup from WebDAV..."
+restore_backup
+
+# 同步函数
+sync_data() {
     while true; do
-        log "开始同步备份..."
-        TIMESTAMP=$(date +%Y%m%d_%H%M%S)
-        BACKUP_FILE="alist_backup_${TIMESTAMP}.tar.gz"
+        echo "Starting sync process at $(date)"
 
-        # 创建备份
-        if [ -d "$DATA_DIR" ]; then
-            log "压缩数据目录: $DATA_DIR"
-            tar -czf "/tmp/$BACKUP_FILE" -C "$DATA_DIR" .
-            log "上传备份到 WebDAV: $BACKUP_FILE"
-            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)
-with open('/tmp/$BACKUP_FILE', 'rb') as f:
-    client.upload_stream(f, '$BACKUP_FILE')
-print('备份上传完成')
-"
-            log "清理本地备份文件"
-            rm -f "/tmp/$BACKUP_FILE"
+        if [ ! -d $DATA_DIR ] || [ ! -d $CONFIG_DIR ]; then
+            mkdir -p $DATA_DIR $CONFIG_DIR
+            echo "Data/Config directory created."
+        fi
+
+        timestamp=$(date +%Y%m%d_%H%M%S)
+        backup_file="alist_backup_${timestamp}.tar.gz"
+
+        # 压缩数据目录和配置目录
+        tar -czf "/tmp/${backup_file}" -C / app/data app/config
+
+        # 上传新备份到WebDAV
+        curl -u "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" -T "/tmp/${backup_file}" "$FULL_WEBDAV_URL/${backup_file}"
+        if [ $? -eq 0 ]; then
+            echo "Successfully uploaded ${backup_file} to WebDAV"
         else
-            log "数据目录不存在，跳过备份"
+            echo "Failed to upload ${backup_file} to WebDAV"
         fi
 
-        # 清理旧备份
-        log "清理旧备份（保留最近 5 个）"
+        # 清理旧备份文件
         python3 -c "
+import sys
 from webdav3.client import Client
 options = {
-    'webdav_hostname': '$WEBDAV_URL',
+    'webdav_hostname': '$FULL_WEBDAV_URL',
     'webdav_login': '$WEBDAV_USERNAME',
-    'webdav_password': '$WEBDAV_PASSWORD',
-    'webdav_root': '$WEBDAV_BACKUP_PATH'
+    'webdav_password': '$WEBDAV_PASSWORD'
 }
 client = Client(options)
-backups = sorted([f for f in client.list() if f.startswith('alist_backup_')], reverse=True)
+backups = [file for file in client.list() if file.endswith('.tar.gz') and file.startswith('alist_backup_')]
+backups.sort()
 if len(backups) > 5:
-    for f in backups[5:]:
-        client.clean(f)
-        print(f'已删除旧备份: {f}')
+    to_delete = len(backups) - 5
+    for file in backups[:to_delete]:
+        client.clean(file)
+        print(f'Successfully deleted {file}.')
+else:
+    print('Only {} backups found, no need to clean.'.format(len(backups)))
 "
-        log "同步完成，等待下一次同步..."
+
+        rm -f "/tmp/${backup_file}"
+        
+        SYNC_INTERVAL=${SYNC_INTERVAL:-600}
+        echo "Next sync in ${SYNC_INTERVAL} seconds..."
         sleep $SYNC_INTERVAL
     done
 }
 
-# 主逻辑
-case "$1" in
-    restore)
-        restore_backup
-        ;;
-    *)
-        restore_backup &
-        sync_backup &
-        ;;
-esac
+# 启动同步进程
+sync_data