rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed from finally block

Browse source
This commit is contained in:
jaknapper 2025-05-13 12:36:06 +01:00
parent 3a45c68ef3
commit 0e3c71b958
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/openflexure_microscope_server/things/smart_scan.py
View file

@ -527,8 +527,6 @@ class SmartScanThing(Thing):
) )
raise e raise e
finally: finally:
# Whether or not this scan succeeded, remove any scan folders containing zero images
self.purge_empty_scans(logger=self._scan_logger)
if self._capture_thread: if self._capture_thread:
# If the capture thread had an error, we capture it here # If the capture thread had an error, we capture it here
try: try:
@ -550,6 +548,9 @@ class SmartScanThing(Thing):
self._return_to_starting_position() self._return_to_starting_position()
self._perform_final_stitch() self._perform_final_stitch()
# Remove any scan folders containing zero images
self.purge_empty_scans(logger=self._scan_logger)
@_scan_running @_scan_running
def _main_scan_loop(self): def _main_scan_loop(self):
""" """
@ -843,7 +844,7 @@ class SmartScanThing(Thing):
"delete", "delete",
"scans", "scans",
) )
def delete_all_scans(self, logger:InvocationLogger) -> None: def delete_all_scans(self, logger: InvocationLogger) -> None:
"""Delete all the scans on the microscope """Delete all the scans on the microscope
**This will irreversibly remove all scanned data from the **This will irreversibly remove all scanned data from the
@ -854,7 +855,9 @@ class SmartScanThing(Thing):
try: try:
self.delete_scan(scan.name) self.delete_scan(scan.name)
except PermissionError: except PermissionError:
logger.warning(f"Could not delete scan {scan.name}. Check folder permissions") logger.warning(
f"Could not delete scan {scan.name}. Check folder permissions"
)
@property @property
def latest_preview_stitch_path(self): def latest_preview_stitch_path(self):
@ -1168,4 +1171,6 @@ class SmartScanThing(Thing):
try: try:
self.delete_scan(scan.name) self.delete_scan(scan.name)
except PermissionError: except PermissionError:
logger.warning(f"Could not delete scan {scan.name}. Check folder permissions") logger.warning(
f"Could not delete scan {scan.name}. Check folder permissions"
)