diff --git a/dvc/commands/ls/__init__.py b/dvc/commands/ls/__init__.py index c044e3571a0..50645b7dffc 100644 --- a/dvc/commands/ls/__init__.py +++ b/dvc/commands/ls/__init__.py @@ -1,6 +1,8 @@ import argparse import logging +from tqdm import tqdm + from dvc.cli import completion from dvc.cli.command import CmdBaseNoRepo from dvc.cli.utils import DictAction, append_doc_link @@ -11,7 +13,7 @@ logger = logging.getLogger(__name__) -def _prettify(entries, with_color=False): +def format_entries(entries, with_color=False, with_size=False): if with_color: ls_colors = LsColors() fmt = ls_colors.format @@ -20,7 +22,17 @@ def _prettify(entries, with_color=False): def fmt(entry): return entry["path"] - return [fmt(entry) for entry in entries] + def row(entry): + if with_size: + size = entry.get("size") + if size is None: + size = "" + else: + size = tqdm.format_sizeof(size, divisor=1024) + return size, fmt(entry) + return (fmt(entry),) + + return [row(entry) for entry in entries] class CmdList(CmdBaseNoRepo): @@ -41,8 +53,10 @@ def run(self): if self.args.json: ui.write_json(entries) elif entries: - entries = _prettify(entries, with_color=True) - ui.write("\n".join(entries)) + entries = format_entries( + entries, with_color=True, with_size=self.args.size + ) + ui.table(entries) return 0 except DvcException: logger.exception("failed to list '%s'", self.args.url) @@ -106,6 +120,11 @@ def add_parser(subparsers, parent_parser): "specified by '--remote') in the target repository." ), ) + list_parser.add_argument( + "--size", + action="store_true", + help="Show sizes.", + ) list_parser.add_argument( "path", nargs="?", diff --git a/dvc/commands/ls_url.py b/dvc/commands/ls_url.py index 6b5af9a57fb..09291c15d03 100644 --- a/dvc/commands/ls_url.py +++ b/dvc/commands/ls_url.py @@ -5,7 +5,7 @@ from dvc.cli.utils import append_doc_link from dvc.ui import ui -from .ls import _prettify +from .ls import format_entries logger = logging.getLogger(__name__) @@ -16,8 +16,8 @@ def run(self): entries = Repo.ls_url(self.args.url, recursive=self.args.recursive) if entries: - entries = _prettify(entries, with_color=True) - ui.write("\n".join(entries)) + entries = format_entries(entries, with_color=True, with_size=self.args.size) + ui.table(entries) return 0 @@ -40,4 +40,9 @@ def add_parser(subparsers, parent_parser): action="store_true", help="Recursively list files.", ) + lsurl_parser.add_argument( + "--size", + action="store_true", + help="Show sizes.", + ) lsurl_parser.set_defaults(func=CmdListUrl) diff --git a/dvc/repo/ls.py b/dvc/repo/ls.py index 5e6005ea388..e4d00a5546c 100644 --- a/dvc/repo/ls.py +++ b/dvc/repo/ls.py @@ -109,6 +109,7 @@ def _ls( "isout": dvc_info.get("isout", False), "isdir": info["type"] == "directory", "isexec": info.get("isexec", False), + "size": info.get("size"), } return ret diff --git a/dvc/repo/ls_url.py b/dvc/repo/ls_url.py index 7caf53a67b3..496daa128b5 100644 --- a/dvc/repo/ls_url.py +++ b/dvc/repo/ls_url.py @@ -20,6 +20,7 @@ def ls_url(url, *, config=None, recursive=False): ls_info = { "path": fs.path.relpath(info["name"], fs_path), "isdir": info["type"] == "directory", + "size": info.get("size"), } ret.append(ls_info) diff --git a/tests/func/test_ls.py b/tests/func/test_ls.py index c74e435842a..bdba92d42bb 100644 --- a/tests/func/test_ls.py +++ b/tests/func/test_ls.py @@ -460,7 +460,7 @@ def test_ls_shows_pipeline_tracked_outs(tmp_dir, dvc, scm, run_copy): match_files(files, ((("bar",), True),)) -def test_ls_granular(erepo_dir): +def test_ls_granular(erepo_dir, M): with erepo_dir.chdir(): erepo_dir.dvc_gen( { @@ -475,15 +475,21 @@ def test_ls_granular(erepo_dir): entries = Repo.ls(os.fspath(erepo_dir), os.path.join("dir", "subdir")) assert entries == [ - {"isout": True, "isdir": False, "isexec": False, "path": "bar"}, - {"isout": True, "isdir": False, "isexec": False, "path": "foo"}, + {"isout": True, "isdir": False, "isexec": False, "path": "bar", "size": 3}, + {"isout": True, "isdir": False, "isexec": False, "path": "foo", "size": 3}, ] entries = Repo.ls(os.fspath(erepo_dir), "dir") assert entries == [ - {"isout": True, "isdir": False, "isexec": False, "path": "1"}, - {"isout": True, "isdir": False, "isexec": False, "path": "2"}, - {"isout": True, "isdir": True, "isexec": False, "path": "subdir"}, + {"isout": True, "isdir": False, "isexec": False, "path": "1", "size": 1}, + {"isout": True, "isdir": False, "isexec": False, "path": "2", "size": 1}, + { + "isout": True, + "isdir": True, + "isexec": False, + "path": "subdir", + "size": M.instance_of(int), + }, ] @@ -508,14 +514,14 @@ def _ls(path): return Repo.ls(os.fspath(erepo_dir), path) assert _ls(os.path.join("dir", "1")) == [ - {"isout": isout, "isdir": False, "isexec": False, "path": "1"} + {"isout": isout, "isdir": False, "isexec": False, "path": "1", "size": 1} ] assert _ls(os.path.join("dir", "subdir", "foo")) == [ - {"isout": isout, "isdir": False, "isexec": False, "path": "foo"} + {"isout": isout, "isdir": False, "isexec": False, "path": "foo", "size": 3} ] assert _ls(os.path.join("dir", "subdir")) == [ - {"isdir": False, "isexec": 0, "isout": isout, "path": "bar"}, - {"isdir": False, "isexec": 0, "isout": isout, "path": "foo"}, + {"isdir": False, "isexec": 0, "isout": isout, "path": "bar", "size": 3}, + {"isdir": False, "isexec": 0, "isout": isout, "path": "foo", "size": 3}, ] @@ -559,7 +565,7 @@ def _list_files(repo, path=None): assert _list_files(subrepo, "dvc_dir") == {"lorem"} -def test_broken_symlink(tmp_dir, dvc): +def test_broken_symlink(tmp_dir, dvc, M): from dvc.fs import system tmp_dir.gen("file", "content") @@ -575,17 +581,19 @@ def test_broken_symlink(tmp_dir, dvc): "isdir": False, "isexec": False, "path": ".dvcignore", + "size": M.instance_of(int), }, { "isout": False, "isdir": False, "isexec": False, "path": "link", + "size": 0, }, ] -def test_ls_broken_dir(tmp_dir, dvc): +def test_ls_broken_dir(tmp_dir, dvc, M): from dvc_data.index import DataIndexDirError tmp_dir.dvc_gen( @@ -606,13 +614,43 @@ def test_ls_broken_dir(tmp_dir, dvc): entries = Repo.ls(os.fspath(tmp_dir)) assert entries == [ - {"isdir": False, "isexec": False, "isout": False, "path": ".dvcignore"}, - {"isdir": True, "isexec": False, "isout": True, "path": "broken"}, - {"isdir": False, "isexec": False, "isout": False, "path": "broken.dvc"}, - {"isdir": True, "isexec": False, "isout": True, "path": "dir"}, - {"isdir": False, "isexec": False, "isout": False, "path": "dir.dvc"}, - {"isdir": False, "isexec": False, "isout": True, "path": "foo"}, - {"isdir": False, "isexec": False, "isout": False, "path": "foo.dvc"}, + { + "isdir": False, + "isexec": False, + "isout": False, + "path": ".dvcignore", + "size": M.instance_of(int), + }, + {"isdir": True, "isexec": False, "isout": True, "path": "broken", "size": 3}, + { + "isdir": False, + "isexec": False, + "isout": False, + "path": "broken.dvc", + "size": M.instance_of(int), + }, + { + "isdir": True, + "isexec": False, + "isout": True, + "path": "dir", + "size": M.instance_of(int), + }, + { + "isdir": False, + "isexec": False, + "isout": False, + "path": "dir.dvc", + "size": M.instance_of(int), + }, + {"isdir": False, "isexec": False, "isout": True, "path": "foo", "size": 3}, + { + "isdir": False, + "isexec": False, + "isout": False, + "path": "foo.dvc", + "size": M.instance_of(int), + }, ] with pytest.raises(DataIndexDirError):