bugfix/parsing_error #22

Open
rskthomas wants to merge 5 commits from bugfix/parsing_error into main
2 changed files with 13 additions and 5 deletions
Showing only changes of commit e4124fb20b - Show all commits

View File

@ -37,6 +37,8 @@ class UploadForm(forms.Form):
if exist_annotation: if exist_annotation:
raise ValidationError("error: {} exist".format(file_name)) raise ValidationError("error: {} exist".format(file_name))
except ValueError:
raise ValidationError("Error in parsing JSON: {}. Check for file corruption.".format(file_name))
except Exception: except Exception:
raise ValidationError("error in: {}".format(file_name)) raise ValidationError("error in: {}".format(file_name))

View File

@ -47,13 +47,19 @@ class Command(BaseCommand):
self.open(filepath) self.open(filepath)
def open(self, filepath): def open(self, filepath):
with open(filepath, 'r') as file: try:
content = json.loads(file.read()) with open(filepath, 'r') as file:
path_name = save_in_disk(content, self.user.institution.name) content = json.loads(file.read())
self.snapshots.append((content, path_name)) path_name = save_in_disk(content, self.user.institution.name)
self.snapshots.append((content, path_name))
except json.JSONDecodeError:
raise ValueError(f"Invalid JSON format in file {filepath}.")
#or we cath'em all
except Exception as e:
raise Exception(f"Oops! Something went wrong there")
def parsing(self): def parsing(self):
for s, p in self.snapshots: for s, p in self.snapshots:
try: try:
self.devices.append(Build(s, self.user)) self.devices.append(Build(s, self.user))
move_json(p, self.user.institution.name) move_json(p, self.user.institution.name)