style: apply Ruff's remaining automatic fixes

plugin_cmds/cmd_decrypt.py

@@ -38,7 +38,7 @@ class SupportedFiles(Enum):
 
     @classmethod
     def get_supported_list(cls):
-        return list(set(item.value for item in cls))
+        return list({item.value for item in cls})
 
     @classmethod
     def is_supported_suffix(cls, value):
@@ -66,9 +66,9 @@ def _get_input_files(
             raise click.BadParameter("{filename}: file not found or supported.")
 
         expanded_filter = filter(
-            lambda x: SupportedFiles.is_supported_file(x), expanded
+            SupportedFiles.is_supported_file, expanded
         )
-        expanded = list(map(lambda x: pathlib.Path(x).resolve(), expanded_filter))
+        expanded = [pathlib.Path(x).resolve() for x in expanded_filter]
         filenames.extend(expanded)
 
     return filenames
@@ -135,7 +135,7 @@ def extract_chapters(initial, current):
             if "chapters" in current:
                 return initial + [current] + current["chapters"]
             else:
-                return initial + [current]
+                return [*initial, current]
 
         chapters = list(
             reduce(
@@ -630,7 +630,7 @@ def cli(
     FILES are the names of the file to decrypt.
     Wildcards `*` and recursive lookup with `**` are supported.
 
-    Only FILES with `aax` or `aaxc` suffix are processed. 
+    Only FILES with `aax` or `aaxc` suffix are processed.
     Other files are skipped silently.
     """
     if not which("ffmpeg"):

plugin_cmds/cmd_goodreads-transform.py

@@ -30,7 +30,7 @@
 @pass_session
 @pass_client
 async def cli(session, client, output):
-    """YOUR COMMAND DESCRIPTION"""
+    """YOUR COMMAND DESCRIPTION."""
     logger.debug("fetching library")
     bunch_size = session.params.get("bunch_size")
     library = await Library.from_api_full_sync(

plugin_cmds/cmd_image-urls.py

@@ -8,7 +8,7 @@
 @timeout_option()
 @pass_client()
 async def cli(client, asin):
-    """Print out the image urls for different resolutions for a book"""
+    """Print out the image urls for different resolutions for a book."""
     r = await client.get(
         f"catalog/products/{asin}",
         response_groups="media",

plugin_cmds/cmd_listening-stats.py

@@ -52,8 +52,8 @@ async def _get_stats_year(client, year):
 )
 @pass_client
 async def cli(client, output, signup_year):
-    """Get and analyse listening statistics"""
-    year_range = [y for y in range(signup_year, current_year+1)]
+    """Get and analyse listening statistics."""
+    year_range = list(range(signup_year, current_year+1))
 
     r = await asyncio.gather(
         *[_get_stats_year(client, y) for y in year_range]

plugin_cmds/convert_oa_cred.py

@@ -1,6 +1,6 @@
 """Converts the credentials.json file from OpenAudible >= v2.4 beta to an
-audible-cli auth file. The credentials.json file from OpenAudible leaves 
-unchanged, so you can use one device registration for OpenAudible and 
+audible-cli auth file. The credentials.json file from OpenAudible leaves
+unchanged, so you can use one device registration for OpenAudible and
 audible-cli.
 """
 
@@ -41,7 +41,7 @@ def make_auth_file(fn, origin):
     device_info = extensions["device_info"]
     customer_info = extensions["customer_info"]
 
-    website_cookies = dict()
+    website_cookies = {}
     for cookie in tokens["website_cookies"]:
         website_cookies[cookie["Name"]] = cookie["Value"].replace(r'"', r"")
 
@@ -70,8 +70,8 @@ def make_auth_file(fn, origin):
     help="OpenAudible credentials.json file")
 @pass_session
 def cli(session, input):
-    """Converts a OpenAudible credential file to a audible-cli auth file
-    
+    """Converts a OpenAudible credential file to a audible-cli auth file.
+
     Stores the auth files in app dir
     """
     fdata = pathlib.Path(input).read_text("utf-8")

pyproject.toml

@@ -195,28 +195,22 @@ lines-after-imports = 2
 # individual findings. Shrink the list by fixing a rule in a file and
 # dropping its code here.
 "docs/source/conf.py" = ["A001"]
-"plugin_cmds/cmd_decrypt.py" = ["C401", "C417", "PLR0917", "PLW0108", "RUF005", "W291"]
-"plugin_cmds/cmd_goodreads-transform.py" = ["D415", "G004"]
-"plugin_cmds/cmd_image-urls.py" = ["D415"]
-"plugin_cmds/cmd_listening-stats.py" = ["C416", "D415"]
-"plugin_cmds/convert_oa_cred.py" = ["A002", "C408", "D205", "D415", "W291", "W293"]
-"src/audible_cli/_logging.py" = ["B028", "C408", "D205", "G004"]
-"src/audible_cli/cli.py" = ["C408", "D415"]
+"plugin_cmds/cmd_decrypt.py" = ["PLR0917"]
+"plugin_cmds/cmd_goodreads-transform.py" = ["G004"]
+"plugin_cmds/convert_oa_cred.py" = ["A002", "D205"]
+"src/audible_cli/_logging.py" = ["D205", "G004"]
 "src/audible_cli/cmds/__init__.py" = ["D205"]
-"src/audible_cli/cmds/cmd_api.py" = ["D415", "G004", "W291"]
-"src/audible_cli/cmds/cmd_download.py" = ["ASYNC240", "C901", "D415", "G004", "PLR0917", "PLW0603", "PLW2901", "S101"]
-"src/audible_cli/cmds/cmd_library.py" = ["D415"]
-"src/audible_cli/cmds/cmd_manage.py" = ["D415", "PLR0917"]
-"src/audible_cli/cmds/cmd_quickstart.py" = ["D415", "W291"]
-"src/audible_cli/cmds/cmd_wishlist.py" = ["D415", "G004"]
-"src/audible_cli/config.py" = ["B904", "D415", "D417", "G004", "W291", "W293"]
-"src/audible_cli/decorators.py" = ["B904", "D205", "D415", "RUF001", "W293"]
+"src/audible_cli/cmds/cmd_api.py" = ["G004"]
+"src/audible_cli/cmds/cmd_download.py" = ["ASYNC240", "C901", "G004", "PLR0917", "PLW0603", "PLW2901", "S101"]
+"src/audible_cli/cmds/cmd_manage.py" = ["PLR0917"]
+"src/audible_cli/cmds/cmd_wishlist.py" = ["G004"]
+"src/audible_cli/config.py" = ["B904", "D417", "G004"]
+"src/audible_cli/decorators.py" = ["B904", "D205", "RUF001"]
 "src/audible_cli/downloader.py" = ["G004", "PLR0917"]
-"src/audible_cli/exceptions.py" = ["D415"]
-"src/audible_cli/models.py" = ["B904", "D205", "D415", "G004", "S101", "W293"]
-"src/audible_cli/plugins.py" = ["D200", "D205", "D415", "UP031"]
+"src/audible_cli/models.py" = ["B904", "D205", "G004", "S101"]
+"src/audible_cli/plugins.py" = ["D205"]
 "src/audible_cli/utils.py" = ["G004", "PGH004", "PLR0917"]
-"utils/update_chapter_titles.py" = ["C408", "D205", "D415", "S101", "W293"]
+"utils/update_chapter_titles.py" = ["D205", "S101"]
 
 
 [tool.pytest.ini_options]

src/audible_cli/_logging.py

@@ -33,7 +33,7 @@ def _set_level(obj, level: str | int | None) -> None:
         if 0 < obj.level < audible_cli_logger.level:
             warn(
                 f"{obj.name} level is lower than "
-                f"{audible_cli_logger.name} logger level"
+                f"{audible_cli_logger.name} logger level", stacklevel=2
             )
 
     def _set_handler(self, handler, name, level):
@@ -119,19 +119,19 @@ def _normalize_logger(logger):
 
 def _normalize_style_kwargs(styles):
     normalized_styles = {
-        "error": dict(fg="red"),
-        "exception": dict(fg="red"),
-        "critical": dict(fg="red"),
-        "debug": dict(fg="blue"),
-        "warning": dict(fg="yellow")
+        "error": {"fg": "red"},
+        "exception": {"fg": "red"},
+        "critical": {"fg": "red"},
+        "debug": {"fg": "blue"},
+        "warning": {"fg": "yellow"}
     }
     if styles:
         normalized_styles.update(styles)
     return normalized_styles
 
 
 def _normalize_echo_kwargs(echo_kwargs):
-    normamized_echo_kwargs = dict()
+    normamized_echo_kwargs = {}
     if echo_kwargs:
         normamized_echo_kwargs.update(echo_kwargs)
     return normamized_echo_kwargs

src/audible_cli/cli.py

@@ -22,7 +22,7 @@
 logger = logging.getLogger("audible_cli")
 click_basic_config(logger)
 
-CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
+CONTEXT_SETTINGS = {"help_option_names": ["-h", "--help"]}
 
 
 @plugins.from_folder(get_plugin_dir())
@@ -42,7 +42,7 @@ def cli():
 @version_option
 @verbosity_option(cli_logger=logger)
 def quickstart(ctx):
-    """Entrypoint for the quickstart command"""
+    """Entrypoint for the quickstart command."""
     try:
         sys.exit(ctx.forward(cmd_quickstart.cli))
     except click.Abort:

src/audible_cli/cmds/cmd_api.py

@@ -61,10 +61,10 @@
 )
 @pass_session
 def cli(session, **options):
-    """Send requests to an Audible API endpoint
+    """Send requests to an Audible API endpoint.
 
-    Take a look at 
-    https://audible.readthedocs.io/en/latest/misc/external_api.html for known 
+    Take a look at
+    https://audible.readthedocs.io/en/latest/misc/external_api.html for known
     endpoints and parameters.
     """
     auth = session.auth

src/audible_cli/cmds/cmd_download.py

@@ -836,7 +836,7 @@ def display_counter():
 @pass_session
 @pass_client(headers=CLIENT_HEADERS)
 async def cli(session, api_client, **params):
-    """Download audiobook(s) from library"""
+    """Download audiobook(s) from library."""
     client = api_client.session
     output_dir = pathlib.Path(params.get("output_dir")).resolve()
 

src/audible_cli/cmds/cmd_library.py

@@ -20,7 +20,7 @@
 
 @click.group("library")
 def cli():
-    """Interact with library"""
+    """Interact with library."""
 
 
 async def _get_library(session, client, resolve_podcasts):
@@ -77,7 +77,7 @@ async def _get_library(session, client, resolve_podcasts):
 @pass_session
 @pass_client
 async def export_library(session, client, **params):
-    """Export library"""
+    """Export library."""
 
     @wrap_async
     def _prepare_item(item):
@@ -165,7 +165,7 @@ def _prepare_item(item):
 @pass_session
 @pass_client
 async def list_library(session, client, resolve_podcasts):
-    """List titles in library"""
+    """List titles in library."""
 
     @wrap_async
     def _prepare_item(item):

src/audible_cli/cmds/cmd_manage.py

@@ -17,35 +17,35 @@
 
 @click.group("manage")
 def cli():
-    """Manage audible-cli"""
+    """Manage audible-cli."""
 
 
 @cli.group("config")
 def manage_config():
-    """Manage config"""
+    """Manage config."""
 
 
 @cli.group("profile")
 def manage_profiles():
-    """Manage profiles"""
+    """Manage profiles."""
 
 
 @cli.group("auth-file")
 def manage_auth_files():
-    """Manage auth files"""
+    """Manage auth files."""
 
 
 @manage_config.command("edit")
 @pass_session
 def config_editor(session):
-    """Open the config file with default editor"""
+    """Open the config file with default editor."""
     click.edit(filename=os.fspath(session.config.filename))
 
 
 @manage_profiles.command("list")
 @pass_session
 def list_profiles(session):
-    """List all profiles in the config file"""
+    """List all profiles in the config file."""
     head = ["P", "Profile", "auth file", "cc"]
     config = session.config
     profiles = config.data.get("profile")
@@ -91,7 +91,7 @@ def list_profiles(session):
 @pass_session
 @click.pass_context
 def add_profile(ctx, session, profile, country_code, auth_file, is_primary):
-    """Adds a profile to config file"""
+    """Adds a profile to config file."""
     if not (session.config.dirname / auth_file).exists():
         logger.error("Auth file doesn't exists")
         raise click.Abort()
@@ -112,7 +112,7 @@ def add_profile(ctx, session, profile, country_code, auth_file, is_primary):
 )
 @pass_session
 def remove_profile(session, profile):
-    """Remove one or multiple profile(s) from config file"""
+    """Remove one or multiple profile(s) from config file."""
     profiles = session.config.data.get("profile")
     for p in profile:
         if p not in profiles:
@@ -180,7 +180,7 @@ def add_auth_file(
         session, auth_file, password, audible_username,
         audible_password, country_code, external_login, with_username
 ):
-    """Register a new device and add an auth file to config dir"""
+    """Register a new device and add an auth file to config dir."""
     build_auth_file(
         filename=session.config.dirname / auth_file,
         username=audible_username,
@@ -214,7 +214,7 @@ def check_if_auth_file_exists(session, ctx, param, value):
     help="The optional password for the auth file."
 )
 def remove_auth_file(auth_file, password):
-    """Deregister a device and remove auth file from config dir"""
+    """Deregister a device and remove auth file from config dir."""
     auth = Authenticator.from_file(auth_file, password)
     device_name = auth.device_info["device_name"]
     auth.refresh_access_token()

src/audible_cli/cmds/cmd_quickstart.py

@@ -40,15 +40,15 @@ def ask_user(config: ConfigFile):
     secho(welcome_message, bold=True)
     secho(len(welcome_message) * "=", bold=True)
 
-    intro = """Quickstart will guide you through the process of build a basic 
+    intro = """Quickstart will guide you through the process of build a basic
 config, create a first profile and assign an auth file to the profile now.
 
-The profile created by quickstart will set as primary. It will be used, if no 
+The profile created by quickstart will set as primary. It will be used, if no
 other profile is chosen.
 
-An auth file can be shared between multiple profiles. Simply enter the name of 
-an existing auth file when asked about it. Auth files have to be stored in the 
-config dir. If the auth file doesn't exists, it will be created. In this case, 
+An auth file can be shared between multiple profiles. Simply enter the name of
+an existing auth file when asked about it. Auth files have to be stored in the
+config dir. If the auth file doesn't exists, it will be created. In this case,
 an authentication to the audible server is necessary to register a new device.
 """
     echo()
@@ -139,7 +139,7 @@ def ask_user(config: ConfigFile):
 @click.command("quickstart")
 @pass_session
 def cli(session):
-    """Quick setup audible"""
+    """Quick setup audible."""
     config_file: pathlib.Path = session.app_dir / CONFIG_FILE
     config = ConfigFile(config_file, file_exists=False)
     if config_file.is_file():

src/audible_cli/cmds/cmd_wishlist.py

@@ -35,7 +35,7 @@ async def _get_wishlist(client):
 
 @click.group("wishlist")
 def cli():
-    """Interact with wishlist"""
+    """Interact with wishlist."""
 
 
 @cli.command("export")
@@ -56,7 +56,7 @@ def cli():
 )
 @pass_client
 async def export_wishlist(client, **params):
-    """Export wishlist"""
+    """Export wishlist."""
 
     @wrap_async
     def _prepare_item(item):
@@ -134,7 +134,7 @@ def _prepare_item(item):
 @timeout_option
 @pass_client
 async def list_wishlist(client):
-    """List titles in wishlist"""
+    """List titles in wishlist."""
 
     @wrap_async
     def _prepare_item(item):
@@ -179,7 +179,7 @@ def _prepare_item(item):
 @timeout_option
 @pass_client(limits=limits)
 async def add_wishlist(client, asin, title):
-    """Add asin(s) to wishlist
+    """Add asin(s) to wishlist.
 
     Run the command without any option for interactive mode.
     """
@@ -262,7 +262,7 @@ async def add_asin(asin):
 @timeout_option
 @pass_client(limits=limits)
 async def remove_wishlist(client, asin, title):
-    """Remove asin(s) from wishlist
+    """Remove asin(s) from wishlist.
 
     Run the command without any option for interactive mode.
     """