commit

src/python2/pjibot_delivery/camera-pjibot_delivery.py

@@ -57,17 +57,11 @@ if __name__ == '__main__':
                     parse_prefix = merged_prefix.replace('data_merge', 'data_parse')
                     parse_prefix_full = merged_bag_object_key.replace('data_merge', 'data_parse')[:-4] + '/'
                     camera_done = False
-                    callback_done = False
                     for obj2 in oss2.ObjectIterator(bucket, prefix=parse_prefix_full):
-                        if '/callback.json' in str(obj2.key):
-                            callback_done = True
                         if '/camera.mp4' in str(obj2.key):
                             camera_done = True
                     if camera_done:
                         continue
-                    if not callback_done:  # 不存在存在callback.json的就不处理了
-                        continue
-
                     local_merged_bag_path = path1 + 'camera/' + merged_bag_object_key
                     local_merged_dir = '/'.join(local_merged_bag_path.split('/')[:-1])
                     local_parse_dir = local_merged_dir.replace('data_merge', 'data_parse')

src/python2/pjibot_patrol/camera-pjibot_patrol.py

@@ -36,8 +36,6 @@ def parse_to_mp4(merged_bag_file_path, parse_prefix1, local_parse_dir2, local_de
 if __name__ == '__main__':
     # 1 创建阿里云对象
     auth = oss2.Auth('n8glvFGS25MrLY7j', 'xZ2Fozoarpfw0z28FUhtg8cu0yDc5d')
-    # cname = 'http://open-bucket.oss.icvdc.com'
-    # bucket = oss2.Bucket(auth, cname, 'open-bucket', is_cname=True)
     endpoint = 'oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com'
     bucket = oss2.Bucket(auth, endpoint, 'pji-bucket1')
 
@@ -58,16 +56,11 @@ if __name__ == '__main__':
                     parse_prefix = merged_prefix.replace('data_merge', 'data_parse')
                     parse_prefix_full = merged_bag_object_key.replace('data_merge', 'data_parse')[:-4] + '/'
                     camera_done = False
-                    callback_done = False
                     for obj2 in oss2.ObjectIterator(bucket, prefix=parse_prefix_full):
-                        if '/callback.json' in str(obj2.key):
-                            callback_done = True
                         if '/camera.mp4' in str(obj2.key):
                             camera_done = True
                     if camera_done:
                         continue
-                    if not callback_done:  # 不存在存在callback.json的就不处理了
-                        continue
 
                     local_merged_bag_path = path1 + 'camera/' + merged_bag_object_key
                     local_merged_dir = '/'.join(local_merged_bag_path.split('/')[:-1])