Update server.py

server.py

@@ -615,9 +615,10 @@ def monitor_port():
         
         time.sleep(5)  # 每5秒检查一次
 def Run_SillyTavern():
-    os.chdir(data_folder)
+    
     # subprocess.run(f'node "server.js" "$@"', shell=True, check=True)
     try:
+        os.chdir(data_folder)
         # 启动 Node.js 服务器，并将输出重定向到 /dev/null
         subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
         subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
@@ -626,9 +627,9 @@ def Run_SillyTavern():
         subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
         print("已尝试启动 server.js")
     except subprocess.CalledProcessError as e:
-        print(f"命令失败，返回码: {e.returncode}")
+        print(f"Run_SillyTavern命令失败，返回码: {e.returncode}")
     except Exception as e:  # 捕获所有其他异常
-        print(f"发生异常: {e}")
+        print(f"Run_SillyTavern发生异常: {e}")
 def SillyTavern():
     print('-----------SillyTavern开始-------------')
     # 创建目录并写入 kaggle.json
@@ -683,7 +684,10 @@ def SillyTavern():
 
         
         os.chdir(data_folder)
+        os.system('git merge --abort')
+        os.system('git reset --hard')
         os.system('git pull --rebase --autostash')
+        print('更新文件')
         os.system(f"ls {data_folder}")
         os.system("nvm install node")
         os.system("nvm use node")
@@ -694,7 +698,7 @@ def SillyTavern():
             print(f"Command '{e.cmd}' returned non-zero exit status {e.returncode}.")
             print("Output:", e.output)
         os.system(f"ls {data_folder}")
-        print('更新文件')
+        
         
         backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
         backup_thread.start()