updating the writing logic

Author: bruAristimunha

mne_bids/_fileio.py

@@ -8,11 +8,25 @@
 import contextlib
 import os
 from contextlib import contextmanager
+from contextvars import ContextVar
 from pathlib import Path
 
 from mne.utils import _soft_import, warn
 
 
+def _normalize_lock_path(path):
+    path = Path(path)
+    try:
+        return path.resolve()
+    except OSError:
+        return path.absolute()
+
+
+_LOCKED_PATHS: ContextVar[tuple[Path, ...]] = ContextVar(
+    "_LOCKED_PATHS", default=tuple()
+)
+
+
 def _get_lock_context(path):
     """Return a context manager that locks ``path`` if possible."""
     filelock = _soft_import(
@@ -44,9 +58,20 @@ def _get_lock_context(path):
     return lock_context, lock_path, have_lock
 
 
+def _path_is_locked(path) -> bool:
+    """Return True if ``path`` is currently locked via :func:`_file_lock`."""
+    normalized = _normalize_lock_path(path)
+    return normalized in _LOCKED_PATHS.get()
+
+
 @contextmanager
 def _open_lock(path, *args, **kwargs):
     """Wrap :func:`mne.utils.config._open_lock` and remove stale ``.lock`` files."""
+    if _path_is_locked(path):
+        with open(path, *args, **kwargs) as fid:
+            yield fid
+        return
+
     lock_context, lock_path, have_lock = _get_lock_context(path)
     try:
         with lock_context, open(path, *args, **kwargs) as fid:
@@ -63,10 +88,17 @@ def _open_lock(path, *args, **kwargs):
 def _file_lock(path):
     """Acquire a lock on ``path`` without opening the file."""
     lock_context, lock_path, have_lock = _get_lock_context(path)
+    normalized = _normalize_lock_path(path)
+    token = None
+    if not _path_is_locked(normalized):
+        current = _LOCKED_PATHS.get()
+        token = _LOCKED_PATHS.set(current + (normalized,))
     try:
         with lock_context:
             yield
     finally:
+        if token is not None:
+            _LOCKED_PATHS.reset(token)
         if have_lock and lock_path.exists():
             try:
                 lock_path.unlink()

mne_bids/tsv_handler.py

@@ -8,7 +8,7 @@
 
 import numpy as np
 
-from mne_bids._fileio import _open_lock
+from mne_bids._fileio import _open_lock, _path_is_locked
 
 
 def _combine_rows(data1, data2, drop_column=None):
@@ -188,9 +188,14 @@ def _to_tsv(data, fname):
     n_rows = len(data[list(data.keys())[0]])
     output = _tsv_to_str(data, n_rows)
 
-    with _open_lock(fname, "w", encoding="utf-8-sig") as f:
-        f.write(output)
-        f.write("\n")
+    if _path_is_locked(fname):
+        with open(fname, "w", encoding="utf-8-sig") as f:
+            f.write(output)
+            f.write("\n")
+    else:
+        with _open_lock(fname, "w", encoding="utf-8-sig") as f:
+            f.write(output)
+            f.write("\n")
 
 
 def _tsv_to_str(data, rows=5):

mne_bids/utils.py

@@ -255,6 +255,21 @@ def _write_tsv(fname, dictionary, overwrite=False, verbose=None):
     logger.info(f"Writing '{fname}'...")
 
 
+def _write_tsv_locked(fname: Path | str, data) -> None:
+    """Write TSV data while the caller holds the file lock."""
+    fname = Path(fname)
+    columns = list(data.keys())
+    n_rows = len(data[columns[0]]) if columns else 0
+    lines = ["\t".join(columns)]
+    for row_idx in range(n_rows):
+        lines.append("\t".join(str(data[col][row_idx]) for col in columns))
+
+    fname.parent.mkdir(parents=True, exist_ok=True)
+    with open(fname, "w", encoding="utf-8-sig") as fid:
+        fid.write("\n".join(lines))
+        fid.write("\n")
+
+
 def _write_text(fname, text, overwrite=False):
     """Write text to a file."""
     if fname.exists() and not overwrite:

mne_bids/write.py

@@ -97,23 +97,6 @@
 _BTI_SUFFIX_CACHE: dict[str | None, bool] = {}
 
 
-def _write_tsv_locked(fname: Path | str, data: OrderedDict) -> None:
-    """Write TSV data while the caller holds the file lock."""
-    fname = Path(fname)
-    columns = list(data.keys())
-    n_rows = len(data[columns[0]]) if columns else 0
-    lines = ["\t".join(columns)]
-    for row_idx in range(n_rows):
-        lines.append("\t".join(str(data[col][row_idx]) for col in columns))
-
-    fname.parent.mkdir(parents=True, exist_ok=True)
-    with open(fname, "w", encoding="utf-8-sig") as fid:
-        fid.write("\n".join(lines))
-        fid.write("\n")
-
-    logger.info(f"Writing '{fname}'...")
-
-
 def _is_numeric(n):
     return isinstance(n, np.integer | np.floating | int | float)
 
@@ -643,7 +626,7 @@ def _participants_tsv(raw, subject_id, fname, overwrite=False):
             # otherwise add the new data as new row
             data = _combine_rows(orig_data, data, "participant_id")
 
-        _write_tsv_locked(fname, data)
+        _write_tsv(fname, data, overwrite=True)
 
 
 def _participants_json(fname, overwrite=False):
@@ -793,7 +776,7 @@ def _scans_tsv(raw, raw_fname, fname, keep_source, overwrite=False):
             # otherwise add the new data
             data = _combine_rows(orig_data, data, "filename")
 
-        _write_tsv_locked(fname, data)
+        _write_tsv(fname, data, overwrite=True)
 
 
 def _load_image(image, name="image"):