Update sync_data.sh

sync_data.sh

@@ -1,31 +1,25 @@
 #!/bin/bash
 
-# 设置默认的同步间隔为 600 秒 (10 分钟)，可以作为环境变量传入
-SYNC_INTERVAL=${SYNC_INTERVAL:-600}
-
-# 设置备份保留数量，默认为 5，可以作为环境变量传入
-BACKUP_RETENTION=${BACKUP_RETENTION:-5}
-
 # 检查环境变量
 if [[ -z "$WEBDAV_URL" ]] || [[ -z "$WEBDAV_USERNAME" ]] || [[ -z "$WEBDAV_PASSWORD" ]]; then
-    echo "Warning: Backup functionality will not be enabled - missing WEBDAV_URL, WEBDAV_USERNAME, or WEBDAV_PASSWORD"
+    echo "Starting without backup functionality - missing WEBDAV_URL, WEBDAV_USERNAME, or WEBDAV_PASSWORD"
+    exec /opt/cloudreve/cloudreve -c /opt/cloudreve/config.ini
     exit 0
 fi
 
-# 设置备份路径，如果 WEBDAV_BACKUP_PATH 为空，则直接使用 WEBDAV_URL
+# 设置备份路径
 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
 
-# 设置 Cloudreve 数据目录 (修改为正确的路径)
-CLOUDREVE_DATA_DIR="/opt/cloudreve/data"
+# 定义 Cloudreve 主程序目录
+CLOUDREVE_DIR="/opt/cloudreve"
+BACKUP_PREFIX="cloudreve_backup"
 
 # 激活虚拟环境
-if [ -f "/opt/venv/bin/activate" ]; then
-    source "/opt/venv/bin/activate"
-fi
+source /opt/venv/bin/activate
 
 # 下载最新备份并恢复
 restore_backup() {
@@ -36,49 +30,45 @@ import os
 import tarfile
 import requests
 import shutil
-import subprocess
 from webdav3.client import Client
-
-# 设置 WebDAV 客户端
 options = {
-    'webdav_hostname': '${FULL_WEBDAV_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)
-
-# 列出备份文件
-try:
-    backups = [file for file in client.list() if file.endswith('.tar.gz') and file.startswith('cloudreve_backup_')]
-except Exception as e:
-    print(f'连接 WebDAV 服务器出错: {e}')
-    sys.exit(1)
-
+backups = [file for file in client.list() if file.endswith('.tar.gz') and file.startswith('$BACKUP_PREFIX')]
 if not backups:
-    print('没有找到备份文件，跳过恢复步骤。')
-    sys.exit(0)
-
-# 获取最新备份文件
+    print('没有找到备份文件')
+    sys.exit()
 latest_backup = sorted(backups)[-1]
 print(f'最新备份文件：{latest_backup}')
-
-# 下载最新备份
-try:
-    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}')
+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}'):
+            # 如果目录已存在，先尝试删除 Cloudreve 目录内的文件，而不是整个目录
+            if os.path.exists('$CLOUDREVE_DIR'):
+                for item in os.listdir('$CLOUDREVE_DIR'):
+                    item_path = os.path.join('$CLOUDREVE_DIR', item)
+                    if os.path.isfile(item_path):
+                        os.remove(item_path)
+                    elif os.path.isdir(item_path):
+                        shutil.rmtree(item_path, ignore_errors=True)
+            os.makedirs('$CLOUDREVE_DIR', exist_ok=True)
 
             # 解压备份文件
             with tarfile.open(f'/tmp/{latest_backup}', 'r:gz') as tar:
-                tar.extractall('/opt/cloudreve/data/')
+                tar.extractall('$CLOUDREVE_DIR')
+
             print(f'成功从 {latest_backup} 恢复备份')
         else:
-            print(f'下载备份失败：{r.status_code}')
-except Exception as e:
-    print(f'恢复备份过程中出错: {e}')
+            print('下载的备份文件不存在')
+    else:
+        print(f'下载备份失败：{r.status_code}')
 "
 }
 
@@ -86,79 +76,60 @@ except Exception as e:
 echo "Downloading latest backup from WebDAV..."
 restore_backup
 
-# 等待30秒后启动程序
-sleep 30
-
-# 启动程序 (根据您的日志，您运行的是 Cloudreve)
-./cloudreve -c /opt/cloudreve/conf/cloudreve.ini &
-
 # 同步函数
 sync_data() {
     while true; do
         echo "Starting sync process at $(date)"
 
-        if [ ! -d "$CLOUDREVE_DATA_DIR" ]; then
-            mkdir -p "$CLOUDREVE_DATA_DIR"
-            echo "Data directory created."
-        fi
-
-        timestamp=$(date +%Y%m%d_%H%M%S)
-        backup_file="cloudreve_backup_${timestamp}.tar.gz"
-        backup_file_path="/tmp/${backup_file}"
+        if [ -d "$CLOUDREVE_DIR" ]; then
+            timestamp=$(date +%Y%m%d_%H%M%S)
+            backup_file="${BACKUP_PREFIX}_${timestamp}.tar.gz"
 
-        echo "Creating backup archive: ${backup_file_path}"
-        # 压缩数据目录，排除可能存在的临时文件
-        tar -czf "${backup_file_path}" --exclude='*.tmp' -C "$CLOUDREVE_DATA_DIR" .
+            # 压缩数据目录
+            tar -czf "/tmp/${backup_file}" -C "$CLOUDREVE_DIR" cloudreve cloudreve.db config.ini
 
-        if [ -f "${backup_file_path}" ]; then
-            echo "Uploading backup to WebDAV: ${FULL_WEBDAV_URL}/${backup_file}"
-            curl -u "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" -T "${backup_file_path}" "${FULL_WEBDAV_URL}/${backup_file}"
+            # 上传新备份到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
-                echo "Failed to upload ${backup_file} to WebDAV"
-            fi
 
-            # 清理旧备份文件
-            WEBDAV_URL="$FULL_WEBDAV_URL" WEBDAV_USERNAME="$WEBDAV_USERNAME" WEBDAV_PASSWORD="$WEBDAV_PASSWORD" BACKUP_RETENTION="$BACKUP_RETENTION" python3 -c "
-import os
+                # 清理旧备份文件
+                python3 -c "
 from webdav3.client import Client
-
-WEBDAV_URL = os.environ.get('WEBDAV_URL')
-WEBDAV_USERNAME = os.environ.get('WEBDAV_USERNAME')
-WEBDAV_PASSWORD = os.environ.get('WEBDAV_PASSWORD')
-BACKUP_RETENTION = int(os.environ.get('BACKUP_RETENTION', '5'))
-
 options = {
-    'webdav_hostname': WEBDAV_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)
-try:
-    backups = sorted([file for file in client.list() if file.endswith('.tar.gz') and file.startswith('cloudreve_backup_')])
-    if len(backups) > BACKUP_RETENTION:
-        num_to_delete = len(backups) - BACKUP_RETENTION
-        for file in backups[:to_delete]:
-            try:
-                client.clean(file)
-                print(f'Successfully deleted old backup: {file}')
-            except Exception as e:
-                print(f'Error deleting {file}: {e}')
-except Exception as e:
-    print(f'Error managing backups: {e}')
+backups = [file for file in client.list() if file.endswith('.tar.gz') and file.startswith('$BACKUP_PREFIX')]
+backups.sort()
+if len(backups) > 5:
+    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)))
 " 2>&1
+            else
+                echo "Failed to upload ${backup_file} to WebDAV"
+            fi
 
-            rm -f "${backup_file_path}"
-        else
-            echo "Failed to create backup archive."
+            rm -f "/tmp/${backup_file}"
+        else:
+            echo "Data directory does not exist yet, waiting for next sync..."
         fi
 
-        SYNC_INTERVAL=${SYNC_INTERVAL:-600}
+        SYNC_INTERVAL=${SYNC_INTERVAL:-60} # 同步间隔改为 60 秒
         echo "Next sync in ${SYNC_INTERVAL} seconds..."
-        sleep "$SYNC_INTERVAL"
+        sleep $SYNC_INTERVAL
     done
 }
 
 # 启动同步进程
-sync_data &
+sync_data &
+
+# 启动 Cloudreve
+sleep 30
+exec /opt/cloudreve/cloudreve -c /opt/cloudreve/config.ini