From 1e4982f3521287acadcf4517852fdd8a05b4054a Mon Sep 17 00:00:00 2001 From: Simon Kern <14980558+skjerns@users.noreply.github.com> Date: Tue, 4 Feb 2025 15:09:08 +0100 Subject: [PATCH 1/3] change version detection logic of BV files --- wonambi/ioeeg/brainvision.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/wonambi/ioeeg/brainvision.py b/wonambi/ioeeg/brainvision.py index a10ae65..c97b0b4 100644 --- a/wonambi/ioeeg/brainvision.py +++ b/wonambi/ioeeg/brainvision.py @@ -151,14 +151,18 @@ def _parse_ini(brainvision_file): with brainvision_file.open('rb') as f: line = f.readline().decode('ascii').strip() - if (line == 'Brain Vision Data Exchange Header File Version 1.0' or - line == 'Brain Vision Data Exchange Marker File, Version 1.0'): + if (line in ['Brain Vision Data Exchange Header File Version 1.0', + 'Brain Vision Data Exchange Marker File, Version 1.0', + 'BrainVision Data Exchange Header File Version 1.0', + 'BrainVision Data Exchange Marker File, Version 1.0'): ini['version'] = 1.0 encoding = 'latin1' - elif (line == 'Brain Vision Data Exchange Header File Version 2.0' or - line == 'Brain Vision Data Exchange Marker File, Version 2.0'): + elif (line in ['Brain Vision Data Exchange Header File Version 2.0', + 'Brain Vision Data Exchange Marker File, Version 2.0', + 'BrainVision Data Exchange Header File Version 2.0', + 'BrainVision Data Exchange Marker File, Version 2.0',): ini['version'] = 2.0 encoding = 'utf-8' From 8d7fbcbaa3fa80aa6815691c2e563938320574fc Mon Sep 17 00:00:00 2001 From: Simon Kern <14980558+skjerns@users.noreply.github.com> Date: Tue, 4 Feb 2025 15:21:07 +0100 Subject: [PATCH 2/3] Update brainvision.py --- wonambi/ioeeg/brainvision.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/wonambi/ioeeg/brainvision.py b/wonambi/ioeeg/brainvision.py index c97b0b4..d216bc7 100644 --- a/wonambi/ioeeg/brainvision.py +++ b/wonambi/ioeeg/brainvision.py @@ -152,17 +152,25 @@ def _parse_ini(brainvision_file): line = f.readline().decode('ascii').strip() if (line in ['Brain Vision Data Exchange Header File Version 1.0', - 'Brain Vision Data Exchange Marker File, Version 1.0', + 'Brain Vision Data Exchange Marker File Version 1.0', + 'Brain Vision Data Exchange Header File, Version 1.0', + 'Brain Vision Data Exchange Marker File, Version 1.0' 'BrainVision Data Exchange Header File Version 1.0', - 'BrainVision Data Exchange Marker File, Version 1.0'): + 'BrainVision Data Exchange Marker File Version 1.0', + 'BrainVision Data Exchange Header File, Version 1.0', + 'BrainVision Data Exchange Marker File, Version 1.0']): ini['version'] = 1.0 encoding = 'latin1' elif (line in ['Brain Vision Data Exchange Header File Version 2.0', - 'Brain Vision Data Exchange Marker File, Version 2.0', + 'Brain Vision Data Exchange Marker File Version 2.0', + 'Brain Vision Data Exchange Header File, Version 2.0', + 'Brain Vision Data Exchange Marker File, Version 2.0' 'BrainVision Data Exchange Header File Version 2.0', - 'BrainVision Data Exchange Marker File, Version 2.0',): + 'BrainVision Data Exchange Marker File Version 2.0', + 'BrainVision Data Exchange Header File, Version 2.0', + 'BrainVision Data Exchange Marker File, Version 2.0']): ini['version'] = 2.0 encoding = 'utf-8' From cd55f09cc6ffe70383ce0d3ff5992c10a6f23956 Mon Sep 17 00:00:00 2001 From: Simon Kern <14980558+skjerns@users.noreply.github.com> Date: Tue, 4 Feb 2025 15:25:11 +0100 Subject: [PATCH 3/3] add missing comma --- wonambi/ioeeg/brainvision.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wonambi/ioeeg/brainvision.py b/wonambi/ioeeg/brainvision.py index d216bc7..5e8684a 100644 --- a/wonambi/ioeeg/brainvision.py +++ b/wonambi/ioeeg/brainvision.py @@ -154,7 +154,7 @@ def _parse_ini(brainvision_file): if (line in ['Brain Vision Data Exchange Header File Version 1.0', 'Brain Vision Data Exchange Marker File Version 1.0', 'Brain Vision Data Exchange Header File, Version 1.0', - 'Brain Vision Data Exchange Marker File, Version 1.0' + 'Brain Vision Data Exchange Marker File, Version 1.0', 'BrainVision Data Exchange Header File Version 1.0', 'BrainVision Data Exchange Marker File Version 1.0', 'BrainVision Data Exchange Header File, Version 1.0', @@ -166,7 +166,7 @@ def _parse_ini(brainvision_file): elif (line in ['Brain Vision Data Exchange Header File Version 2.0', 'Brain Vision Data Exchange Marker File Version 2.0', 'Brain Vision Data Exchange Header File, Version 2.0', - 'Brain Vision Data Exchange Marker File, Version 2.0' + 'Brain Vision Data Exchange Marker File, Version 2.0', 'BrainVision Data Exchange Header File Version 2.0', 'BrainVision Data Exchange Marker File Version 2.0', 'BrainVision Data Exchange Header File, Version 2.0',