add check for cloud path in pn_dir

MIT-LCP · Feb 3, 2025 · 216222f · 216222f
1 parent e3a83b6
commit 216222f
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 5 deletions.
diff --git a/wfdb/io/_coreio.py b/wfdb/io/_coreio.py
@@ -4,6 +4,7 @@
 
 from wfdb.io import _url
 from wfdb.io.download import config
+from wfdb.io.record import CLOUD_PROTOCOLS
 
 
 def _open_file(
@@ -59,6 +60,12 @@ def _open_file(
             newline=newline,
         )
     else:
+        # check to make sure a cloud path isn't being passed under pn_dir
+        if any(pn_dir.startswith(proto) for proto in CLOUD_PROTOCOLS):
+            raise ValueError(
+                "Cloud paths should be passed under record_name, not under pn_dir"
+            )
+
         url = posixpath.join(config.db_index_url, pn_dir, file_name)
         return _url.openurl(
             url,

diff --git a/wfdb/io/_signal.py b/wfdb/io/_signal.py
@@ -7,6 +7,7 @@
 import numpy as np
 
 from wfdb.io import download, _coreio, util
+from wfdb.io.record import CLOUD_PROTOCOLS
 
 
 MAX_I32 = 2147483647
@@ -1698,6 +1699,12 @@ def _rd_dat_file(file_name, dir_name, pn_dir, fmt, start_byte, n_samp):
 
     # Stream dat file from PhysioNet
     else:
+        # check to make sure a cloud path isn't being passed under pn_dir
+        if any(pn_dir.startswith(proto) for proto in CLOUD_PROTOCOLS):
+            raise ValueError(
+                "Cloud paths should be passed under record_name, not under pn_dir"
+            )
+
         dtype_in = np.dtype(DATA_LOAD_TYPES[fmt])
         sig_data = download._stream_dat(
             file_name, pn_dir, byte_count, start_byte, dtype_in
@@ -2613,6 +2620,12 @@ def _infer_sig_len(
 
     # If the PhysioNet database path is provided, construct the download path using the database version
     elif pn_dir is not None:
+        # check to make sure a cloud path isn't being passed under pn_dir
+        if any(pn_dir.startswith(proto) for proto in CLOUD_PROTOCOLS):
+            raise ValueError(
+                "Cloud paths should be passed under record_name, not under pn_dir"
+            )
+
         file_size = download._remote_file_size(
             file_name=file_name, pn_dir=pn_dir
         )

diff --git a/wfdb/io/record.py b/wfdb/io/record.py
@@ -1837,6 +1837,12 @@ def rdheader(record_name, pn_dir=None, rd_segments=False):
 
     # If the PhysioNet database path is provided, construct the download path using the database version
     elif pn_dir is not None:
+        # check to make sure a cloud path isn't being passed under pn_dir
+        if any(pn_dir.startswith(proto) for proto in CLOUD_PROTOCOLS):
+            raise ValueError(
+                "Cloud paths should be passed under record_name, not under pn_dir"
+            )
+
         if "." not in pn_dir:
             dir_list = pn_dir.split("/")
             pn_dir = posixpath.join(
@@ -2032,11 +2038,17 @@ def rdrecord(
         dir_name = os.path.abspath(dir_name)
 
     # Read the header fields
-    if (pn_dir is not None) and ("." not in pn_dir):
-        dir_list = pn_dir.split("/")
-        pn_dir = posixpath.join(
-            dir_list[0], download.get_version(dir_list[0]), *dir_list[1:]
-        )
+    if pn_dir is not None:
+        # check to make sure a cloud path isn't being passed under pn_dir
+        if any(pn_dir.startswith(proto) for proto in CLOUD_PROTOCOLS):
+            raise ValueError(
+                "Cloud paths should be passed under record_name, not under pn_dir"
+            )
+        if "." not in pn_dir:
+            dir_list = pn_dir.split("/")
+            pn_dir = posixpath.join(
+                dir_list[0], download.get_version(dir_list[0]), *dir_list[1:]
+            )
 
     record = rdheader(record_name, pn_dir=pn_dir, rd_segments=False)