Upload 3 files

Dockerfile

@@ -9,7 +9,10 @@ RUN apk update && apk add --no-cache \
     python3 \
     py3-pip \
     tar \
-    bash
+    bash \
+    rsync \
+    coreutils \
+    findutils
 
 RUN python3 -m venv /app/venv && \
     /app/venv/bin/pip install --no-cache-dir webdavclient3

entrypoint.sh

@@ -19,6 +19,8 @@ BACKUP_FILENAME="${BACKUP_FILENAME:-tgdrive_db_backup.tar.gz}"
 
 mkdir -p "$DB_PATH" 2>/dev/null || true
 mkdir -p "$BACKUP_PATH" 2>/dev/null || true
+chmod -R 777 "$DB_PATH" 2>/dev/null || true
+chmod -R 777 "$BACKUP_PATH" 2>/dev/null || true
 
 log "数据库路径: ${DB_PATH}"
 log "备份路径: ${BACKUP_PATH}"
@@ -28,13 +30,15 @@ log "备份文件名: ${BACKUP_FILENAME}"
 if [ -n "$WEBDAV_URL" ] && [ -n "$WEBDAV_USERNAME" ] && [ -n "$WEBDAV_PASSWORD" ]; then
     log "检测到WebDAV配置，尝试初始同步..."
     
-    /app/sync-script.sh restore || log "首次恢复尝试失败，可能是首次运行或WebDAV上没有备份"
+    /app/sync-script.sh restore || log "首次恢复尝试失败，可能是首次运行或WebDAV上没有备份或权限问题"
     
     log "设置定时同步任务..."
-    while true; do
-        sleep $((SYNC_INTERVAL * 60))
-        /app/sync-script.sh sync >> /app/logs/sync_cron.log 2>&1
-    done &
+    (
+        while true; do
+            sleep $((SYNC_INTERVAL * 60))
+            /app/sync-script.sh sync >> /app/logs/sync_cron.log 2>&1 || log "同步任务执行失败" >> /app/logs/sync_cron.log 2>&1
+        done
+    ) &
     
     log "后台同步服务已启动，每${SYNC_INTERVAL}分钟执行一次"
 else
@@ -46,8 +50,8 @@ log "tgDrive 同步版本启动成功"
 trap_handler() {
     log "接收到停止信号，执行备份..."
     if [ -n "$WEBDAV_URL" ] && [ -n "$WEBDAV_USERNAME" ] && [ -n "$WEBDAV_PASSWORD" ]; then
-        /app/sync-script.sh backup
-        log "备份完成，容器即将停止"
+        /app/sync-script.sh backup || log "备份过程中遇到错误，可能是权限问题"
+        log "备份尝试完成，容器即将停止"
     else
         log "未配置WebDAV，跳过备份"
     fi

sync-script.sh

@@ -143,26 +143,46 @@ restore_db() {
         if [ -d "$DB_PATH" ] && [ "$(ls -A $DB_PATH 2>/dev/null)" ]; then
             local timestamp=$(date +%Y%m%d%H%M%S)
             if [[ "$DB_PATH" == "/app/db" ]]; then
-                tar -czf "${BACKUP_PATH}/db_before_restore_${timestamp}.tar.gz" -C /app db
+                tar -czf "${BACKUP_PATH}/db_before_restore_${timestamp}.tar.gz" -C /app db 2>/dev/null || log "无法创建当前数据库备份，继续恢复..."
             else
-                tar -czf "${BACKUP_PATH}/db_before_restore_${timestamp}.tar.gz" -C $(dirname "$DB_PATH") $(basename "$DB_PATH")
+                tar -czf "${BACKUP_PATH}/db_before_restore_${timestamp}.tar.gz" -C $(dirname "$DB_PATH") $(basename "$DB_PATH") 2>/dev/null || log "无法创建当前数据库备份，继续恢复..."
             fi
-            log "当前数据库已备份到 ${BACKUP_PATH}/db_before_restore_${timestamp}.tar.gz"
+            log "尝试备份当前数据库到 ${BACKUP_PATH}/db_before_restore_${timestamp}.tar.gz"
         fi
         
-        rm -rf "$DB_PATH"
-        mkdir -p "$DB_PATH"
+        # 创建临时恢复目录
+        mkdir -p /tmp/tgdrive_restore 2>/dev/null || true
         
-        if [[ "$DB_PATH" == "/app/db" ]]; then
-            tar -xzf "${BACKUP_PATH}/${BACKUP_FILENAME}" -C /app
+        # 解压备份文件到临时目录
+        tar -xzf "${BACKUP_PATH}/${BACKUP_FILENAME}" -C /tmp/tgdrive_restore 2>/dev/null || {
+            log "解压备份文件失败，可能是格式不正确"
+            rm -rf /tmp/tgdrive_restore 2>/dev/null || true
+            return 1
+        }
+        
+        # 确保数据库目录存在
+        mkdir -p "$DB_PATH" 2>/dev/null || true
+        
+        # 清空数据库目录内容（逐个文件删除而不是删除整个目录）
+        find "$DB_PATH" -mindepth 1 -delete 2>/dev/null || log "无法清空数据库目录，将尝试直接覆盖..."
+        
+        # 复制恢复的文件到数据库目录
+        if [ -d "/tmp/tgdrive_restore/db" ]; then
+            cp -rf /tmp/tgdrive_restore/db/* "$DB_PATH"/ 2>/dev/null || {
+                log "复制恢复文件失败，尝试使用rsync..."
+                which rsync >/dev/null 2>&1 && rsync -a /tmp/tgdrive_restore/db/ "$DB_PATH"/ 2>/dev/null
+            }
         else
-            mkdir -p /tmp/tgdrive_restore
-            tar -xzf "${BACKUP_PATH}/${BACKUP_FILENAME}" -C /tmp/tgdrive_restore
-            cp -r /tmp/tgdrive_restore/db/* "$DB_PATH"/
-            rm -rf /tmp/tgdrive_restore
+            log "备份中找不到db目录，尝试直接复制临时目录内容..."
+            cp -rf /tmp/tgdrive_restore/* "$DB_PATH"/ 2>/dev/null || {
+                log "复制恢复文件失败，尝试使用rsync..."
+                which rsync >/dev/null 2>&1 && rsync -a /tmp/tgdrive_restore/ "$DB_PATH"/ 2>/dev/null
+            }
         fi
         
-        log "数据库已成功恢复到 ${DB_PATH}"
+        rm -rf /tmp/tgdrive_restore 2>/dev/null || true
+        
+        log "数据库已尝试恢复到 ${DB_PATH}"
         return 0
     else
         log "错误: 备份文件不存在，无法恢复数据库"