diff --git a/old_to_new_build/get_reg_info.py b/old_to_new_build/get_reg_info.py index b934938..7078c6c 100644 --- a/old_to_new_build/get_reg_info.py +++ b/old_to_new_build/get_reg_info.py @@ -56,7 +56,12 @@ def get_photo2_align_info(pid,flagDoXmps=False): libs.down_from_oss(config.oss_bucket, config.workdir, pid) #判断对齐的图片数量和photo2的数量是否一致,不一致要进行通知处理 - photosNums = len(os.listdir(os.path.join(config.workdir, pid, "photo2"))) + #photosNums = len(os.listdir(os.path.join(config.workdir, pid, "photo2"))) + photosNums = 0 + for file in os.listdir(os.path.join(config.workdir, pid, "photo2")): + if file.endswith('.jpg'): + photosNums += 1 + #判断是否存在该目录 print(f"影棚号:{psid} , {config.oss_bucket.object_exists(f'xmps_rate/{psid}/')}") filename = f'xmps_rate/{psid}/{psid}.rcbox' @@ -113,7 +118,7 @@ def get_photo2_align_info(pid,flagDoXmps=False): config.oss_bucket.put_object_from_file(f'objs/auto/{pid}/repeat_build/jpgs/{file}', os.path.join(config.workdir, pid, 'reg', file)) print(f'影棚号:{psid} , PID:{pid},照片数量:{photosNums} 对齐的图片数量:{alignNums}') - if alignNums != photosNums: + if photosNums - alignNums >= 3 and psid != 9: notify(f'影棚号:{psid} , PID:{pid},没有对齐,照片数量:{photosNums} 对齐的图片数量:{alignNums}') #删除文件夹 shutil.rmtree(os.path.join(config.workdir, pid), ignore_errors=True) @@ -121,6 +126,7 @@ def get_photo2_align_info(pid,flagDoXmps=False): #处理完成后塞入到指定的队列 r = create_redis_connection() + print("推入到重建队列") r.rpush('ai:ai_repeat_build',pid) #删除文件夹 diff --git a/old_to_new_build/tools_to_xmps.py b/old_to_new_build/tools_to_xmps.py index 073efcd..770837c 100644 --- a/old_to_new_build/tools_to_xmps.py +++ b/old_to_new_build/tools_to_xmps.py @@ -139,7 +139,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, "photo1")}" -selectAllImages \