Update Card_Hub.py

Card_Hub.py

@@ -394,13 +394,11 @@ def check_api1():
             print("%s 接口返回信息： %s", url, response_json)  # 修正日志记录
             if "message" in response_json:
                 print("检测到 角色卡分享")
-                try:  
-                    subprocess.run(f"rsync -avz --timeout=600 --chmod=666 -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/",shell=True, check=True)
-                    # break  # 如果成功，跳出重试循环
-                except subprocess.CalledProcessError as e:
+                try:
+                    sync_database()  # 使用新的同步函数
+                except Exception as e:
+                    print(f"同步过程出错: {e}")
                     nn += 1
-                    print(f"Rsync 失败，返回码: {e.returncode}, 尝试次数: {nn}")
-                    generate_ssh_key()  # 处理 SSH 密钥生成
             else:
                 print("检测到异常了%s 接口返回信息： %s", url, response_json)  # 修正日志记录
         except requests.exceptions.ConnectionError as e:
@@ -418,8 +416,73 @@ def check_api1():
         
         time.sleep(5)
 
+def prepare_database_sync():
+    """准备数据库同步"""
+    db_path = "/Card_Hub/RoleCardSite/server/src/data/database.sqlite"
+    
+    # 1. 停止 Node.js 服务
+    try:
+        subprocess.run("pkill -f 'node.*server.js'", shell=True)
+        time.sleep(2)  # 等待服务完全停止
+    except Exception as e:
+        print(f"停止服务时出错: {e}")
+    
+    # 2. 确保数据库文件权限正确
+    try:
+        subprocess.run(f"chmod 666 {db_path}", shell=True)
+        # 确保数据库文件所在目录也有正确权限
+        subprocess.run(f"chmod 755 {os.path.dirname(db_path)}", shell=True)
+    except Exception as e:
+        print(f"修改权限时出错: {e}")
+    
+    # 3. 备份当前数据库
+    backup_path = f"{db_path}.backup-{int(time.time())}"
+    try:
+        subprocess.run(f"cp {db_path} {backup_path}", shell=True)
+    except Exception as e:
+        print(f"备份数据库时出错: {e}")
 
-
+def sync_database():
+    """同步数据库"""
+    try:
+        # 1. 准备同步
+        prepare_database_sync()
+        
+        # 2. 执行 rsync
+        rsync_cmd = f"rsync -avz --timeout=600 --chmod=666 -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/"
+        subprocess.run(rsync_cmd, shell=True, check=True)
+        
+        # 3. 验证数据库完整性
+        db_path = "/Card_Hub/RoleCardSite/server/src/data/database.sqlite"
+        try:
+            result = subprocess.run(f"sqlite3 {db_path} 'PRAGMA integrity_check;'", 
+                                  shell=True, 
+                                  capture_output=True, 
+                                  text=True)
+            if "ok" not in result.stdout.lower():
+                print("数据库完整性检查失败，尝试恢复备份...")
+                # 恢复最新的备份
+                backups = glob.glob(f"{db_path}.backup-*")
+                if backups:
+                    latest_backup = max(backups, key=os.path.getctime)
+                    subprocess.run(f"cp {latest_backup} {db_path}", shell=True)
+        except Exception as e:
+            print(f"验证数据库完整性时出错: {e}")
+            
+    except subprocess.CalledProcessError as e:
+        print(f"同步失败: {e}")
+        # 如果同步失败，恢复备份
+        backups = glob.glob(f"{db_path}.backup-*")
+        if backups:
+            latest_backup = max(backups, key=os.path.getctime)
+            subprocess.run(f"cp {latest_backup} {db_path}", shell=True)
+    finally:
+        # 4. 重启服务
+        try:
+            os.chdir('/Card_Hub/RoleCardSite')
+            subprocess.run('sh ./start.sh', shell=True)
+        except Exception as e:
+            print(f"重启服务时出错: {e}")
 
 def frp(configs, backstage):
      print('-----------FRP开始-------------')
@@ -461,17 +524,17 @@ def Run_SillyTavern():
     os.chdir('/Card_Hub/RoleCardSite')
     os.system("ls")
     try:
-        # 启动 Node.js 服务器，并将输出重定向到 /dev/null
-        os.system("chmod 666 /Card_Hub/RoleCardSite/server/src/data/database.sqlite")
-        subprocess.run('sh ./start.sh', shell=True, check=True)
-        subprocess.run('sh ./start.sh', shell=True, check=True)
-        subprocess.run('sh ./start.sh', shell=True, check=True)
-        subprocess.run('sh ./start.sh', shell=True, check=True)
+        # 确保数据库权限正确
+        db_path = "/Card_Hub/RoleCardSite/server/src/data/database.sqlite"
+        subprocess.run(f"chmod 666 {db_path}", shell=True)
+        subprocess.run(f"chmod 755 {os.path.dirname(db_path)}", shell=True)
+        
+        # 启动服务
         subprocess.run('sh ./start.sh', shell=True, check=True)
         print("已尝试启动 server.js")
     except subprocess.CalledProcessError as e:
         print(f"命令失败，返���码: {e.returncode}")
-    except Exception as e:  # 捕获所有其他异常
+    except Exception as e:
         print(f"发生异常: {e}")
 
 def SillyTavern():
@@ -509,8 +572,7 @@ def SillyTavern():
         print(f"文件 /{huggingface_Data_name}.zip 不存在，启用实时同步。")
         generate_ssh_key()
         copy_public_key_to_remote(ssh_url, ssh_port, "root", "qilan")
-        subprocess.run(f"rsync -avz --timeout=600 -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/",shell=True, check=True)
-        os.system("chmod 666 /Card_Hub/RoleCardSite/server/src/data/database.sqlite")
+        sync_database()
     else:
         
         # 如果文件存在，可以继续执行后续代码