Merge pull request #152 from ghammad/hotfix/bba

Fix #151
ghammad · Jun 19, 2024 · 69c92b7 · 69c92b7
2 parents d045c06 + 3a66a1b
commit 69c92b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pyActigraphy/io/bba/bba.py b/pyActigraphy/io/bba/bba.py
@@ -270,7 +270,7 @@ def __read_baa_metadata_json(input_fname, metadata_fname):
             meta_data = json.load(file)
 
         # check filename consistency:
-        # - META-DATA: file-name = 'basename'.cwa[.gz]
+        # - META-DATA: file-name = 'basename'.(cwa|CWA|bin)[.gz]
         # - INPUT DATA: input_fname = 'basename'-timeSeries.csv[.gz]
 
         match_basename = re.match(
@@ -285,8 +285,8 @@ def __read_baa_metadata_json(input_fname, metadata_fname):
                 + ' from input filename: {}'.format(input_fname)
             )
 
-        if not re.match(
-            pattern=r'{}.(cwa|CWA)(\.gz)?'.format(input_basename),
+        if not re.search(
+            pattern=r'{}.(cwa|CWA|bin)(\.gz)?'.format(input_basename),
             string=os.path.basename(meta_data['file-name'])
         ):
             raise ValueError(

diff --git a/pyActigraphy/tests/data/sample-summary-wrong-name.json b/pyActigraphy/tests/data/sample-summary-wrong-name.json
@@ -1,5 +1,5 @@
 {
-    "file-name": "nosample.cwa.gz",
+    "file-name": "wrongname.cwa.gz",
     "file-size": 72765789,
     "file-deviceID": 13110,
     "calibration-xOffset(g)": -0.05122435978970148,