From 611f6ac1a304cc319fc85876d3f0301f49ce458e Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 27 Jul 2026 06:12:35 +0900 Subject: [PATCH] ruff format --- src/worblehat/book_data_fetchers/book_data_fetcher.py | 2 +- src/worblehat/cli/main.py | 4 ++-- src/worblehat/cli/subclis/advanced_options.py | 5 +---- src/worblehat/cli/subclis/bookcase_shelf_selector.py | 4 ++-- src/worblehat/cli/subclis/search.py | 4 +++- src/worblehat/main.py | 6 +++--- src/worblehat/queries/bookcase_item.py | 4 +--- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/worblehat/book_data_fetchers/book_data_fetcher.py b/src/worblehat/book_data_fetchers/book_data_fetcher.py index b69fdac..f60e010 100644 --- a/src/worblehat/book_data_fetchers/book_data_fetcher.py +++ b/src/worblehat/book_data_fetchers/book_data_fetcher.py @@ -36,7 +36,7 @@ def sort_data_by_priority(data: list[BookData]) -> list[BookData]: return sorted(data, key=lambda m: FETCHER_SOURCE_IDS.index(m.source)) -def fetch_book_data_from_multiple_sources(isbn: str, strict: bool=False) -> list[BookData]: +def fetch_book_data_from_multiple_sources(isbn: str, strict: bool = False) -> list[BookData]: """ Returns a list of data fetched from multiple fetchers. diff --git a/src/worblehat/cli/main.py b/src/worblehat/cli/main.py index e3bf2c2..c06d46d 100644 --- a/src/worblehat/cli/main.py +++ b/src/worblehat/cli/main.py @@ -17,9 +17,9 @@ from worblehat.queries import ( list_overdue_borrowings, ) from worblehat.services import ( + Config, create_bookcase_item_from_isbn, is_valid_isbn, - Config, ) from .subclis import ( @@ -55,7 +55,7 @@ class WorblehatCli(NumberedCmd): while True: try: self.cmdloop() - except KeyboardInterrupt: + except KeyboardInterrupt: print("\n\n-----------------\n") self.do_exit("Exit") diff --git a/src/worblehat/cli/subclis/advanced_options.py b/src/worblehat/cli/subclis/advanced_options.py index 36f319e..1e3bf6b 100644 --- a/src/worblehat/cli/subclis/advanced_options.py +++ b/src/worblehat/cli/subclis/advanced_options.py @@ -65,10 +65,7 @@ class AdvancedOptionsCli(NumberedCmd): continue break - if ( - find_bookcase_shelf(self.sql_session, bookcase, column, row) - is not None - ): + if find_bookcase_shelf(self.sql_session, bookcase, column, row) is not None: print( f"Error: a bookshelf in bookcase {bookcase.name} with position c{column}-r{row} already exists", ) diff --git a/src/worblehat/cli/subclis/bookcase_shelf_selector.py b/src/worblehat/cli/subclis/bookcase_shelf_selector.py index c76572b..e06e120 100644 --- a/src/worblehat/cli/subclis/bookcase_shelf_selector.py +++ b/src/worblehat/cli/subclis/bookcase_shelf_selector.py @@ -16,7 +16,7 @@ def select_bookcase_shelf( sql_session: Session, prompt: str = "Please select the shelf where the item is placed (col-row):", ) -> BookcaseShelf: - def __complete_bookshelf_selection(session: Session, cls: type, arg: str): + def __complete_bookshelf_selection(session: Session, cls: type, arg: str) -> list[str]: args = arg.split("-") column = None row = None @@ -31,7 +31,7 @@ def select_bookcase_shelf( result = list_bookcase_shelf_positions(session, bookcase, column, row) return [f"{c}-{r}" for r, c in result] - def __execute_bookshelf_selection(session: Session, cls: type, arg: str): + def __execute_bookshelf_selection(session: Session, cls: type, arg: str) -> list[BookcaseShelf]: shelf = find_bookcase_shelf( session, bookcase, diff --git a/src/worblehat/cli/subclis/search.py b/src/worblehat/cli/subclis/search.py index 0282d40..ba48a8a 100644 --- a/src/worblehat/cli/subclis/search.py +++ b/src/worblehat/cli/subclis/search.py @@ -59,7 +59,9 @@ class SearchCli(NumberedCmd): else: selector = NumberedItemSelector( items=author, - stringify=lambda author: f"{author.name} ({sum(item.amount for item in author.items)} items)", + stringify=lambda author: ( + f"{author.name} ({sum(item.amount for item in author.items)} items)" + ), ) selector.cmdloop() if selector.result is None: diff --git a/src/worblehat/main.py b/src/worblehat/main.py index 3438997..26d408c 100644 --- a/src/worblehat/main.py +++ b/src/worblehat/main.py @@ -18,10 +18,10 @@ from .services import ( def _print_version() -> None: - from ._version import commit_id, version + from ._version import commit_id, version - print(f"Worblehat version {version}, commit {commit_id if commit_id else ''}") - return + print(f"Worblehat version {version}, commit {commit_id if commit_id else ''}") + return def _connect_to_database(**engine_args) -> Session: diff --git a/src/worblehat/queries/bookcase_item.py b/src/worblehat/queries/bookcase_item.py index 5d87375..0453a13 100644 --- a/src/worblehat/queries/bookcase_item.py +++ b/src/worblehat/queries/bookcase_item.py @@ -27,9 +27,7 @@ def search_bookcase_items_by_title(sql_session: Session, text: str) -> list[Book def search_bookcase_item_owners(sql_session: Session, text: str) -> list[str]: return list( sql_session.scalars( - select(BookcaseItem.owner) - .where(BookcaseItem.owner.ilike(f"%{text}%")) - .distinct(), + select(BookcaseItem.owner).where(BookcaseItem.owner.ilike(f"%{text}%")).distinct(), ).all(), )