Recognize XT file types in parser selection

Author: michaelosthege

bletl/__init__.py

@@ -36,4 +36,4 @@
     NoMeasurementData,
 )
 
-__version__ = "1.4.3"
+__version__ = "1.5.0"

bletl/core.py

@@ -1,4 +1,6 @@
 """Specifies the base types for parsing and representing BioLector CSV files."""
+import json
+import zipfile
 from collections.abc import Iterable
 from pathlib import Path
 from typing import Optional, Sequence, Union
@@ -38,6 +40,26 @@ def get_parser(filepath: Union[str, Path]) -> BLDParser:
     NotImlementedError
         When the file contents do not match with a known BioLector refult file format.
     """
+
+    model = None
+    version = None
+
+    # Check for XT file types first because they are zipped
+    if Path(filepath).suffix.lower() == ".zip":
+        with zipfile.ZipFile(filepath, "r") as zfile:
+            for fp in zfile.namelist():
+                if not fp.endswith(".meta"):
+                    continue
+                with zfile.open(fp) as jfile:
+                    metadict = json.load(jfile)
+                version = metadict["CsvFileVersion"]
+                model = BioLectorModel.XT
+                if not (model, version) in parsers:
+                    raise NotImplementedError(f"Unsupported {model} file version: {version}")
+                return parsers[(model, version)]()
+        raise IncompatibleFileError("Unable to detect the BioLector model from the file contents.")
+
+    # Now check I/II/Pro file which are plain text
     try:
         # Note:
         # BioLector II files are encoded as UTF8-BOM
@@ -48,9 +70,6 @@ def get_parser(filepath: Union[str, Path]) -> BLDParser:
         with open(filepath, "r", encoding="latin-1") as f:
             lines = f.readlines()
 
-    model = None
-    version = None
-
     if "=====" in lines[0]:
         if "parameters" in lines[0]:
             raise IncompatibleFileError(

tests/data/BLXT/4_BG_test.zip

@@ -107,6 +107,14 @@ def test_selects_parsers_ii(self, fp):
     def test_incompatible_file_detecion(self):
         with pytest.raises(bletl.IncompatibleFileError):
             bletl.get_parser(incompatible_file)
+        with pytest.raises(bletl.IncompatibleFileError):
+            bletl.get_parser(dir_testfiles / "incompatible_files" / "other.zip")
+
+    def test_xt_file_recognition(self):
+        fp = dir_testfiles / "BLXT" / "4_BG_test.zip"
+        with pytest.raises(NotImplementedError, match=r"XT.*?version: 1\.0\.0"):
+            bletl.get_parser(fp)
+        pass
 
 
 class TestUtils: