Revert code changes

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, show_all, query):
+def packages(ctx, opts, owner_repo, page, page_size, query):
     """
     List packages for a repository.
 
@@ -165,48 +165,20 @@ def packages(ctx, opts, owner_repo, page, page_size, show_all, query):
 
     --query 'name:^foo$ filename:.zip$ architecture:~x86'
 
-    Options:
-      -p, --page INTEGER     The page of results to show.
-      -l, --page-size INTEGER  The number of results to return per page.
-      --show-all             Show all results by automatically paginating through all pages.
-      -q, --query TEXT       A boolean-like search term for querying package attributes.
     """
     owner, repo = owner_repo
 
-    if show_all:
-        if page is not None or page_size is not None:
-            raise click.UsageError(
-                "--show-all cannot be used with --page or --page-size"
-            )
-    else:
-        if page is None and page_size is None:
-            show_all = True
-
     # Use stderr for messages if the output is something else (e.g.  # JSON)
     use_stderr = opts.output != "pretty"
 
-    if show_all:
-        click.echo(
-            f"Retrieving all packages for repository {owner}/{repo}. This may take a while...",
-            err=use_stderr,
-        )
-    else:
-        click.echo("Getting list of packages ... ", nl=False, err=use_stderr)
+    click.echo("Getting list of packages ... ", nl=False, err=use_stderr)
 
     context_msg = "Failed to get list of packages!"
     with handle_api_exceptions(ctx, opts=opts, context_msg=context_msg):
         with maybe_spinner(opts):
-            if show_all:
-                packages_, page_info = utils.get_all_pages(
-                    list_packages,
-                    owner=owner,
-                    repo=repo,
-                    query=query,
-                )
-            else:
-                packages_, page_info = list_packages(
-                    owner=owner, repo=repo, page=page, page_size=page_size, query=query
-                )
+            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)
 
@@ -239,10 +211,7 @@ def packages(ctx, opts, owner_repo, page, page_size, show_all, query):
     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,
-        show_all=show_all,
+        num_results=num_results, page_info=page_info, suffix=list_suffix
     )
 
 
@@ -260,7 +229,7 @@ def packages(ctx, opts, owner_repo, page, page_size, show_all, query):
     required=False,
 )
 @click.pass_context
-def repos(ctx, opts, owner_repo, page, page_size, show_all):
+def repos(ctx, opts, owner_repo, page, page_size):
     """
     List repositories for a namespace (owner).
 
@@ -292,4 +261,4 @@ def _get_package_status(package):
 
 def _get_package_version(package):
     """Get the version for a package (if any)."""
-    return package["version"] or "None"
+    return package["version"] or "None"

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, show_all=False):
+def print_repositories(opts, data, page_info=None, show_list_info=True):
     """Print repositories as a table or output in another format."""
     headers = [
         "Name",
@@ -51,10 +51,7 @@ def print_repositories(opts, data, page_info=None, show_list_info=True, show_all
     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,
-        show_all=show_all,
+        num_results=num_results, page_info=page_info, suffix=list_suffix
     )
 
 
@@ -86,7 +83,7 @@ def repositories(ctx, opts):  # pylink: disable=unused-argument
     required=False,
 )
 @click.pass_context
-def get(ctx, opts, owner_repo, page, page_size, show_all):
+def get(ctx, opts, owner_repo, page, page_size):
     """
     List repositories for a namespace (owner).
 
@@ -98,23 +95,12 @@ def get(ctx, opts, owner_repo, page, page_size, show_all):
 
     If OWNER isn't specified it'll default to the currently authenticated user
     (if any). If you're unauthenticated, no results will be returned.
-
-    Options:
-      -p, --page INTEGER     The page of results to show.
-      -l, --page-size INTEGER  The number of results to return per page.
-      --show-all             Show all results by automatically paginating through all pages.
     """
-    if show_all:
-        if page is not None or page_size is not None:
-            raise click.UsageError(
-                "--show-all cannot be used with --page or --page-size"
-            )
-    elif page is None and page_size is None:
-        show_all = True
-
     # Use stderr for messages if the output is something else (e.g.  # JSON)
     use_stderr = opts.output != "pretty"
 
+    click.echo("Getting list of repositories ... ", nl=False, err=use_stderr)
+
     if isinstance(owner_repo, list):
         if len(owner_repo) == 1:
             owner = owner_repo[0]
@@ -123,49 +109,26 @@ def get(ctx, opts, owner_repo, page, page_size, show_all):
             owner, repo = owner_repo
     if isinstance(owner_repo, str):
         repo = None
+
         if owner_repo:
             owner = owner_repo
         else:
             owner = None
 
-    if show_all:
-        if owner:
-            click.echo(
-                f"Retrieving all repositories for {owner}. This may take a while...",
-                err=use_stderr,
-            )
-        else:
-            click.echo(
-                "Retrieving all repositories. This may take a while...", err=use_stderr
-            )
-    else:
-        click.echo("Getting list of repositories ... ", nl=False, err=use_stderr)
-
     context_msg = "Failed to get list of repositories!"
     with handle_api_exceptions(ctx, opts=opts, context_msg=context_msg):
         with maybe_spinner(opts):
-            if show_all:
-                repos_, page_info = utils.get_all_pages(
-                    api.list_repos,
-                    owner=owner,
-                    repo=repo,
-                )
-            else:
-                repos_, page_info = api.list_repos(
-                    owner=owner, repo=repo, page=page, page_size=page_size
-                )
+            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,
-        show_all=show_all,
+        opts=opts, data=repos_, show_list_info=False, page_info=page_info
     )
 
 
@@ -341,4 +304,4 @@ def delete(ctx, opts, owner_repo, yes):
         with maybe_spinner(opts):
             api.delete_repo(owner=owner, repo=repo)
 
-    click.secho("OK", fg="green")
+    click.secho("OK", fg="green")

cloudsmith_cli/cli/decorators.py

@@ -142,33 +142,31 @@ def wrapper(ctx, *args, **kwargs):
 
 
 def common_cli_list_options(f):
-    """Add common options for list commands."""
+    """Add common list options to commands."""
 
     @click.option(
         "-p",
         "--page",
         default=1,
-        help="The page of results to show.",
-        type=click.INT,
+        type=int,
+        help="The page to view for lists, where 1 is the first page",
         callback=validators.validate_page,
     )
     @click.option(
         "-l",
         "--page-size",
-        default=None,
-        help="The number of results to return per page.",
-        type=click.INT,
+        default=30,
+        type=int,
+        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 through all pages.",
-    )
+    @click.pass_context
     @functools.wraps(f)
-    def wrapper(*args, **kwargs):
-        return f(*args, **kwargs)
+    def wrapper(ctx, *args, **kwargs):
+        # pylint: disable=missing-docstring
+        opts = config.get_or_create_options(ctx)
+        kwargs["opts"] = opts
+        return ctx.invoke(f, *args, **kwargs)
 
     return wrapper
 
@@ -310,4 +308,4 @@ def call_print_rate_limit_info_with_opts(rate_info):
         kwargs["opts"] = opts
         return ctx.invoke(f, *args, **kwargs)
 
-    return wrapper
+    return wrapper

cloudsmith_cli/cli/utils.py

@@ -1,5 +1,4 @@
 """CLI - Utilities."""
-
 import json
 import platform
 from contextlib import contextmanager
@@ -19,24 +18,20 @@ 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, show_all=False):
+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:
-        if show_all:
-            range_results_text = f"{num_results_text} of {click.style(str(page_info.count), fg=num_results_fg)}"
-            page_info_text = "all pages"
-        else:
-            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),
-            }
+        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),
+        }
     else:
         page_info_text = ""
         range_results_text = num_results_text
@@ -195,17 +190,4 @@ def maybe_spinner(opts):
         yield
     else:
         with spinner() as spin:
-            yield spin
-
-
-def get_all_pages(func, **kwargs):
-    """Retrieve all pages for a paginated API call."""
-    all_items = []
-    page = 1
-    while True:
-        items, page_info = func(page=page, **kwargs)
-        all_items.extend(items)
-        if page >= page_info.page_total:
-            break
-        page += 1
-    return all_items, page_info
+            yield spin