diff --git a/src/murfey/client/contexts/spa.py b/src/murfey/client/contexts/spa.py index b798816d3..1b4a1e184 100644 --- a/src/murfey/client/contexts/spa.py +++ b/src/murfey/client/contexts/spa.py @@ -66,13 +66,16 @@ def _grid_square_metadata_file( break else: raise ValueError(f"Could not determine grid square metadata path for {f}") - return ( + metadata_file = ( base_dir / visit / mid_dir.parent.parent.parent / "Metadata" / f"GridSquare_{grid_square}.dm" ) + if not metadata_file.is_file(): + logger.warning(f"Grid square metadata file {str(metadata_file)} does not exist") + return metadata_file def _get_source(file_path: Path, environment: MurfeyInstanceEnvironment) -> Path | None: diff --git a/src/murfey/client/contexts/spa_metadata.py b/src/murfey/client/contexts/spa_metadata.py index 760eef1c8..48fd2d3af 100644 --- a/src/murfey/client/contexts/spa_metadata.py +++ b/src/murfey/client/contexts/spa_metadata.py @@ -30,6 +30,7 @@ def _foil_hole_positions(xml_path: Path, grid_square: int) -> Dict[str, FoilHole required_key = key break if not required_key: + logger.warning(f"Required key not found for {str(xml_path)}") return {} foil_holes = {} for fh_block in serialization_array[required_key]: @@ -186,6 +187,9 @@ def post_transfer( and environment ): gs_name = transferred_file.stem.split("_")[1] + logger.info( + f"Collecting foil hole positions for {str(transferred_file)} and grid square {int(gs_name)}" + ) fh_positions = _foil_hole_positions(transferred_file, int(gs_name)) source = _get_source(transferred_file, environment=environment) visitless_source = str(source).replace(f"/{environment.visit}", "") diff --git a/src/murfey/util/spa_metadata.py b/src/murfey/util/spa_metadata.py index bb4fd3d72..07476694e 100644 --- a/src/murfey/util/spa_metadata.py +++ b/src/murfey/util/spa_metadata.py @@ -123,6 +123,9 @@ def grid_square_data(xml_path: Path, grid_square: int) -> GridSquareInfo: f"Images-Disc*/GridSquare_{grid_square}/GridSquare_*.jpg" ) ) + logger.info( + f"{len(image_paths)} images found when searching {str(xml_path.parent.parent)}" + ) if image_paths: image_paths.sort(key=lambda x: x.stat().st_ctime) image_path = image_paths[-1]