From 8b9ecbe2c78ef3e23f781092d5afd54b9ca51078 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 16 Sep 2019 17:34:33 +0100
Subject: [PATCH] Tidied up todos

---
 openflexure_microscope/api/v1/blueprints/plugins.py | 1 -
 openflexure_microscope/camera/base.py               | 7 -------
 openflexure_microscope/camera/capture.py            | 6 +-----
 openflexure_microscope/camera/pi.py                 | 4 ----
 openflexure_microscope/microscope.py                | 3 ---
 5 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/openflexure_microscope/api/v1/blueprints/plugins.py b/openflexure_microscope/api/v1/blueprints/plugins.py
index 16769aa1..2dc458cf 100644
--- a/openflexure_microscope/api/v1/blueprints/plugins.py
+++ b/openflexure_microscope/api/v1/blueprints/plugins.py
@@ -95,7 +95,6 @@ def construct_blueprint(microscope_obj):
                 plugin_obj.api_form, dict
             ):
                 api_form_info = plugin_obj.api_form
-                # TODO: Validate form? We need to make sure no single plugin can break all plugins.
                 api_form_info["id"] = plugin_name
                 if "forms" in api_form_info and isinstance(
                     api_form_info["forms"], list
diff --git a/openflexure_microscope/camera/base.py b/openflexure_microscope/camera/base.py
index 96ec6b28..59a1d379 100644
--- a/openflexure_microscope/camera/base.py
+++ b/openflexure_microscope/camera/base.py
@@ -42,11 +42,6 @@ def generate_numbered_basename(obj_list: list) -> str:
     return basename
 
 
-def shunt_captures(target_list: list):
-    for obj in target_list:  # For each older capture
-        obj.shunt()  # Shunt capture from memory to storage
-
-
 class CameraEvent(object):
     """
     A frame-signaller object used by any instances or subclasses of BaseCamera.
@@ -295,7 +290,6 @@ class BaseCamera(metaclass=ABCMeta):
         output = CaptureObject(filepath=filepath)
 
         # Update capture list
-        shunt_captures(self.images)
         self.images.append(output)
 
         return output
@@ -336,7 +330,6 @@ class BaseCamera(metaclass=ABCMeta):
         output = CaptureObject(filepath=filepath)
 
         # Update capture list
-        shunt_captures(self.videos)
         self.videos.append(output)
 
         return output
diff --git a/openflexure_microscope/camera/capture.py b/openflexure_microscope/camera/capture.py
index 824b28f0..9bad5eac 100644
--- a/openflexure_microscope/camera/capture.py
+++ b/openflexure_microscope/camera/capture.py
@@ -99,6 +99,7 @@ def capture_from_exif(path, exif_dict):
 class CaptureObject(object):
     """
     StreamObject used to store and process on-disk capture data, and metadata.
+    Serves to simplify modifying properties of on-disk capture data.
 
     Attributes:
         timestring (str): Timestring of capture creation time
@@ -314,10 +315,5 @@ class CaptureObject(object):
         else:
             return False
 
-    def shunt(self):
-        # TODO: Remove
-        pass
-
     def close(self):
-        # TODO: Remove
         pass
\ No newline at end of file
diff --git a/openflexure_microscope/camera/pi.py b/openflexure_microscope/camera/pi.py
index 81ee3153..55cbec75 100644
--- a/openflexure_microscope/camera/pi.py
+++ b/openflexure_microscope/camera/pi.py
@@ -131,7 +131,6 @@ class PiCameraStreamer(BaseCamera):
         Args:
             config (dict): Dictionary of config parameters.
         """
-        # TODO: Include timing and batching logic when applying PiCamera settings
 
         paused_stream = False
         logging.debug("PiCameraStreamer: Applying config:")
@@ -260,9 +259,6 @@ class PiCameraStreamer(BaseCamera):
         """Start the on board GPU camera preview."""
         logging.info("Starting the GPU preview")
 
-        # TODO: Commented out as I honestly can't remember why this was here. May need to put back?
-        # self.start_stream_recording()
-
         try:
             if not self.camera.preview:
                 logging.debug("Starting preview")
diff --git a/openflexure_microscope/microscope.py b/openflexure_microscope/microscope.py
index 71e06d0c..268e3c42 100644
--- a/openflexure_microscope/microscope.py
+++ b/openflexure_microscope/microscope.py
@@ -90,9 +90,6 @@ class Microscope:
 
         settings_full = self.read_config()
 
-        # TODO: Actually attach dummy hardware!
-        # Maybe even attach dummy hardware at __init__, and replace with real hardware if it exists
-
         logging.debug("Attaching camera...")
         self.camera = (
             camera