From eecbc60b8fdc9f19ce0363894c0c5ce644141259 Mon Sep 17 00:00:00 2001 From: Mehul Jain <31754262+mehulmj@users.noreply.github.com> Date: Sun, 14 Mar 2021 11:10:45 +0530 Subject: [PATCH 1/3] Update event.py --- mapactionpy_controller/event.py | 61 +++++++++++++++++---------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/mapactionpy_controller/event.py b/mapactionpy_controller/event.py index fe55c46..1dfaf8d 100644 --- a/mapactionpy_controller/event.py +++ b/mapactionpy_controller/event.py @@ -8,35 +8,38 @@ class Event: def __init__(self, event_file): - - self.path = os.path.dirname(event_file) - with open(event_file, 'r') as f: - event_def = json.loads(f.read()) - validate_against_event_schema(event_def) - - # Doubtless there is a more elegant way to do this. - # 1x file path - self.cmf_descriptor_path = os.path.join(self.path, event_def['cmf_descriptor_path']) - # 3x integers - self.default_jpeg_res_dpi = int(event_def['default_jpeg_res_dpi']) - self.default_pdf_res_dpi = int(event_def['default_pdf_res_dpi']) - self.default_emf_res_dpi = int(event_def['default_emf_res_dpi']) - # 12x others - self.operation_name = event_def['operation_name'] - self.glide_number = event_def['glide_number'] - self.affected_country_iso3 = event_def['affected_country_iso3'].lower() - self.time_zone = event_def['time_zone'] - self.language_iso2 = event_def['language_iso2'] - self.operation_id = (event_def['operation_id']).lower() - self.default_source_organisation = event_def['default_source_organisation'] - self.default_source_organisation_url = event_def['default_source_organisation_url'] - self.default_publishing_base_url = event_def['default_publishing_base_url'] - self.deployment_primary_email = event_def['deployment_primary_email'] - self.default_disclaimer_text = event_def['default_disclaimer_text'] - self.default_donor_credits = event_def['default_donor_credits'] - # self.donors = event_def['donors'] - self.country_name = _parse_country_name(event_def) - + if(os.path.exists(event_file)): + self.path = os.path.dirname(event_file) + with open(event_file, 'r') as f: + event_def = json.loads(f.read()) + validate_against_event_schema(event_def) + + # Doubtless there is a more elegant way to do this. + # 1x file path + self.cmf_descriptor_path = os.path.join(self.path, event_def['cmf_descriptor_path']) + # 3x integers + self.default_jpeg_res_dpi = int(event_def['default_jpeg_res_dpi']) + self.default_pdf_res_dpi = int(event_def['default_pdf_res_dpi']) + self.default_emf_res_dpi = int(event_def['default_emf_res_dpi']) + # 12x others + self.operation_name = event_def['operation_name'] + self.glide_number = event_def['glide_number'] + self.affected_country_iso3 = event_def['affected_country_iso3'].lower() + self.time_zone = event_def['time_zone'] + self.language_iso2 = event_def['language_iso2'] + self.operation_id = (event_def['operation_id']).lower() + self.default_source_organisation = event_def['default_source_organisation'] + self.default_source_organisation_url = event_def['default_source_organisation_url'] + self.default_publishing_base_url = event_def['default_publishing_base_url'] + self.deployment_primary_email = event_def['deployment_primary_email'] + self.default_disclaimer_text = event_def['default_disclaimer_text'] + self.default_donor_credits = event_def['default_donor_credits'] + # self.donors = event_def['donors'] + self.country_name = _parse_country_name(event_def) + else: + print("File does'nt exist") + return + def _parse_country_name(event_def): """ From 441e061409cde2c25b86713169159cd5fb77ed4b Mon Sep 17 00:00:00 2001 From: Mehul Jain <31754262+mehulmj@users.noreply.github.com> Date: Sun, 14 Mar 2021 11:19:23 +0530 Subject: [PATCH 2/3] Update event.py --- mapactionpy_controller/event.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapactionpy_controller/event.py b/mapactionpy_controller/event.py index 1dfaf8d..00f67ca 100644 --- a/mapactionpy_controller/event.py +++ b/mapactionpy_controller/event.py @@ -36,7 +36,7 @@ def __init__(self, event_file): self.default_donor_credits = event_def['default_donor_credits'] # self.donors = event_def['donors'] self.country_name = _parse_country_name(event_def) - else: + else: print("File does'nt exist") return From 15bd1317b1dac10c9a5105202e17aa1e1d677827 Mon Sep 17 00:00:00 2001 From: Mehul Jain <31754262+mehulmj@users.noreply.github.com> Date: Sun, 14 Mar 2021 11:24:42 +0530 Subject: [PATCH 3/3] Update event.py --- mapactionpy_controller/event.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapactionpy_controller/event.py b/mapactionpy_controller/event.py index 00f67ca..e3d595c 100644 --- a/mapactionpy_controller/event.py +++ b/mapactionpy_controller/event.py @@ -37,7 +37,7 @@ def __init__(self, event_file): # self.donors = event_def['donors'] self.country_name = _parse_country_name(event_def) else: - print("File does'nt exist") + print("File does not exist") return