Convert find_extension to return a bool

Author: stephen-riggs

src/murfey/client/analyser.py

@@ -85,7 +85,7 @@ def __init__(
     def __repr__(self) -> str:
         return f"<Analyser ({self._basepath})>"
 
-    def _find_extension(self, file_path: Path):
+    def _find_extension(self, file_path: Path) -> bool:
         """
         Identifies the file extension and stores that information in the class.
         """
@@ -101,32 +101,30 @@ def _find_extension(self, file_path: Path):
             .get(file_path.suffix)
         ):
             if not any(r in file_path.name for r in required_substrings):
-                return []
+                return False
 
-        # Checks for MRC, TIFF, TIF, and EER files if no extension has been defined
-        if (
-            file_path.suffix in (".mrc", ".tiff", ".tif", ".eer")
-            and not self._extension
-        ):
-            logger.info(f"File extension determined: {file_path.suffix}")
-            self._extension = file_path.suffix
-        # Check for TIFF, TIF, or EER if the file's already been assigned an extension
-        elif (
-            file_path.suffix in (".tiff", ".tif", ".eer")
-            and self._extension != file_path.suffix
-        ):
-            logger.info(f"File extension re-evaluated: {file_path.suffix}")
-            self._extension = file_path.suffix
+        # Checks for MRC, TIFF, TIF, and EER files
+        if file_path.suffix in (".mrc", ".tiff", ".tif", ".eer"):
+            if not self._extension:
+                logger.info(f"File extension determined: {file_path.suffix}")
+                self._extension = file_path.suffix
+            elif self._extension != file_path.suffix:
+                logger.info(f"File extension re-evaluated: {file_path.suffix}")
+                self._extension = file_path.suffix
+            return True
         # If we see an .mdoc file first, use that to determine the file extensions
         elif file_path.suffix == ".mdoc":
             with open(file_path, "r") as md:
                 md.seek(0)
                 mdoc_data_block = get_block(md)
             if subframe_path := mdoc_data_block.get("SubFramePath"):
                 self._extension = Path(subframe_path).suffix
+                return True
         # Check for LIF files separately
         elif file_path.suffix == ".lif":
             self._extension = file_path.suffix
+            return True
+        return False
 
     def _find_context(self, file_path: Path) -> bool:
         """
@@ -269,7 +267,10 @@ def _analyse(self):
                     elif transferred_file.suffix == ".mdoc":
                         mdoc_for_reading = transferred_file
                 if not self._context:
-                    self._find_extension(transferred_file)
+                    valid_extension = self._find_extension(transferred_file)
+                    if not valid_extension:
+                        logger.error(f"No extension found for {transferred_file}")
+                        break
                     found = self._find_context(transferred_file)
                     if not found:
                         logger.debug(
@@ -344,7 +345,10 @@ def _analyse(self):
 
                 # Handle files with tomography and SPA context differently
                 elif not self._extension or self._unseen_xml:
-                    self._find_extension(transferred_file)
+                    valid_extension = self._find_extension(transferred_file)
+                    if not valid_extension:
+                        logger.error(f"No extension found for {transferred_file}")
+                        break
                     if self._extension:
                         logger.info(
                             f"Extension found successfully for {transferred_file}"