parent
05013ecdfb
commit
ea19bb9bc0
@ -130,11 +130,12 @@ def import_events_from_json(self, json):
|
||||
|
||||
importer = DBImporterEvents(self.request.id)
|
||||
|
||||
# try:
|
||||
success, error_message = importer.import_events(json)
|
||||
|
||||
# finally, close task
|
||||
close_import_task(self.request.id, success, error_message, importer)
|
||||
try:
|
||||
success, error_message = importer.import_events(json)
|
||||
close_import_task(self.request.id, success, error_message, importer)
|
||||
except Exception as e:
|
||||
logger.error(e)
|
||||
close_import_task(self.request.id, False, e, importer)
|
||||
|
||||
|
||||
class ChromiumTask(Task):
|
||||
|
@ -1,5 +1,6 @@
|
||||
import json
|
||||
import logging
|
||||
from datetime import date
|
||||
|
||||
from django.utils import timezone
|
||||
|
||||
@ -42,8 +43,8 @@ class DBImporterEvents:
|
||||
|
||||
try:
|
||||
structure = json.loads(json_structure)
|
||||
except Exception:
|
||||
return (False, "JSON file is not correctly structured")
|
||||
except Exception as e:
|
||||
return (False, "JSON file is not correctly structured: " + str(e))
|
||||
|
||||
if len(structure) == 0:
|
||||
return (True, "")
|
||||
@ -63,6 +64,8 @@ class DBImporterEvents:
|
||||
|
||||
if "date" in structure["header"]:
|
||||
self.date = structure["header"]["date"]
|
||||
else:
|
||||
self.date = str(date.today())
|
||||
|
||||
# get events
|
||||
for event in structure["events"]:
|
||||
|
Loading…
x
Reference in New Issue
Block a user