From a435d82f52da7b3937b1f7200b636e05c0889ea6 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 7 Aug 2023 22:09:23 +0100
Subject: [PATCH] try and allow loading jpg etc in new viewer

---
 atlas/models.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/atlas/models.py b/atlas/models.py
index 14fd5814..f4e67d67 100644
--- a/atlas/models.py
+++ b/atlas/models.py
@@ -14,6 +14,7 @@ from django.utils import timezone
 
 import pydicom
 import pydicom.multival
+from pydicom.errors import InvalidDicomError
 
 from django.core.files.storage import FileSystemStorage
 from django.conf import settings
@@ -397,8 +398,11 @@ class SeriesImage(SeriesImageBase):
 
     def get_extra_dicom_data(self):
         print(self.image)
-        with pydicom.dcmread(self.image) as d:
-            return d
+        try:
+            with pydicom.dcmread(self.image) as d:
+                return d
+        except InvalidDicomError:
+            return {}
 
     def get_image_dicom_json(self):
         try:
@@ -406,6 +410,8 @@ class SeriesImage(SeriesImageBase):
                 return extract_image_dicom_json_from_ds(ds, url=f"{REMOTE_URL}{self.image.url}")
         except FileNotFoundError:
             return []
+        except InvalidDicomError:
+            return []
 
 
 class SeriesFinding(models.Model):