mirror of
https://github.com/platformio/platformio-core.git
synced 2025-07-30 10:07:14 +02:00
Rename "quiet" option to "silent"
This commit is contained in:
@ -90,7 +90,7 @@ Options
|
|||||||
.. program:: platformio lib install
|
.. program:: platformio lib install
|
||||||
|
|
||||||
.. option::
|
.. option::
|
||||||
-q, --quiet
|
-s, --silent
|
||||||
|
|
||||||
Suppress progress reporting
|
Suppress progress reporting
|
||||||
|
|
||||||
|
@ -68,18 +68,18 @@ def cli(ctx, **options):
|
|||||||
|
|
||||||
@cli.command("install", short_help="Install library")
|
@cli.command("install", short_help="Install library")
|
||||||
@click.argument("libraries", required=False, nargs=-1, metavar="[LIBRARY...]")
|
@click.argument("libraries", required=False, nargs=-1, metavar="[LIBRARY...]")
|
||||||
|
# @click.option(
|
||||||
|
# "--save",
|
||||||
|
# is_flag=True,
|
||||||
|
# help="Save installed libraries into the project's platformio.ini "
|
||||||
|
# "library dependencies")
|
||||||
@click.option(
|
@click.option(
|
||||||
"--save",
|
"-s", "--silent", is_flag=True, help="Suppress progress reporting")
|
||||||
is_flag=True,
|
|
||||||
help="Save installed libraries into the project's platformio.ini "
|
|
||||||
"library dependencies")
|
|
||||||
@click.option(
|
|
||||||
"-q", "--quiet", is_flag=True, help="Suppress progress reporting")
|
|
||||||
@click.pass_obj
|
@click.pass_obj
|
||||||
def lib_install(lm, libraries, save, quiet): # pylint: disable=unused-argument
|
def lib_install(lm, libraries, silent):
|
||||||
# @TODO "save" option
|
# @TODO "save" option
|
||||||
for library in libraries:
|
for library in libraries:
|
||||||
lm.install(library, quiet=quiet)
|
lm.install(library, silent=silent)
|
||||||
|
|
||||||
|
|
||||||
@cli.command("uninstall", short_help="Uninstall libraries")
|
@cli.command("uninstall", short_help="Uninstall libraries")
|
||||||
|
@ -246,7 +246,7 @@ def _autoinstall_libdeps(ctx, libraries, verbose=False):
|
|||||||
ctx.obj = LibraryManager(storage_dir)
|
ctx.obj = LibraryManager(storage_dir)
|
||||||
if verbose:
|
if verbose:
|
||||||
click.echo("Library Storage: " + storage_dir)
|
click.echo("Library Storage: " + storage_dir)
|
||||||
ctx.invoke(cmd_lib_install, libraries=libraries, quiet=not verbose)
|
ctx.invoke(cmd_lib_install, libraries=libraries, silent=not verbose)
|
||||||
|
|
||||||
|
|
||||||
def _clean_pioenvs_dir(pioenvs_dir):
|
def _clean_pioenvs_dir(pioenvs_dir):
|
||||||
|
@ -106,7 +106,7 @@ class LibraryManager(BasePkgManager):
|
|||||||
name, requirements)), requirements)
|
name, requirements)), requirements)
|
||||||
return item['version'] if item else None
|
return item['version'] if item else None
|
||||||
|
|
||||||
def _get_pkg_id_by_name(self, name, requirements, quiet=False):
|
def _get_pkg_id_by_name(self, name, requirements, silent=False):
|
||||||
if name.startswith("id="):
|
if name.startswith("id="):
|
||||||
return int(name[3:])
|
return int(name[3:])
|
||||||
# try to find ID from installed packages
|
# try to find ID from installed packages
|
||||||
@ -115,7 +115,7 @@ class LibraryManager(BasePkgManager):
|
|||||||
manifest = self.load_manifest(installed_dir)
|
manifest = self.load_manifest(installed_dir)
|
||||||
if "id" in manifest:
|
if "id" in manifest:
|
||||||
return int(manifest['id'])
|
return int(manifest['id'])
|
||||||
return int(self.search_for_library({"name": name}, quiet)['id'])
|
return int(self.search_for_library({"name": name}, silent)['id'])
|
||||||
|
|
||||||
def _install_from_piorepo(self, name, requirements):
|
def _install_from_piorepo(self, name, requirements):
|
||||||
assert name.startswith("id=")
|
assert name.startswith("id=")
|
||||||
@ -136,15 +136,18 @@ class LibraryManager(BasePkgManager):
|
|||||||
requirements)
|
requirements)
|
||||||
return pkg_dir
|
return pkg_dir
|
||||||
|
|
||||||
def install(self, name, requirements=None, quiet=False,
|
def install(self,
|
||||||
|
name,
|
||||||
|
requirements=None,
|
||||||
|
silent=False,
|
||||||
trigger_event=True):
|
trigger_event=True):
|
||||||
_name, _requirements, _url = self.parse_pkg_name(name, requirements)
|
_name, _requirements, _url = self.parse_pkg_name(name, requirements)
|
||||||
if not _url:
|
if not _url:
|
||||||
_name = "id=%d" % self._get_pkg_id_by_name(
|
_name = "id=%d" % self._get_pkg_id_by_name(
|
||||||
_name, _requirements, quiet=quiet)
|
_name, _requirements, silent=silent)
|
||||||
already_installed = self.get_installed_dir(_name, _requirements, _url)
|
already_installed = self.get_installed_dir(_name, _requirements, _url)
|
||||||
pkg_dir = BasePkgManager.install(self, _name if not _url else name,
|
pkg_dir = BasePkgManager.install(self, _name if not _url else name,
|
||||||
_requirements, quiet, trigger_event)
|
_requirements, silent, trigger_event)
|
||||||
|
|
||||||
if already_installed:
|
if already_installed:
|
||||||
return
|
return
|
||||||
@ -153,7 +156,7 @@ class LibraryManager(BasePkgManager):
|
|||||||
if "dependencies" not in manifest:
|
if "dependencies" not in manifest:
|
||||||
return pkg_dir
|
return pkg_dir
|
||||||
|
|
||||||
if not quiet:
|
if not silent:
|
||||||
click.secho("Installing dependencies", fg="yellow")
|
click.secho("Installing dependencies", fg="yellow")
|
||||||
|
|
||||||
for filters in self.normalize_dependencies(manifest['dependencies']):
|
for filters in self.normalize_dependencies(manifest['dependencies']):
|
||||||
@ -161,26 +164,26 @@ class LibraryManager(BasePkgManager):
|
|||||||
if any([s in filters.get("version", "") for s in ("\\", "/")]):
|
if any([s in filters.get("version", "") for s in ("\\", "/")]):
|
||||||
self.install("{name}={version}".format(**filters))
|
self.install("{name}={version}".format(**filters))
|
||||||
else:
|
else:
|
||||||
lib_info = self.search_for_library(filters, quiet)
|
lib_info = self.search_for_library(filters, silent)
|
||||||
if filters.get("version"):
|
if filters.get("version"):
|
||||||
self.install(
|
self.install(
|
||||||
lib_info['id'],
|
lib_info['id'],
|
||||||
requirements=filters.get("version"),
|
requirements=filters.get("version"),
|
||||||
quiet=quiet,
|
silent=silent,
|
||||||
trigger_event=trigger_event)
|
trigger_event=trigger_event)
|
||||||
else:
|
else:
|
||||||
self.install(
|
self.install(
|
||||||
lib_info['id'],
|
lib_info['id'],
|
||||||
quiet=quiet,
|
silent=silent,
|
||||||
trigger_event=trigger_event)
|
trigger_event=trigger_event)
|
||||||
return pkg_dir
|
return pkg_dir
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def search_for_library( # pylint: disable=too-many-branches
|
def search_for_library( # pylint: disable=too-many-branches
|
||||||
filters, quiet=False):
|
filters, silent=False):
|
||||||
assert isinstance(filters, dict)
|
assert isinstance(filters, dict)
|
||||||
assert "name" in filters
|
assert "name" in filters
|
||||||
if not quiet:
|
if not silent:
|
||||||
click.echo("Looking for %s library in registry" % click.style(
|
click.echo("Looking for %s library in registry" % click.style(
|
||||||
filters['name'], fg="cyan"))
|
filters['name'], fg="cyan"))
|
||||||
query = []
|
query = []
|
||||||
@ -222,7 +225,7 @@ class LibraryManager(BasePkgManager):
|
|||||||
|
|
||||||
if not lib_info:
|
if not lib_info:
|
||||||
raise exception.LibNotFound(str(filters))
|
raise exception.LibNotFound(str(filters))
|
||||||
if not quiet:
|
if not silent:
|
||||||
click.echo("Found: %s" % click.style(
|
click.echo("Found: %s" % click.style(
|
||||||
"http://platformio.org/lib/show/{id}/{name}".format(
|
"http://platformio.org/lib/show/{id}/{name}".format(
|
||||||
**lib_info),
|
**lib_info),
|
||||||
|
@ -420,18 +420,21 @@ class BasePkgManager(PkgRepoMixin, PkgInstallerMixin):
|
|||||||
return manifest['version'] != self.get_latest_repo_version(
|
return manifest['version'] != self.get_latest_repo_version(
|
||||||
name, requirements)
|
name, requirements)
|
||||||
|
|
||||||
def install(self, name, requirements=None, quiet=False,
|
def install(self,
|
||||||
|
name,
|
||||||
|
requirements=None,
|
||||||
|
silent=False,
|
||||||
trigger_event=True):
|
trigger_event=True):
|
||||||
name, requirements, url = self.parse_pkg_name(name, requirements)
|
name, requirements, url = self.parse_pkg_name(name, requirements)
|
||||||
installed_dir = self.get_installed_dir(name, requirements, url)
|
installed_dir = self.get_installed_dir(name, requirements, url)
|
||||||
|
|
||||||
if not installed_dir or not quiet:
|
if not installed_dir or not silent:
|
||||||
msg = "Installing " + click.style(name, fg="cyan")
|
msg = "Installing " + click.style(name, fg="cyan")
|
||||||
if requirements:
|
if requirements:
|
||||||
msg += " @ " + requirements
|
msg += " @ " + requirements
|
||||||
self.print_message(msg)
|
self.print_message(msg)
|
||||||
if installed_dir:
|
if installed_dir:
|
||||||
if not quiet:
|
if not silent:
|
||||||
click.secho(
|
click.secho(
|
||||||
"{name} @ {version} is already installed".format(
|
"{name} @ {version} is already installed".format(
|
||||||
**self.load_manifest(installed_dir)),
|
**self.load_manifest(installed_dir)),
|
||||||
|
@ -43,7 +43,7 @@ class PlatformManager(BasePkgManager):
|
|||||||
return "platform.json"
|
return "platform.json"
|
||||||
|
|
||||||
def install(self, # pylint: disable=too-many-arguments,arguments-differ
|
def install(self, # pylint: disable=too-many-arguments,arguments-differ
|
||||||
name, requirements=None, quiet=False,
|
name, requirements=None, silent=False,
|
||||||
trigger_event=True, with_packages=None,
|
trigger_event=True, with_packages=None,
|
||||||
without_packages=None, skip_default_package=False):
|
without_packages=None, skip_default_package=False):
|
||||||
platform_dir = BasePkgManager.install(self, name, requirements)
|
platform_dir = BasePkgManager.install(self, name, requirements)
|
||||||
@ -197,7 +197,7 @@ class PlatformPackagesMixin(object):
|
|||||||
with_packages=None,
|
with_packages=None,
|
||||||
without_packages=None,
|
without_packages=None,
|
||||||
skip_default_package=False,
|
skip_default_package=False,
|
||||||
quiet=False):
|
silent=False):
|
||||||
with_packages = set(self.pkg_types_to_names(with_packages or []))
|
with_packages = set(self.pkg_types_to_names(with_packages or []))
|
||||||
without_packages = set(self.pkg_types_to_names(without_packages or []))
|
without_packages = set(self.pkg_types_to_names(without_packages or []))
|
||||||
|
|
||||||
@ -213,9 +213,9 @@ class PlatformPackagesMixin(object):
|
|||||||
not (skip_default_package or opts.get("optional", False))):
|
not (skip_default_package or opts.get("optional", False))):
|
||||||
if any([s in opts.get("version", "") for s in ("\\", "/")]):
|
if any([s in opts.get("version", "") for s in ("\\", "/")]):
|
||||||
self.pm.install(
|
self.pm.install(
|
||||||
"%s=%s" % (name, opts['version']), quiet=quiet)
|
"%s=%s" % (name, opts['version']), silent=silent)
|
||||||
else:
|
else:
|
||||||
self.pm.install(name, opts.get("version"), quiet=quiet)
|
self.pm.install(name, opts.get("version"), silent=silent)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@ -240,7 +240,7 @@ class PlatformRunMixin(object):
|
|||||||
assert isinstance(targets, list)
|
assert isinstance(targets, list)
|
||||||
|
|
||||||
self.configure_default_packages(variables, targets)
|
self.configure_default_packages(variables, targets)
|
||||||
self.install_packages(quiet=True)
|
self.install_packages(silent=True)
|
||||||
|
|
||||||
self._verbose = verbose or app.get_setting("force_verbose")
|
self._verbose = verbose or app.get_setting("force_verbose")
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user