Update sync_data.sh

sync_data.sh

@@ -1,13 +1,23 @@
 #!/bin/sh
 
-# 检查环境变量
+# 检查必要的环境变量
 if [ -z "$HF_TOKEN" ] || [ -z "$DATASET_ID" ]; then
-    echo "未检测到 HF_TOKEN 或 DATASET_ID，备份功能不可用"
+    echo "错误: 未设置 HF_TOKEN 或 DATASET_ID 环境变量" >&2
     exit 1
 fi
 
 # 激活虚拟环境
-. ${APP_HOME}/venv/bin/activate
+if [ -f "$APP_HOME/venv/bin/activate" ]; then
+    . "$APP_HOME/venv/bin/activate"
+else
+    echo "错误: 虚拟环境激活脚本未找到" >&2
+    exit 1
+fi
+
+# 设置默认同步间隔
+SYNC_INTERVAL=${SYNC_INTERVAL:-7200}  # 默认2小时
+STORAGE_PATH="$APP_HOME/data"
+SQUASH_FLAG_FILE="/tmp/last_squash_time"
 
 # 生成同步脚本
 cat > hf_sync.py << 'EOL'
@@ -46,7 +56,8 @@ def upload_backup(file_path, file_name, token, repo_id):
         manage_backups(api, repo_id)
     except Exception as e:
         print(f"上传文件出错: {str(e)}")
-
+        return False
+    return True
 
 # 下载最新备份
 def download_latest_backup(token, repo_id, extract_path):
@@ -56,7 +67,7 @@ def download_latest_backup(token, repo_id, extract_path):
         backup_files = [f for f in files if f.startswith('backup_') and f.endswith('.tar.gz')]
         if not backup_files:
             print("未找到任何备份文件")
-            return
+            return False
         latest_backup = sorted(backup_files)[-1]
         with tempfile.TemporaryDirectory() as temp_dir:
             filepath = api.hf_hub_download(
@@ -69,8 +80,10 @@ def download_latest_backup(token, repo_id, extract_path):
                 with tarfile.open(filepath, 'r:gz') as tar:
                     tar.extractall(extract_path)
                 print(f"已成功恢复备份: {latest_backup}")
+                return True
     except Exception as e:
         print(f"下载备份出错: {str(e)}")
+    return False
 
 # 合并历史提交
 def super_squash_history(token, repo_id):
@@ -80,77 +93,114 @@ def super_squash_history(token, repo_id):
         print("历史合并完成。")
     except Exception as e:
         print(f"合并历史出错: {str(e)}")
+        return False
+    return True
 
 # 主函数
 if __name__ == "__main__":
+    if len(sys.argv) < 4:
+        print("错误: 参数不足")
+        sys.exit(1)
+        
     action = sys.argv[1]
     token = sys.argv[2]
     repo_id = sys.argv[3]
+    
     if action == "upload":
+        if len(sys.argv) < 6:
+            print("错误: upload 操作需要文件路径和文件名参数")
+            sys.exit(1)
         file_path = sys.argv[4]
         file_name = sys.argv[5]
-        upload_backup(file_path, file_name, token, repo_id)
+        if not upload_backup(file_path, file_name, token, repo_id):
+            sys.exit(1)
     elif action == "download":
         extract_path = sys.argv[4] if len(sys.argv) > 4 else '.'
-        download_latest_backup(token, repo_id, extract_path)
+        if not download_latest_backup(token, repo_id, extract_path):
+            sys.exit(1)
     elif action == "super_squash":
-        super_squash_history(token, repo_id)
+        if not super_squash_history(token, repo_id):
+            sys.exit(1)
+    else:
+        print(f"错误: 未知操作 '{action}'")
+        sys.exit(1)
+        
+    sys.exit(0)
 EOL
-# 首次启动时从 HuggingFace 下载最新备份（解压到应用目录）
+
+# 首次启动时从 HuggingFace 下载最新备份
 echo "正在从 HuggingFace 下载最新备份..."
-python hf_sync.py download "${HF_TOKEN}" "${DATASET_ID}" "/OpenList"  
+if ! python hf_sync.py download "${HF_TOKEN}" "${DATASET_ID}" "${APP_HOME}"; then
+    echo "警告: 下载备份失败，将使用空数据目录启动" >&2
+fi
+
+# 启动 OpenList 服务
+echo "启动 OpenList 服务..."
+$APP_HOME/openlist server &
+OPENLIST_PID=$!
 
 # 同步函数
 sync_data() {
     while true; do
         echo "同步进程启动于 $(date)"
         
-        # 确保数据目录存在（请根据实际路径修改）
-        STORAGE_PATH="/OpenList/data"
+        # 确保数据目录存在
         if [ -d "${STORAGE_PATH}" ]; then
             # 创建备份
             timestamp=$(date +%Y%m%d_%H%M%S)
             backup_file="backup_${timestamp}.tar.gz"
+            temp_backup="/tmp/${backup_file}"
             
-            # 压缩目录（使用-C避免包含父路径）
-            tar -czf "/tmp/${backup_file}" -C "$(dirname "${STORAGE_PATH}")" "$(basename "${STORAGE_PATH}")"
-            
-            # 上传到 HuggingFace
-            echo "正在上传备份到 HuggingFace..."
-            python hf_sync.py upload "${HF_TOKEN}" "${DATASET_ID}" "/tmp/${backup_file}" "${backup_file}"
-            
-            # 合并历史提交
-        SQUASH_FLAG_FILE="/tmp/last_squash_time"
-        NOW=$(date +%s)
-        SEVEN_DAYS=$((7*24*60*60))
-        if [ ! -f "$SQUASH_FLAG_FILE" ]; then
-            echo $NOW > "$SQUASH_FLAG_FILE"
-            echo "首次合并历史提交..."
-            python hf_sync.py super_squash "${HF_TOKEN}" "${DATASET_ID}"
-        else
-            LAST=$(cat "$SQUASH_FLAG_FILE")
-            DIFF=$((NOW - LAST))
-            if [ $DIFF -ge $SEVEN_DAYS ]; then
-                echo $NOW > "$SQUASH_FLAG_FILE"
-                echo "距离上次合并已超过7天，正在合并历史提交..."
-                python hf_sync.py super_squash "${HF_TOKEN}" "${DATASET_ID}"
+            # 压缩目录
+            echo "正在创建数据备份..."
+            if tar -czf "${temp_backup}" -C "$(dirname "${STORAGE_PATH}")" "$(basename "${STORAGE_PATH}")"; then
+                # 上传到 HuggingFace
+                echo "正在上传备份到 HuggingFace..."
+                if python hf_sync.py upload "${HF_TOKEN}" "${DATASET_ID}" "${temp_backup}" "${backup_file}"; then
+                    echo "备份上传成功"
+                else
+                    echo "错误: 备份上传失败" >&2
+                fi
+                
+                # 合并历史提交
+                NOW=$(date +%s)
+                SEVEN_DAYS=$((7*24*60*60))
+                if [ ! -f "$SQUASH_FLAG_FILE" ]; then
+                    echo $NOW > "$SQUASH_FLAG_FILE"
+                    echo "首次合并历史提交..."
+                    python hf_sync.py super_squash "${HF_TOKEN}" "${DATASET_ID}"
+                else
+                    LAST=$(cat "$SQUASH_FLAG_FILE")
+                    DIFF=$((NOW - LAST))
+                    if [ $DIFF -ge $SEVEN_DAYS ]; then
+                        echo $NOW > "$SQUASH_FLAG_FILE"
+                        echo "距离上次合并已超过7天，正在合并历史提交..."
+                        python hf_sync.py super_squash "${HF_TOKEN}" "${DATASET_ID}"
+                    else
+                        echo "距离上次合并未满7天，本次跳过合并历史提交。"
+                    fi
+                fi
             else
-                echo "距离上次合并未满7天，本次跳过合并历史提交。"
+                echo "错误: 创建备份失败" >&2
             fi
-        fi
 
             # 清理临时文件
-            rm -f "/tmp/${backup_file}"
+            rm -f "${temp_backup}"
         else
-            echo "存储目录 ${STORAGE_PATH} 不存在，等待中..."
+            echo "警告: 存储目录 ${STORAGE_PATH} 不存在，等待中..." >&2
+        fi
+        
+        # 检查 OpenList 服务是否仍在运行
+        if ! kill -0 $OPENLIST_PID 2>/dev/null; then
+            echo "错误: OpenList 服务已停止，退出同步进程" >&2
+            exit 1
         fi
         
         # 同步间隔
-        SYNC_INTERVAL=${SYNC_INTERVAL:-7200}
         echo "下次同步将在 ${SYNC_INTERVAL} 秒后进行..."
         sleep $SYNC_INTERVAL
     done
 }
 
 # 启动同步进程
-sync_data &
+sync_data