From cc752a9da9d5aee8b5c826a72c405179f6413e50 Mon Sep 17 00:00:00 2001
From: dongchangxi <458593490@qq.com>
Date: Tue, 25 Feb 2025 20:11:05 +0800
Subject: [PATCH] 1

---
 no_resize.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/no_resize.py b/no_resize.py
index b2e2016..0c279fc 100644
--- a/no_resize.py
+++ b/no_resize.py
@@ -123,7 +123,15 @@ def down_obj_fromoss(pid, print_type=1, order_id=None,download_flag="print_build
             os.rename(localfile,  os.path.join(path,f"{pid}Tex1.jpg"))
             #重命名文件
 
-
+def delete_files_in_directory(directory):
+    for file_name in os.listdir(directory):
+        file_path = os.path.join(directory, file_name)
+        try:
+            if os.path.isfile(file_path):
+                os.remove(file_path)
+                print(f"Deleted: {file_path}")
+        except Exception as e:
+            print(f"Error deleting {file_path}: {e}")
     
         
 def make3d4print_task(r):
@@ -155,7 +163,7 @@ def make3d4print_task(r):
     if pid == "":
         return
 
-    down_obj_fromoss(pid, print_type=1, orderId,download_flag="print_build")
+    down_obj_fromoss(pid, 1, orderId,download_flag="print_build")
    
     
     path = os.path.join(workdir, 'print', f'{pid}_{orderId}')
@@ -167,8 +175,8 @@ def make3d4print_task(r):
 
     for file in os.listdir(path):
         # 跳过一些不需要上传的文件
-        if file in [f'{pid}.png',f'{pid}_old.jpg', f'{pid}.obj', f'{pid}_decimate.glb', f'{pid}_decimate.obj', f'{pid}_decimate.mtl', f'{pid}Tex1_decimate.jpg', f'{pid}_original.obj', f'{pid}_original.mtl']: continue
-        print("当前目录",os.path.join(path, file))
+        # if file in [f'{pid}.png',f'{pid}_old.jpg', f'{pid}.obj', f'{pid}_decimate.glb', f'{pid}_decimate.obj', f'{pid}_decimate.mtl', f'{pid}Tex1_decimate.jpg', f'{pid}_original.obj', f'{pid}_original.mtl']: continue
+        # print("当前目录",os.path.join(path, file))
 
         #将文件移动到指定目录
         if not os.path.exists(os.path.join(workdir, f'complate/objs/{pid}/')):