Skip to content

Issue : Undefined behaviour if Event contructor is called with non-existant file #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mehulmj wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Issue : Undefined behaviour if Event contructor is called with non-existant file #121

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eecbc60
Update event.py
mehulmj Mar 14, 2021
441e061
Update event.py
mehulmj Mar 14, 2021
9a76def
Merge pull request #1 from mehulmj/mehulmj-patch-1
mehulmj Mar 14, 2021
15bd131
Update event.py
mehulmj Mar 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 32 additions & 29 deletions mapactionpy_controller/event.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 not exist")
return


def _parse_country_name(event_def):
"""
Expand Down