From e8fb3b378c82a896d1bd4b3e119ba6b77f12e00e Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 18 Feb 2019 12:11:33 +0000
Subject: [PATCH] Fixed missing capture validation

---
 openflexure_microscope/camera/base.py | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/openflexure_microscope/camera/base.py b/openflexure_microscope/camera/base.py
index 7500a168..266dcd2b 100644
--- a/openflexure_microscope/camera/base.py
+++ b/openflexure_microscope/camera/base.py
@@ -242,15 +242,6 @@ class BaseCamera(object):
         with open(db_path, 'w') as outfile:
             yaml.safe_dump(capture_state, outfile)
 
-    def validate_captures(self, capture_list):
-        # Purge captures with missing data files
-        valid_captures = []
-        for capture in capture_list:
-            if capture.file_exists:
-                valid_captures.append(capture)
-        
-        return valid_captures
-
     def load_capture_db(self, db_path):
         if os.path.isfile(db_path):
             # Load list of capture dictionary representations from db_path
@@ -258,9 +249,11 @@ class BaseCamera(object):
                 capture_dict_list = yaml.load(infile)
 
             # Create capture object list, and validate captures
-            capture_list = self.validate_captures(
-                [capture_from_dict(capture_dict) for capture_dict in capture_dict_list]
-            )
+            capture_list = []
+
+            for capture_dict in capture_dict_list:
+                if os.path.isfile(capture_dict['path']):
+                    capture_list.append(capture_from_dict(capture_dict))
 
             return capture_list