Fixed 'pelican://' checking in _check_fspath

src/pelicanfs/core.py

@@ -186,6 +186,8 @@ def __init__ (
         # The internal filesystem
         self.httpFileSystem = fshttp.HTTPFileSystem(asynchronous=asynchronous, loop=loop, **kwargs)
 
+        if federationDiscoveryUrl and not federationDiscoveryUrl.endswith('/'):
+            federationDiscoveryUrl = federationDiscoveryUrl + '/'
         self.discoveryUrl = federationDiscoveryUrl
         self.directorUrl = ""
 
@@ -572,7 +574,10 @@ def _check_fspath(self, path: str) -> str:
         filesystem object and return the path.
         """
         if not path.startswith("/"):
-            pelican_url = urllib.parse.urlparse("pelican://" + path)
+            if path.startswith("pelican://"):
+                pelican_url = urllib.parse.urlparse(path)
+            else:
+                pelican_url = urllib.parse.urlparse("pelican://" + path)
             discovery_url = pelican_url._replace(path="/", fragment="", query="", params="")
             discovery_str = discovery_url.geturl()
             if not self.discoveryUrl:

test/test_utils.py

@@ -39,3 +39,31 @@ def test_remove_hostname():
     # Test a a non-list | string | dict
     assert PelicanFileSystem._remove_host_from_paths(22) == 22
 
+
+def test_fspath():
+
+    pelfs = pelicanfs.core.PelicanFileSystem(
+        "pelican://test-discovery-url.org",
+        skip_instance_cache=True,
+    )
+    path = "/aboslute/path"
+    assert pelfs._check_fspath(path) == path
+
+    assert pelfs._check_fspath("pelican://test-discovery-url.org/p2/") == '/p2/'
+
+    assert pelfs._check_fspath("test-discovery-url.org/p3") == '/p3'    
+
+    with pytest.raises(pelicanfs.core.InvalidMetadata):
+        pelfs._check_fspath("pelican://diff-disc/path")
+
+    with pytest.raises(pelicanfs.core.InvalidMetadata):
+        pelfs._check_fspath("not-the-discovery-url.org/p3")
+
+    pelfs_disc = pelicanfs.core.PelicanFileSystem(
+        skip_instance_cache=True
+    )
+
+    assert pelfs_disc.discoveryUrl == ""
+
+    pelfs_disc._check_fspath("pelican://new-discovery-url.org/p/")
+    assert pelfs_disc.discoveryUrl == "pelican://new-discovery-url.org/"