Update Card_Hub.py

Card_Hub.py

@@ -353,6 +353,34 @@ def check_api1():
     Service_status = False
     n = 0
     nn = 0
+    
+    # 首先确保 Card-Hub 已下载和解压
+    if not os.path.exists('/Card_Hub/RoleCardSite'):
+        print("Card-Hub 未安装，开始下载和解压...")
+        try:
+            # 下载和解压 Card-Hub
+            os.system(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name} -p /")
+            if os.path.exists(f'/{huggingface_Data_name}.zip'):
+                print(f"{huggingface_Data_name}.zip 下载成功！")
+                # 解压文件
+                print("开始解压文件...")
+                os.system(f"7z x /{huggingface_Data_name}.zip -o/ -y")
+                os.system("mv /Card_Hub.ctk card-hub.tar.gz")
+                os.system("mv /card_Hub.ctk card-hub.tar.gz")
+                os.system(f"tar -xvpf /card-hub.tar.gz -C / --use-compress-program=pigz > /dev/null")
+                print("文件解压完成")
+                # 清理临时文件
+                os.system("rm -r /card-hub.tar.gz /card-hub.zip /Card_Hub.ctk")
+            else:
+                print("下载失败，尝试使用实时同步...")
+                generate_ssh_key()
+                copy_public_key_to_remote(ssh_url, ssh_port, "root", "qilan")
+        except Exception as e:
+            print(f"下载和解压过程出错: {e}")
+    
+    # 安装依赖
+    install_dependencies()
+    
     while True:
         n += 1
         if not os.path.exists('/Card_Hub'):
@@ -371,7 +399,13 @@ def check_api1():
             response_json = response.json()
             print(f"{url} 接口返回信息： {response_json}")
             if "message" in response_json:
-                print("源服务器正常运行，无需启动本地服务")
+                print("源服务器正常运行，开始同步数据...")
+                try:
+                    # 执行数据同步
+                    sync_database()
+                    print("数据同步完成")
+                except Exception as e:
+                    print(f"数据同步失败: {e}")
                 time.sleep(300)  # 每5分钟检查一次
                 continue
             else:
@@ -700,25 +734,32 @@ def SillyTavern():
 
     clear_output()
 
+    # 清理并创建目录
     os.system(f"rm -r /a /card-hub /*.zi* {data_folder}")
     os.system(f"mkdir -p {data_folder}")
     os.chdir('/')
-    print(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name}")
-    # os.system(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name}")
+    
+    # 提前下载和解压备份
+    print("开始下载备份...")
     download_n = 0
     while True:
-        # 执行下载命令
         if download_n > 6:
             break
         os.system(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name} -p /")
-        # 检查文件是否存在
         if os.path.exists(f'/{huggingface_Data_name}.zip'):
             print(f"{huggingface_Data_name}.zip 下载成功！")
-            break  # 跳出循环
+            # 解压文件
+            print("开始解压文件...")
+            os.system(f"7z x /{huggingface_Data_name}.zip -o/ -y")
+            os.system("mv /Card_Hub.ctk card-hub.tar.gz")
+            os.system("mv /card_Hub.ctk card-hub.tar.gz")
+            os.system(f"tar -xvpf /card-hub.tar.gz -C / --use-compress-program=pigz > /dev/null")
+            print("文件解压完成")
+            break
         print(f"{huggingface_Data_name}.zip 下载失败，正在重试...")
         download_n += 1
-        time.sleep(300)  # 等待一段时间再重试（例如5秒
-    # os.system('kaggle datasets download xovale7506/sillytavern-data2')
+        time.sleep(300)
+
     # 检查文件是否存在
     if not os.path.exists(f'/{huggingface_Data_name}.zip'):
         print(f"文件 /{huggingface_Data_name}.zip 不存在，启用实时同步。")
@@ -726,46 +767,38 @@ def SillyTavern():
         copy_public_key_to_remote(ssh_url, ssh_port, "root", "qilan")
         sync_database()
     else:
-        
-        # 如果文件存在，可以继续执行后续代码
         print(f"文件 /{huggingface_Data_name}.zip 存在，继续执行程序。")
-        os.system(f"7z x /{huggingface_Data_name}.zip -o/ -y")
-        os.system("mv /Card_Hub.ctk card-hub.tar.gz")
-        os.system("mv /card_Hub.ctk card-hub.tar.gz")
-        os.system("ls /")
-        os.system("ls /Card-Hub")
-        os.system(f"tar -xvpf /card-hub.tar.gz -C / --use-compress-program=pigz > /dev/null")
-
-        # 添加全面的权限修复
-        project_path = '/Card_Hub/RoleCardSite'
-        client_path = f'{project_path}/client'
-        server_path = f'{project_path}/server'
-        
-        # 修复项目根目录权限
-        subprocess.run(f'chmod -R 755 {project_path}', shell=True)
-        
-        # 修复客户端权限
-        subprocess.run(f'chmod -R 755 {client_path}/node_modules', shell=True)
-        subprocess.run(f'chmod +x {client_path}/node_modules/.bin/*', shell=True)
-        
-        # 特别修复 esbuild 权限
-        esbuild_path = f'{client_path}/node_modules/@esbuild/linux-x64/bin/esbuild'
-        if os.path.exists(esbuild_path):
-            subprocess.run(f'chmod +x {esbuild_path}', shell=True)
-        
-        # 修复服务器权限
-        subprocess.run(f'chmod -R 755 {server_path}/node_modules', shell=True)
-        subprocess.run(f'chmod +x {server_path}/node_modules/.bin/*', shell=True)
-        
-        # 修复启动脚本权限
-        subprocess.run(f'chmod +x {project_path}/start.sh', shell=True)
-        
-        print('更新文件')
-        os.system("rm -r /card-hub.tar.gz /card-hub.zip /Card_Hub.ctk")
+    
+    # 添加全面的权限修复
+    project_path = '/Card_Hub/RoleCardSite'
+    client_path = f'{project_path}/client'
+    server_path = f'{project_path}/server'
+    
+    # 修复项目根目录权限
+    subprocess.run(f'chmod -R 755 {project_path}', shell=True)
+    
+    # 修复客户端权限
+    subprocess.run(f'chmod -R 755 {client_path}/node_modules', shell=True)
+    subprocess.run(f'chmod +x {client_path}/node_modules/.bin/*', shell=True)
+    
+    # 特别修复 esbuild 权限
+    esbuild_path = f'{client_path}/node_modules/@esbuild/linux-x64/bin/esbuild'
+    if os.path.exists(esbuild_path):
+        subprocess.run(f'chmod +x {esbuild_path}', shell=True)
+    
+    # 修复服务器权限
+    subprocess.run(f'chmod -R 755 {server_path}/node_modules', shell=True)
+    subprocess.run(f'chmod +x {server_path}/node_modules/.bin/*', shell=True)
+    
+    # 修复启动脚本权限
+    subprocess.run(f'chmod +x {project_path}/start.sh', shell=True)
+    
+    print('更新文件')
+    os.system("rm -r /card-hub.tar.gz /card-hub.zip /Card_Hub.ctk")
     
     install_dependencies()
     check_vite_config()
-    print('-----------SillyTavern结束-------------')  
+    print('-----------SillyTavern结束-------------')
 threading.Thread(target=SillyTavern, daemon=True).start()
 time.sleep(60)
 check_api1()