derivepassphrase.git

@@ -343,53 +343,25 @@ P = ParamSpec('P')

 R = TypeVar('R')

-def log_debug(

+def adjust_logging_level(

     ctx: click.Context,

     /,

     param: click.Parameter | None = None,

-    value: Any = None,  # noqa: ANN401

+    value: int | None = None,

 ) -> None:

-    """Request that DEBUG-level logs be emitted to standard error.

+    """Change the logs that are emitted to standard error.

     This modifies the [`StandardCLILogging`][] settings such that log

-    records at level [`logging.DEBUG`][] and [`logging.INFO`][] are

-    emitted as well.

+    records at the respective level are emitted, based on the `param`

+    and the `value`.

     """

-    del ctx, param, value

-    StandardCLILogging.cli_handler.setLevel(logging.DEBUG)

-

-

-def log_info(

-    ctx: click.Context,

-    /,

-    param: click.Parameter | None = None,

-    value: Any = None,  # noqa: ANN401

-) -> None:

-    """Request that INFO-level logs be emitted to standard error.

-

-    This modifies the [`StandardCLILogging`][] settings such that log

-    records at level [`logging.INFO`][] are emitted as well.

-

-    """

-    del ctx, param, value

-    StandardCLILogging.cli_handler.setLevel(logging.INFO)

-

-

-def silence_warnings(

-    ctx: click.Context,

-    /,

-    param: click.Parameter | None = None,

-    value: Any = None,  # noqa: ANN401

-) -> None:

-    """Request that WARNING-level logs not be emitted to standard error.

-

-    This modifies the [`StandardCLILogging`][] settings such that log

-    records at level [`logging.WARNING`][] and below are *not* emitted.

-

-    """

-    del ctx, param, value

-    StandardCLILogging.cli_handler.setLevel(logging.ERROR)

+    # Note: If multiple options use this callback, then we will be

+    # called multiple times.  Ensure the runs are idempotent.

+    if param is None or value is None or ctx.resilient_parsing:

+        return

+    StandardCLILogging.cli_handler.setLevel(value)

+    logging.getLogger(StandardCLILogging.package_name).setLevel(value)

 # Option parsing and grouping

@@ -498,50 +470,55 @@ class LoggingOption(OptionGroupOption):

     epilog = ''

-def standard_logging_options(f: Callable[P, R]) -> Callable[P, R]:

-    """Decorate the function with standard logging click options.

-

-    Adds the three click options `-v`/`--verbose`, `-q`/`--quiet` and

-    `--debug`, which issue callbacks to the [`log_info`][],

-    [`silence_warnings`][] and [`log_debug`][] functions, respectively.

-

-    Args:

-        f: A callable to decorate.

-

-    Returns:

-        The decorated callable.

-

-    """

-    dec1 = click.option(

-        '-q',

-        '--quiet',

+debug_option = click.option(

+    '--debug',

+    'logging_level',

     is_flag=True,

-        is_eager=True,

+    flag_value=logging.DEBUG,

     expose_value=False,

-        callback=silence_warnings,

-        help='suppress even warnings, emit only errors',

+    callback=adjust_logging_level,

+    help='also emit debug information (implies --verbose)',

     cls=LoggingOption,

 )

-    dec2 = click.option(

+verbose_option = click.option(

     '-v',

     '--verbose',

+    'logging_level',

     is_flag=True,

-        is_eager=True,

+    flag_value=logging.INFO,

     expose_value=False,

-        callback=log_info,

+    callback=adjust_logging_level,

     help='emit extra/progress information to standard error',

     cls=LoggingOption,

 )

-    dec3 = click.option(

-        '--debug',

+quiet_option = click.option(

+    '-q',

+    '--quiet',

+    'logging_level',

     is_flag=True,

-        is_eager=True,

+    flag_value=logging.ERROR,

     expose_value=False,

-        callback=log_debug,

-        help='also emit debug information (implies --verbose)',

+    callback=adjust_logging_level,

+    help='suppress even warnings, emit only errors',

     cls=LoggingOption,

 )

-    return dec1(dec2(dec3(f)))

+

+

+def standard_logging_options(f: Callable[P, R]) -> Callable[P, R]:

+    """Decorate the function with standard logging click options.

+

+    Adds the three click options `-v`/`--verbose`, `-q`/`--quiet` and

+    `--debug`, which issue callbacks to the [`log_info`][],

+    [`silence_warnings`][] and [`log_debug`][] functions, respectively.

+

+    Args:

+        f: A callable to decorate.

+

+    Returns:

+        The decorated callable.

+

+    """

+    return debug_option(verbose_option(quiet_option(f)))

 # Top-level

@@ -1754,7 +1731,7 @@ def derivepassphrase_vault(  # noqa: C901,PLR0912,PLR0913,PLR0914,PLR0915

                     exc.filename,

                 )

             else:

-                logger.info('Successfully migrated to %r.', new_name)

+                deprecation.info('Successfully migrated to %r.', new_name)

             return backup_config

         except OSError as e:

             err('Cannot load config: %s: %r', e.strerror, e.filename)

@@ -1713,4 +1713,7 @@ warning_emitted = message_emitted_factory(logging.WARNING)

 deprecation_warning_emitted = message_emitted_factory(

     logging.WARNING, logger_name=f'{cli.PROG_NAME}.deprecation'

 )

+deprecation_info_emitted = message_emitted_factory(

+    logging.INFO, logger_name=f'{cli.PROG_NAME}.deprecation'

+)

 error_emitted = message_emitted_factory(logging.ERROR)

@@ -2279,7 +2279,7 @@ class TestCLITransition:

         assert tests.deprecation_warning_emitted(

             'v0.1-style config file', caplog.record_tuples

         ), 'expected known warning message in stderr'

-        assert tests.info_emitted(

+        assert tests.deprecation_info_emitted(

             'Successfully migrated to ', caplog.record_tuples

         ), 'expected known warning message in stderr'