ENH: Add encoding parameter to Nihon Kohden reader

Author: myd7349

mne/io/nihon/nihon.py

@@ -23,7 +23,7 @@ def _ensure_path(fname):
 
 
 @fill_doc
-def read_raw_nihon(fname, preload=False, verbose=None) -> "RawNihon":
+def read_raw_nihon(fname, preload=False, encoding='utf-8', verbose=None) -> "RawNihon":
     """Reader for an Nihon Kohden EEG file.
 
     Parameters
@@ -44,7 +44,7 @@ def read_raw_nihon(fname, preload=False, verbose=None) -> "RawNihon":
     --------
     mne.io.Raw : Documentation of attributes and methods of RawNihon.
     """
-    return RawNihon(fname, preload, verbose)
+    return RawNihon(fname, preload, encoding, verbose)
 
 
 _valid_headers = [
@@ -315,7 +315,7 @@ def _parse_sub_event_log(sub_event_log):
     return t_sub_desc, t_sub_onset
 
 
-def _read_nihon_annotations(fname):
+def _read_nihon_annotations(fname, encoding):
     fname = _ensure_path(fname)
     log_fname = fname.with_suffix(".LOG")
     if not log_fname.exists():
@@ -346,15 +346,10 @@ def _read_nihon_annotations(fname):
                     t_onset += t_sub_onset
 
                 t_desc = t_desc.rstrip(b"\x00")
-                for enc in _encodings:
-                    try:
-                        t_desc = t_desc.decode(enc)
-                    except UnicodeDecodeError:
-                        pass
-                    else:
-                        break
-                else:
-                    warn(f"Could not decode log as one of {_encodings}")
+                try:
+                    t_desc = t_desc.decode(encoding)
+                except UnicodeDecodeError:
+                    warn(f"Could not decode log as {encoding}")
                     continue
 
                 all_onsets.append(t_onset)
@@ -422,7 +417,7 @@ class RawNihon(BaseRaw):
     """
 
     @verbose
-    def __init__(self, fname, preload=False, verbose=None):
+    def __init__(self, fname, preload=False, encoding='utf-8', verbose=None):
         fname = _check_fname(fname, "read", True, "fname")
         data_name = fname.name
         logger.info(f"Loading {data_name}")
@@ -468,7 +463,7 @@ def __init__(self, fname, preload=False, verbose=None):
         )
 
         # Get annotations from LOG file
-        annots = _read_nihon_annotations(fname)
+        annots = _read_nihon_annotations(fname, encoding)
 
         # Annotate acquisition skips
         controlblock = header["controlblocks"][0]