From c095f1d9ea34f9eefa20fd3216ea2432bb1a60e9 Mon Sep 17 00:00:00 2001
From: dongchangxi <458593490@qq.com>
Date: Tue, 7 Jan 2025 15:02:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BD=B1=E6=A3=9A=E4=B9=9F=E8=A6=81?=
 =?UTF-8?q?=E5=A4=8D=E7=94=A8=E5=9D=90=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__pycache__/tools_to_xmps.cpython-310.pyc    | Bin 0 -> 4551 bytes
 new_studio_to_reg/get_new_studio_reg_info.py     |  11 ++++++-----
 new_studio_to_reg/tools_to_xmps.py               |   2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 new_studio_to_reg/__pycache__/tools_to_xmps.cpython-310.pyc

diff --git a/new_studio_to_reg/__pycache__/tools_to_xmps.cpython-310.pyc b/new_studio_to_reg/__pycache__/tools_to_xmps.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..79bc7bf3fba5f8d0aed7bd4d284cf04c5d9ceb28
GIT binary patch
literal 4551
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
M*^j5FPc{DYe_MG)P5=M^

literal 0
HcmV?d00001

diff --git a/new_studio_to_reg/get_new_studio_reg_info.py b/new_studio_to_reg/get_new_studio_reg_info.py
index 732fbf5..2a6676d 100644
--- a/new_studio_to_reg/get_new_studio_reg_info.py
+++ b/new_studio_to_reg/get_new_studio_reg_info.py
@@ -111,13 +111,14 @@ def get_photo2_align_info(pid):
 
     if alignNums != photosNums:
         notify(f'影棚号:{psid} , PID:{pid},没有对齐,照片数量:{photosNums} 对齐的图片数量:{alignNums}')
+    else:
     
-    #处理完成后塞入到指定的队列
-    r = create_redis_connection()
-    r.rpush('ai:ai_build_mesh',pid)
+        #处理完成后塞入到指定的队列
+        r = create_redis_connection()
+        r.rpush('ai:ai_build_mesh',pid)
 
-    #删除文件夹
-    shutil.rmtree(os.path.join(config.workdir, pid), ignore_errors=True)
+        #删除文件夹
+        shutil.rmtree(os.path.join(config.workdir, pid), ignore_errors=True)
 
 def create_redis_connection():
     """创建 Redis 连接，若连接失败则重试"""
diff --git a/new_studio_to_reg/tools_to_xmps.py b/new_studio_to_reg/tools_to_xmps.py
index 62b437a..31abba8 100644
--- a/new_studio_to_reg/tools_to_xmps.py
+++ b/new_studio_to_reg/tools_to_xmps.py
@@ -133,7 +133,7 @@ def create_rate_xmps(pid):
     #清除图片exif信息， 旋转图片 180度
     rateImages(pid)
     #通过rc 计算出 xmps 文件
-    exportxmp = ' -exportXMP "D:\\make2\\config\\exportXMP.config.xml" '
+    exportxmp = ' -exportXMP "D:\\make2\\config\\exportXMP.config.lock.xml" '
     cmd = f'{config.rcbin} {config.r2["init"]} -setInstanceName {pid} \
         -save "{os.path.join(config.workdir, pid, f"{pid}.rcproj")}" \
         -addFolder "{os.path.join(config.workdir, pid, "photo2")}" -selectAllImages \