Compare commits

...

3 Commits

3 changed files with 16 additions and 6 deletions

View File

@ -58,7 +58,7 @@
<div class="col-lg-9 col-md-8">{{ object.type }}</div>
</div>
{% if object.is_websnapshot %}
{% if object.is_websnapshot and object.last_user_evidence %}
{% for k, v in object.last_user_evidence %}
<div class="row mb-3">
<div class="col-lg-3 col-md-4 label">{{ k }}</div>

View File

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

View File

@ -37,6 +37,8 @@ class Command(BaseCommand):
elif os.path.isdir(path):
self.read_directory(path)
else:
raise ValueError(f"The path {path} is neither a file nor a directory")
self.parsing()
@ -47,13 +49,19 @@ class Command(BaseCommand):
self.open(filepath)
def open(self, filepath):
with open(filepath, 'r') as file:
content = json.loads(file.read())
path_name = save_in_disk(content, self.user.institution.name)
self.snapshots.append((content, path_name))
try:
with open(filepath, 'r') as file:
content = json.loads(file.read())
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):
for s, p in self.snapshots:
for s, p in self.snapshots:
try:
self.devices.append(Build(s, self.user))
move_json(p, self.user.institution.name)