Update server.py

server.py

@@ -156,7 +156,7 @@ import time
 lock = threading.Lock()
 # data_folder = '/sillytavern/*'
 # zip_file_path = '/a/sillytavern.zip'
-data_folder = '/sillytavern'  # 要压缩的目录
+data_folder = '/root//SillyTavern'  # 要压缩的目录
 zip_file_path = '/a/sillytavern.tar.gz'  # 输出的 tar.gz 文件路径
 metadata_file_path = '/a/dataset-metadata.json'
 last_uploaded_size = -1
@@ -526,34 +526,33 @@ def SillyTavern():
         # os.system("7z x /sillytavern.zip -o/sillytavern -y")
         os.system("mv /sillytavern.ctk sillytavern.tar.gz")
         # os.system("tar -xvpf /sillytavern.tar.gz -C / --use-compress-program=pigz")
-        os.system("tar -xvpf /sillytavern.tar.gz -C / --use-compress-program=pigz > /dev/null")
-        os.system("ls /")
+        os.system(f"tar -xvpf /sillytavern.tar.gz -C {data_folder} --use-compress-program=pigz > /dev/null")
         # os.system("pv /sillytavern.tar.gz | tar -xvpf - -C / --use-compress-program=pigz")
 
         # threading.Thread(target=Oneapi, daemon=True).start()
-        os.chdir('/sillytavern')
-        os.system("ls")
+        os.chdir(data_folder)
+        os.system(f"ls {data_folder}")
         os.system("nvm install node")
         os.system("nvm use node")
         os.system("npm install -y")
         try:
-            subprocess.run('yes | sh /sillytavern/start.sh', shell=True, check=True)
+            subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
         except subprocess.CalledProcessError as e:
             print(f"Command '{e.cmd}' returned non-zero exit status {e.returncode}.")
             print("Output:", e.output)
         os.chdir('/sillytavern')
         print('更新文件')
         os.system('git pull')
-        subprocess.run('yes | sh /sillytavern/start.sh', shell=True, check=True)
-        subprocess.run('yes | sh /sillytavern/start.sh', shell=True, check=True)
-        subprocess.run('yes | sh /sillytavern/start.sh', shell=True, check=True)
-        subprocess.run('yes | sh /sillytavern/start.sh', shell=True, check=True)
+        subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
+        subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
+        subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
+        subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
     print('-----------SillyTavern结束-------------')  
 threading.Thread(target=SillyTavern, daemon=True).start()
 time.sleep(60)
 check_api1()
 
-if os.path.exists('/sillytavern/start.sh'):
+if os.path.exists(f'{data_folder}/start.sh):
     replace_ip_and_country_in_file('/sillytavern/public/login.html')
     # threading.Thread(target=repeat_task, daemon=True).start() #压缩备份
     backup_thread = threading.Thread(target=repeat_task, daemon=True)