Update server.py

server.py

@@ -153,8 +153,10 @@ import time
 
 # 创建一个锁
 lock = threading.Lock()
-data_folder = '/sillytavern/*'
-zip_file_path = '/a/sillytavern.zip'
+# data_folder = '/sillytavern/*'
+# zip_file_path = '/a/sillytavern.zip'
+data_folder = '/sillytavern'  # 要压缩的目录
+zip_file_path = '/a/sillytavern.tar.gz'  # 输出的 tar.gz 文件路径
 metadata_file_path = '/a/dataset-metadata.json'
 last_uploaded_size = -1
 
@@ -162,8 +164,6 @@ def update_last_uploaded_size(size):
     global last_uploaded_size
     last_uploaded_size = size
 
-
-
 def compress_folder():
     global last_uploaded_size  # 声明使用全局变量
 
@@ -181,6 +181,12 @@ 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
+        result = subprocess.run(
+                f'tar -cvf - {data_folder} | pigz -p 2 -1 > {zip_file_path}',
+                shell=True,
+                check=True
+        )
         print('重命名压缩后的文件')
         file_path = '/a/sillytavern.zip1'
         subprocess.run(['mv', zip_file_path,file_path])
@@ -512,10 +518,13 @@ 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.zip1 /sillytavern.zip")
-        os.system("7z x /sillytavern.zip -o/sillytavern -y")
         os.system("rm *.zip")
+        os.system(f"7z x /{huggingface_Data_name}.zip -o/ -y")
+        # os.system("mv /sillytavern.zip1 /sillytavern.zip")
+        # os.system("7z x /sillytavern.zip -o/sillytavern -y")
+        os.system("mv sillytavern.tar.gz1 sillytavern.tar.gz")
+        os.system("tar -xvpf /sillytavern.tar.gz -C / --use-compress-program=pigz")
+        
 
         threading.Thread(target=Oneapi, daemon=True).start()
         os.chdir('/sillytavern')