Restructure parse_dandi_url() return type

dandi/cli/cmd_download.py

@@ -101,8 +101,8 @@ def download(
     if dandi_instance is not None:
         if url:
             for u in url:
-                _, server_url, _, _ = parse_dandi_url(u)
-                if known_instances_rev.get(server_url.rstrip("/")) != dandi_instance:
+                parsed_url = parse_dandi_url(u)
+                if known_instances_rev.get(parsed_url.api_url) != dandi_instance:
                     raise click.UsageError(
                         f"{u} does not point to {dandi_instance!r} instance"
                     )

dandi/cli/cmd_ls.py

@@ -5,7 +5,7 @@
 import click
 
 from .base import lgr, map_to_click_exceptions
-from ..dandiarchive import _dandi_url_parser
+from ..dandiarchive import DandisetURL, _dandi_url_parser, parse_dandi_url
 from ..utils import is_url
 
 # TODO: all the recursion options etc
@@ -110,11 +110,11 @@ def ls(paths, schema, metadata, fields=None, format="auto", recursive=False, job
     def assets_gen():
         for path in paths:
             if is_url(path):
-                from ..dandiarchive import navigate_url
-
-                with navigate_url(path) as (client, dandiset, assets):
-                    if dandiset:
-                        dandiset_id = dandiset.get("dandiset", {}).get("identifier")
+                parsed_url = parse_dandi_url(path)
+                with parsed_url.navigate(
+                    include_metadata=metadata in ("all", "assets")
+                ) as (client, dandiset, assets):
+                    if isinstance(parsed_url, DandisetURL):
                         rec = {
                             "path": dandiset.pop("dandiset", {}).get(
                                 "identifier", "ERR#%s" % id(dandiset)
@@ -124,20 +124,8 @@ def assets_gen():
                         # rec.update(dandiset.get('metadata', {}))
                         rec.update(dandiset)
                         yield rec
-                    else:
-                        dandiset_id = None
-                    if recursive and assets:
-                        if metadata in ("all", "assets"):
-                            for a in assets:
-                                if "metadata" not in a:
-                                    a["metadata"] = client.get_asset(
-                                        dandiset_id,
-                                        dandiset["version"],
-                                        a["asset_id"],
-                                    )
-                                yield a
-                        else:
-                            yield from assets
+                    if not isinstance(parsed_url, DandisetURL) or recursive:
+                        yield from assets
             else:
                 # For now we support only individual files
                 yield path

dandi/cli/tests/test_ls.py

@@ -33,3 +33,40 @@ def load(s):
     assert metadata.pop("nwb_version").startswith("2.")
     for f in ["session_id", "experiment_description"]:
         assert metadata[f] == simple1_nwb_metadata[f]
+
+
+def test_ls_dandiset_url():
+    r = CliRunner().invoke(
+        ls, ["-f", "yaml", "https://api.dandiarchive.org/api/dandisets/000027"]
+    )
+    assert r.exit_code == 0, r.output
+    data = yaml_load(r.stdout, "safe")
+    assert len(data) == 1
+    assert data[0]["path"] == "000027"
+
+
+def test_ls_dandiset_url_recursive():
+    r = CliRunner().invoke(
+        ls, ["-f", "yaml", "-r", "https://api.dandiarchive.org/api/dandisets/000027"]
+    )
+    assert r.exit_code == 0, r.output
+    data = yaml_load(r.stdout, "safe")
+    assert len(data) == 2
+    assert data[0]["path"] == "000027"
+    assert data[1]["path"] == "sub-RAT123/sub-RAT123.nwb"
+
+
+def test_ls_path_url():
+    r = CliRunner().invoke(
+        ls,
+        [
+            "-f",
+            "yaml",
+            "https://api.dandiarchive.org/api/dandisets/000027/versions/draft"
+            "/assets/?path=sub-RAT123/",
+        ],
+    )
+    assert r.exit_code == 0, r.output
+    data = yaml_load(r.stdout, "safe")
+    assert len(data) == 1
+    assert data[0]["path"] == "sub-RAT123/sub-RAT123.nwb"