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 2e1731c..27bbabb 100644 --- a/new_studio_to_reg/get_new_studio_reg_info.py +++ b/new_studio_to_reg/get_new_studio_reg_info.py @@ -60,16 +60,16 @@ def get_photo2_align_info(pid): photosNums = len(os.listdir(os.path.join(config.workdir, pid, "photo2"))) #判断是否存在该目录 print(f"影棚号:{psid} , {config.oss_bucket.object_exists(f'xmps_new_studio_rate/{psid}/')}") - filename = f'xmps_new_studio_rate/{psid}/{psid}.rcbox' + #filename = f'xmps_new_studio_rate/{psid}/{psid}.rcbox' isRate = False - if not config.oss_bucket.object_exists(filename): - #提示是否进行 xmps_new_studio_rate 文件夹的创建 - yes_or_not = input('当前该影棚没有对应的对齐坐标,是否创建?(y/n)') - if yes_or_not == 'y': - tools_to_xmps.create_rate_xmps(pid) - isRate = True - else: - sys.exit(0) + # if not config.oss_bucket.object_exists(filename): + # #提示是否进行 xmps_new_studio_rate 文件夹的创建 + # yes_or_not = input('当前该影棚没有对应的对齐坐标,是否创建?(y/n)') + # if yes_or_not == 'y': + # tools_to_xmps.create_rate_xmps(pid) + # isRate = True + # else: + # sys.exit(0) #旋转图片 if isRate == False: @@ -77,7 +77,7 @@ def get_photo2_align_info(pid): tools_to_xmps.rateImages(pid) #下载对齐信息 - get_xmps(psid,pid) + #get_xmps(psid,pid) #执行对齐指令 cmd = f'{config.rcbin} {config.r2["init"]} -setInstanceName {pid} \ diff --git a/old_to_new_build/get_reg_info.py b/old_to_new_build/get_reg_info.py index 39a6fd7..c466509 100644 --- a/old_to_new_build/get_reg_info.py +++ b/old_to_new_build/get_reg_info.py @@ -41,7 +41,7 @@ def get_xmps(psid,pid): print('下载xmps完成') #获取photo2 的对齐信息 -def get_photo2_align_info(pid): +def get_photo2_align_info(pid,flagDoXmps=False): pid = str(pid) psid = libs.getPSid(pid) @@ -59,7 +59,7 @@ def get_photo2_align_info(pid): print(f"影棚号:{psid} , {config.oss_bucket.object_exists(f'xmps_rate/{psid}/')}") filename = f'xmps_rate/{psid}/{psid}.rcbox' isRate = False - if not config.oss_bucket.object_exists(filename): + if not config.oss_bucket.object_exists(filename) or flagDoXmps == True: #提示是否进行 xmps_rate 文件夹的创建 yes_or_not = input('当前该影棚没有对应的对齐坐标,是否创建?(y/n)') if yes_or_not == 'y': @@ -127,10 +127,13 @@ def create_redis_connection(): if __name__ == '__main__': start = time.time() - if len(sys.argv) == 2: + if len(sys.argv) >= 2: pids = sys.argv[1] + flagDoXmps = False + if len(sys.argv) == 3: + flagDoXmps = True for pid in pids.split(','): - get_photo2_align_info(pid) + get_photo2_align_info(pid,flagDoXmps) print(f'{pid}共费时{time.time() - start}秒') else: r = create_redis_connection() # 使用重连函数来创建连接