Fix export ffilter and extensions (#184)

* Fix export ffilter and extensions

* Fix flake8 warn

* Style

* Remove unused re module

* Update changelog

* Move to "Fixed" section

Co-authored-by: Clemens Brunner <[email protected]>

Author: gdolle

Diff for: CHANGELOG.md

@@ -1,4 +1,7 @@
 ## [Unreleased] - XXXX-XX-XX
+### Fixed
+- Fix export functionality ([#184](https://github.com/cbrnr/mnelab/pull/184) by [Guillaume Dollé](https://github.com/gdolle))
+
 ### Changed
 - PySide2 installed by default if wrapped Qt bindings (PyQt5, PySide2) are not found ([#187](https://github.com/cbrnr/mnelab/pull/187) by [Guillaume Dollé](https://github.com/gdolle))
 

Diff for: mnelab/io/readers.py

@@ -64,10 +64,12 @@ def read_raw(fname, *args, **kwargs):
     This function supports reading different file formats. It uses the readers
     dict to dispatch the appropriate read function for a supported file type.
     """
-    ext = "".join(Path(fname).suffixes)
-    if ext in readers:
-        return readers[ext](fname, *args, **kwargs)
-    else:
-        raise ValueError(f"Unknown file type {ext}.")
-        # here we could inspect the file signature to determine its type, which
-        # would allow us to read file independently of their extensions
+    maxsuffixes = max([ext.count(".") for ext in supported])
+    suffixes = Path(fname).suffixes
+    for i in range(-maxsuffixes, 0):
+        ext = "".join(suffixes[i:])
+        if ext in readers.keys():
+            return readers[ext](fname, *args, **kwargs)
+    raise ValueError(f"Unknown file type {suffixes}.")
+    # here we could inspect the file signature to determine its type, which
+    # would allow us to read file independently of their extensions

Diff for: mnelab/io/writers.py

@@ -13,7 +13,7 @@
 
 
 def write_fif(fname, raw):
-    raw.save(fname)
+    raw.save(fname, overwrite=True)
 
 
 def write_set(fname, raw):
@@ -47,7 +47,8 @@ def write_edf(fname, raw):
     """Export raw to EDF/BDF file (requires pyEDFlib)."""
     import pyedflib
 
-    ext = "".join(Path(fname).suffixes)
+    suffixes = Path(fname).suffixes
+    ext = "".join(suffixes[-1:])
     if ext == ".edf":
         filetype = pyedflib.FILETYPE_EDFPLUS
         dmin, dmax = -32768, 32767
@@ -124,8 +125,11 @@ def write_bv(fname, raw, events=None):
 
 
 def write_raw(fname, raw):
-    ext = "".join(Path(fname).suffixes)
-    if ext in writers:
-        writers[ext][0](fname, raw)
+    maxsuffixes = max([ext.count(".") for ext in writers.keys()])
+    suffixes = Path(fname).suffixes
+    for i in range(-maxsuffixes, 0):
+        ext = "".join(suffixes[i:])
+        if ext in writers.keys():
+            return writers[ext][0](fname, raw)
     else:
-        raise ValueError(f"Unknown file type {ext}.")
+        raise ValueError(f"Unknown file type '{suffixes}'.")

Diff for: mnelab/mainwindow.py

@@ -132,7 +132,7 @@ def __init__(self, model):
             self.actions[action] = self.export_menu.addAction(
                 f"{ext[1:].upper()} ({description[1]})...",
                 partial(self.export_file, model.export_data, "Export data",
-                        ext))
+                        "*" + ext))
         self.actions["export_bads"] = file_menu.addAction(
             "Export &bad channels...",
             lambda: self.export_file(model.export_bads, "Export bad channels",
@@ -444,10 +444,17 @@ def export_file(self, f, text, ffilter="*"):
         """Export to file."""
         fname = QFileDialog.getSaveFileName(self, text, filter=ffilter)[0]
         if fname:
-            try:
-                f(fname, ffilter)
-            except TypeError:
-                f(fname)
+            if ffilter != "*":
+                exts = [ext.replace("*", "") for ext in ffilter.split()]
+
+                maxsuffixes = max([ext.count(".") for ext in exts])
+                suffixes = Path(fname).suffixes
+                for i in range(-maxsuffixes, 0):
+                    ext = "".join(suffixes[i:])
+                    if ext in exts:
+                        return f(fname)
+                fname = fname + exts[0]
+                return f(fname)
 
     def import_file(self, f, text, ffilter="*"):
         """Import file."""

Diff for: mnelab/model.py

@@ -159,12 +159,8 @@ def annotations_from_events(self):
             self.history.append(hist)
             self.history.append("data = data.set_annotations(annots)")
 
-    def export_data(self, fname, ffilter):
+    def export_data(self, fname):
         """Export raw to file."""
-        ext = "".join(Path(fname).suffixes)
-        if ext != ffilter:
-            ext = ffilter
-            fname += ext
         write_raw(fname, self.current["data"])
 
     def export_bads(self, fname):