From abc8fb8947d87b92faaed3a23cc663235c796cb9 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Fri, 17 May 2019 19:09:53 -0700 Subject: [PATCH] replace extract_region_from_filename- use re --- roles/osm-vector-maps/templates/iiab-update-map | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/roles/osm-vector-maps/templates/iiab-update-map b/roles/osm-vector-maps/templates/iiab-update-map index 3d72bba62..837bc9e85 100755 --- a/roles/osm-vector-maps/templates/iiab-update-map +++ b/roles/osm-vector-maps/templates/iiab-update-map @@ -192,14 +192,11 @@ def fetch_menu_json_value(key): return data.get(key,'') def extract_region_from_filename(fname): - substitutions = { "north": "north_america",\ - "central": "central_america",\ - "southeast": "southeast_asia", - "south": "south_america" } - # wish I had used - as separator between key and date - nibble = fname.split('_')[0] - nibble = substitutions.get(nibble,nibble) - return(nibble) + nibble = re.search(r"^.._osm_..._(.*)_[0-9]{4}",fname) + if not nibble: + return("maplist") + resp = nibble.group(1) + return(resp) if __name__ == '__main__': if console_installed: