|
|
@@ -23,7 +23,7 @@ def generate_xosc(parse_prefix, local_parse_dir, local_delete_list):
|
|
|
local_xosc_path2 = local_parse_dir + 'simulation/xosc/openx_outdoor0.xosc'
|
|
|
bucket.put_object_from_file(parse_prefix + 'scenario.xosc', local_xosc_path2)
|
|
|
bucket.put_object_from_file(parse_prefix + 'scenario_hmi.xosc', local_xosc_path2)
|
|
|
- logging.info("上传 simulation.xosc 成功: %s" % str(parse_prefix + 'scenario.xosc'))
|
|
|
+ logging.info("上传 simulation.xosc(scenario.xosc) 成功: %s" % str(parse_prefix + 'scenario.xosc'))
|
|
|
local_delete_list.append(local_xosc_path2)
|
|
|
except Exception as e:
|
|
|
logging.exception("生成xosc报错: %s" % str(e))
|
|
|
@@ -62,22 +62,22 @@ if __name__ == '__main__':
|
|
|
csv1_done = False
|
|
|
csv2_done = False
|
|
|
for obj3 in oss2.ObjectIterator(bucket, prefix=str(parse_prefix_full)):
|
|
|
- if '/simulation.xosc' in str(obj3.key):
|
|
|
+ if '/simulation.xosc' in str(obj3.key) or '/scenario.xosc' in str(obj3.key):
|
|
|
xosc_done = True
|
|
|
if '/objects_pji.csv' in str(obj3.key):
|
|
|
csv1_done = True
|
|
|
if '/pos_pji.csv' in str(obj3.key):
|
|
|
csv2_done = True
|
|
|
if xosc_done:
|
|
|
- logging.info("存在simulation.xosc: %s" % str(parse_prefix_full))
|
|
|
+ logging.info("存在 simulation.xosc: %s" % str(parse_prefix_full))
|
|
|
continue
|
|
|
if not csv1_done:
|
|
|
- logging.info("不存在/objects_pji.csv: %s" % str(parse_prefix_full))
|
|
|
+ logging.info("不存在 /objects_pji.csv: %s" % str(parse_prefix_full))
|
|
|
continue
|
|
|
if not csv2_done:
|
|
|
- logging.info("不存在/pos_pji.csv: %s" % str(parse_prefix_full))
|
|
|
+ logging.info("不存在 /pos_pji.csv: %s" % str(parse_prefix_full))
|
|
|
continue
|
|
|
- logging.info("需要生成simulation.xosc: %s" % str(parse_prefix_full))
|
|
|
+ logging.info("需要生成 simulation.xosc: %s" % str(parse_prefix_full))
|
|
|
local_dir_full = path1 + parse_prefix_full
|
|
|
if not os.path.exists(local_dir_full):
|
|
|
os.makedirs(local_dir_full)
|
