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 0000000..79bc7bf Binary files /dev/null and b/new_studio_to_reg/__pycache__/tools_to_xmps.cpython-310.pyc differ 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 \