curious.bio/planktoscope
curious.bio/planktoscope
9
0
Fork 0
Code Issues 10 Pull requests Packages Projects 7 Releases Wiki Activity

imager: remove problematic characters from image path

Browse source
This commit is contained in:
Romain Bazile 2021-11-05 17:19:17 +01:00
parent 1497a4ad9e
commit 31c91a246a
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/planktoscope/imager/__init__.py
View file

@ -109,7 +109,7 @@ class ImagerProcess(multiprocessing.Process):
logger.exception( logger.exception(
f"A second exception has occured when starting up raspimjpeg: {e}" f"A second exception has occured when starting up raspimjpeg: {e}"
) )
logger.error(f"This error can't be recovered from, terminating now") logger.error("This error can't be recovered from, terminating now")
raise e raise e
if self.__camera.sensor_name == "IMX219": # Camera v2.1 if self.__camera.sensor_name == "IMX219": # Camera v2.1
@ -279,6 +279,7 @@ class ImagerProcess(multiprocessing.Process):
self.imager_client.client.publish("status/imager", '{"status":"Busy"}') self.imager_client.client.publish("status/imager", '{"status":"Busy"}')
def __message_settings(self, last_message): def __message_settings(self, last_message):
# TODO simplify this method, move timeout error check inside self.__camera.resolution/iso/etc.
if self.__imager.state.name == "stop": if self.__imager.state.name == "stop":
if "settings" not in last_message: if "settings" not in last_message:
logger.error( logger.error(
@ -559,8 +560,8 @@ class ImagerProcess(multiprocessing.Process):
self.__export_path = os.path.join( self.__export_path = os.path.join(
self.__base_path, self.__base_path,
self.__global_metadata["object_date"], self.__global_metadata["object_date"],
str(self.__global_metadata["sample_id"]).replace(" ", "_"), str(self.__global_metadata["sample_id"]).replace(" ", "_").strip("'"),
str(self.__global_metadata["acq_id"]).replace(" ", "_"), str(self.__global_metadata["acq_id"]).replace(" ", "_").strip("'"),
) )
if os.path.exists(self.__export_path): if os.path.exists(self.__export_path):