Fixed path logic in '_xml_file' function and '_grid_square_metadata_file'; added catch to _analyse for ValueError

Author: tieneupin

src/murfey/client/analyser.py

@@ -302,6 +302,10 @@ def _analyse(self):
                                         f"Metadata gathering failed with a key error for key: {e.args[0]}"
                                     )
                                     raise e
+                                except ValueError as e:
+                                    logger.error(
+                                        f"Metadata gathering failed with a value error: {e}"
+                                    )
                             if not dc_metadata or not self._force_mdoc_metadata:
                                 self._unseen_xml.append(transferred_file)
                             else:
@@ -406,8 +410,8 @@ def _xml_file(self, data_file: Path) -> Path:
         data_directories = self._murfey_config.get("data_directories", [])
         for dd in data_directories:
             if str(data_file).startswith(dd):
-                base_dir = Path(dd)
-                mid_dir = data_file.relative_to(dd).parent
+                base_dir = Path(dd).absolute()
+                mid_dir = data_file.relative_to(base_dir).parent
                 break
         else:
             return data_file.with_suffix(".xml")

src/murfey/client/contexts/spa.py

@@ -61,8 +61,8 @@ def _grid_square_metadata_file(
 ) -> Path:
     for dd in data_directories:
         if str(f).startswith(str(dd)):
-            base_dir = dd
-            mid_dir = f.relative_to(dd).parent
+            base_dir = dd.absolute()
+            mid_dir = f.relative_to(base_dir).parent
             break
     else:
         raise ValueError(f"Could not determine grid square metadata path for {f}")