Fix the code

Author: BartoszBlizniak

cloudsmith_cli/cli/commands/list_.py

@@ -128,7 +128,7 @@ def entitlements_(*args, **kwargs):  # pylint: disable=missing-docstring
     help=("A boolean-like search term for querying package attributes."),
 )
 @click.pass_context
-def packages(ctx, opts, owner_repo, page, page_size, query):
+def packages(ctx, opts, owner_repo, page, page_size, query, show_all):
     """
     List packages for a repository.
 
@@ -176,9 +176,29 @@ def packages(ctx, opts, owner_repo, page, page_size, query):
     context_msg = "Failed to get list of packages!"
     with handle_api_exceptions(ctx, opts=opts, context_msg=context_msg):
         with maybe_spinner(opts):
-            packages_, page_info = list_packages(
-                owner=owner, repo=repo, page=page, page_size=page_size, query=query
-            )
+            if show_all:
+                packages_ = []
+                current_page = 1
+                while True:
+                    page_packages, page_info = list_packages(
+                        owner=owner,
+                        repo=repo,
+                        page=current_page,
+                        page_size=page_size,
+                        query=query,
+                    )
+                    packages_.extend(page_packages)
+                    if (
+                        len(page_packages) < page_size
+                        or current_page >= page_info.page_total
+                    ):
+                        break
+                    current_page += 1
+                page_info.count = len(packages_)
+            else:
+                packages_, page_info = list_packages(
+                    owner=owner, repo=repo, page=page, page_size=page_size, query=query
+                )
 
     click.secho("OK", fg="green", err=use_stderr)
 
@@ -209,10 +229,17 @@ def packages(ctx, opts, owner_repo, page, page_size, query):
     click.echo()
 
     num_results = len(packages_)
-    list_suffix = "package%s visible" % ("s" if num_results != 1 else "")
-    utils.pretty_print_list_info(
-        num_results=num_results, page_info=page_info, suffix=list_suffix
-    )
+    list_suffix = "package%s" % ("s" if num_results != 1 else "")
+    if show_all:
+        utils.pretty_print_list_info(
+            num_results=num_results, suffix=f"{list_suffix} retrieved", show_all=True
+        )
+    else:
+        utils.pretty_print_list_info(
+            num_results=num_results,
+            page_info=page_info,
+            suffix=f"{list_suffix} visible",
+        )
 
 
 @list_.command()
@@ -229,7 +256,7 @@ def packages(ctx, opts, owner_repo, page, page_size, query):
     required=False,
 )
 @click.pass_context
-def repos(ctx, opts, owner_repo, page, page_size):
+def repos(ctx, opts, owner_repo, page, page_size, show_all):
     """
     List repositories for a namespace (owner).
 
@@ -242,7 +269,7 @@ def repos(ctx, opts, owner_repo, page, page_size):
     If OWNER isn't specified it'll default to the currently authenticated user
     (if any). If you're unauthenticated, no results will be returned.
     """
-    ctx.forward(get_repos)
+    ctx.forward(get_repos, show_all=show_all)
 
 
 def _get_package_name(package):

cloudsmith_cli/cli/commands/repos.py

@@ -12,7 +12,7 @@
 from .main import main
 
 
-def print_repositories(opts, data, page_info=None, show_list_info=True):
+def print_repositories(opts, data, page_info=None, show_list_info=True, show_all=False):
     """Print repositories as a table or output in another format."""
     headers = [
         "Name",
@@ -46,13 +46,23 @@ def print_repositories(opts, data, page_info=None, show_list_info=True):
         click.echo()
         utils.pretty_print_table(headers, rows)
 
+    if not show_list_info:
+        return
+
     click.echo()
 
     num_results = len(data)
-    list_suffix = "repositor%s visible" % ("ies" if num_results != 1 else "y")
-    utils.pretty_print_list_info(
-        num_results=num_results, page_info=page_info, suffix=list_suffix
-    )
+    list_suffix = "repositor%s" % ("ies" if num_results != 1 else "y")
+    if show_all:
+        utils.pretty_print_list_info(
+            num_results=num_results, suffix=f"{list_suffix} retrieved", show_all=True
+        )
+    else:
+        utils.pretty_print_list_info(
+            num_results=num_results,
+            page_info=page_info,
+            suffix=f"{list_suffix} visible",
+        )
 
 
 @main.group(cls=command.AliasGroup, name="repositories", aliases=["repos"])
@@ -83,7 +93,7 @@ def repositories(ctx, opts):  # pylink: disable=unused-argument
     required=False,
 )
 @click.pass_context
-def get(ctx, opts, owner_repo, page, page_size):
+def get(ctx, opts, owner_repo, page, page_size, show_all):
     """
     List repositories for a namespace (owner).
 
@@ -118,17 +128,37 @@ def get(ctx, opts, owner_repo, page, page_size):
     context_msg = "Failed to get list of repositories!"
     with handle_api_exceptions(ctx, opts=opts, context_msg=context_msg):
         with maybe_spinner(opts):
-            repos_, page_info = api.list_repos(
-                owner=owner, repo=repo, page=page, page_size=page_size
-            )
+            if show_all:
+                repos_ = []
+                current_page = 1
+                while True:
+                    page_repos, page_info = api.list_repos(
+                        owner=owner, repo=repo, page=current_page, page_size=page_size
+                    )
+                    repos_.extend(page_repos)
+                    if (
+                        len(page_repos) < page_size
+                        or current_page >= page_info.page_total
+                    ):
+                        break
+                    current_page += 1
+                page_info.count = len(repos_)
+            else:
+                repos_, page_info = api.list_repos(
+                    owner=owner, repo=repo, page=page, page_size=page_size
+                )
 
     click.secho("OK", fg="green", err=use_stderr)
 
     if utils.maybe_print_as_json(opts, repos_, page_info):
         return
 
     print_repositories(
-        opts=opts, data=repos_, show_list_info=False, page_info=page_info
+        opts=opts,
+        data=repos_,
+        show_list_info=True,
+        page_info=page_info,
+        show_all=show_all,
     )
 
 

cloudsmith_cli/cli/decorators.py

@@ -160,6 +160,12 @@ def common_cli_list_options(f):
         help="The amount of items to view per page for lists.",
         callback=validators.validate_page_size,
     )
+    @click.option(
+        "--show-all",
+        is_flag=True,
+        default=False,
+        help="Show all results by automatically paginating",
+    )
     @click.pass_context
     @functools.wraps(f)
     def wrapper(ctx, *args, **kwargs):

cloudsmith_cli/cli/utils.py

@@ -18,32 +18,38 @@ def make_user_agent(prefix=None):
     return f"cloudsmith-cli/{prefix} cli:{get_cli_version()} api:{get_api_version()}"
 
 
-def pretty_print_list_info(num_results, page_info=None, suffix=None):
-    """Pretty print list info, with pagination, for user display."""
-    num_results_fg = "green" if num_results else "red"
-    num_results_text = click.style(str(num_results), fg=num_results_fg)
-
-    if page_info and page_info.is_valid:
-        page_range = page_info.calculate_range(num_results)
-        page_info_text = f"page: {click.style(str(page_info.page), bold=True)}/{click.style(str(page_info.page_total), bold=True)}, page size: {click.style(str(page_info.page_size), bold=True)}"
-        range_results_text = "%(from)s-%(to)s (%(num_results)s) of %(total)s" % {
-            "num_results": num_results_text,
-            "from": click.style(str(page_range[0]), fg=num_results_fg),
-            "to": click.style(str(page_range[1]), fg=num_results_fg),
-            "total": click.style(str(page_info.count), fg=num_results_fg),
-        }
+def pretty_print_list_info(num_results, page_info=None, suffix="", show_all=False):
+    """Print information about list results."""
+    if show_all:
+        click.echo(
+            "Results: %(num_results)d %(suffix)s"
+            % {
+                "num_results": num_results,
+                "suffix": suffix,
+            }
+        )
+    elif page_info:
+        start = (page_info.page - 1) * page_info.page_size + 1
+        end = min(start + num_results - 1, page_info.count)
+        click.echo(
+            "Results: %(start)d-%(end)d (%(count)d) of %(total)d %(suffix)s "
+            "(page: %(page)d/%(pages)d, page size: %(page_size)d)"
+            % {
+                "start": start,
+                "end": end,
+                "count": num_results,
+                "total": page_info.count,
+                "suffix": suffix,
+                "page": page_info.page,
+                "pages": page_info.page_total,
+                "page_size": page_info.page_size,
+            }
+        )
     else:
-        page_info_text = ""
-        range_results_text = num_results_text
-
-    click.secho(
-        "Results: %(range_results)s %(suffix)s%(page_info)s"
-        % {
-            "range_results": range_results_text,
-            "page_info": " (%s)" % page_info_text if page_info_text else "",
-            "suffix": suffix or "item(s)",
-        }
-    )
+        click.echo(
+            "Results: %(num_results)d %(suffix)s"
+            % {"num_results": num_results, "suffix": suffix}
+        )
 
 
 def fmt_datetime(value):