Update server.py

server.py

@@ -153,8 +153,8 @@ import time
 
 # 创建一个锁
 lock = threading.Lock()
-data_folder = '/sillytavern'
-zip_file_path = '/a/sillytavern.tar.gz'
+data_folder = '/sillytavern/*'
+zip_file_path = '/a/sillytavern.zip'
 metadata_file_path = '/a/dataset-metadata.json'
 last_uploaded_size = -1
 
@@ -180,28 +180,14 @@ def compress_folder():
         
         print('开始压缩数据')
         result = subprocess.run(['7z', 'a', '-tzip', '-mx=1','-mmt=2', zip_file_path, data_folder])
-        # 使用 tar 和 pigz 压缩
-        result = subprocess.run(
-            f'tar -cvf - {data_folder} | pigz -p 2 -1 > {zip_file_path}',
-            shell=True,
-            check=True
-        )
-
-        # 检查结果
-        if result.returncode == 0:
-            print("压缩成功！")
-        else:
-            print("压缩失败！")
-            return
-        # tar -cvf - /sillytavern | pigz -p 2 -1 > /a/sillytavern.tar.gz
         # 7z a -tzip -mx=1 -mmt=2 /a/sillytavern.zip /sillytavern/*
-    
-        # if result.returncode != 0:
-        #     print("压缩失败，请检查7z命令是否正确")
-        #     return
         print('重命名压缩后的文件')
-        file_path = '/a/sillytavern.tar.gz1'
+        file_path = '/a/sillytavern.zip1'
         subprocess.run(['mv', zip_file_path,file_path])
+        if result.returncode != 0:
+            print("压缩失败，请检查7z命令是否正确")
+            return
+        
         print(f"Data compressed into {file_path}")
         
         file_size = os.path.getsize(file_path)  # 获取压缩包的大小
@@ -527,13 +513,11 @@ def SillyTavern():
         print(f"文件 /{huggingface_Data_name}.zip 存在，继续执行程序。")
     # # 解压 sillytavern.zip
         os.system(f"7z x /{huggingface_Data_name}.zip -o/ -y")
-        os.system("mv //sillytavern.tar.gz1 /sillytavern.tar.gz")
-        # os.system("7z x /sillytavern.zip -o/sillytavern -y")
-        os.system("7z x -mmt=on /sillytavern.tar.gz -o/ -y")
-        
+        os.system("mv /sillytavern.zip1 /sillytavern.zip")
+        os.system("7z x /sillytavern.zip -o/sillytavern -y")
         os.system("rm *.zip")
 
-        # threading.Thread(target=Oneapi, daemon=True).start()
+        threading.Thread(target=Oneapi, daemon=True).start()
         os.chdir('/sillytavern')
         os.system("ls")
         os.system("nvm install node")