Update server.py

server.py

@@ -182,14 +182,14 @@ def compress_folder():
         print('开始压缩数据')
         result = subprocess.run(['7z', 'a', '-tzip', '-mx=1','-mmt=2', zip_file_path, data_folder])
         # 7z a -tzip -mx=1 -mmt=2 /a/sillytavern.zip /sillytavern/*
-        # tar -cvf - /sillytavern | pigz -p 2 -1 > /a/sillytavern.tar.gz
+        # tar -cvf - /sillytavern | pigz -p 6 -1 > /a/sillytavern.tar.gz
         result = subprocess.run(
                 f'tar -cvf - {data_folder} | pigz -p 6 -1 > {zip_file_path}',
                 shell=True,
                 check=True
         )
         print('重命名压缩后的文件')
-        file_path = '/a/sillytavern.zip1'
+        file_path = f"{zip_file_path}1"
         subprocess.run(['mv', zip_file_path,file_path])
         if result.returncode != 0:
             print("压缩失败，请检查7z命令是否正确")
@@ -503,7 +503,7 @@ def SillyTavern():
             print(f"{huggingface_Data_name}.zip 下载成功！")
             break  # 跳出循环
     
-        print(f"{downloaded_file} 下载失败，正在重试...")
+        print(f"{huggingface_Data_name}.zip 下载失败，正在重试...")
     
         time.sleep(5)  # 等待一段时间再重试（例如5秒
     # os.system('kaggle datasets download xovale7506/sillytavern-data2')
@@ -540,6 +540,8 @@ def SillyTavern():
             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)