From c2ee66c39448941200ae0adb50fe12395c6e2fe4 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Wed, 4 Feb 2026 00:01:38 +0900 Subject: [PATCH] treewide: format --- dibbler/lib/printer_helpers.py | 1 - dibbler/main.py | 6 +++--- dibbler/menus/addstock.py | 3 ++- dibbler/menus/buymenu.py | 8 ++++++-- dibbler/menus/helpermenus.py | 11 +++++++---- dibbler/menus/miscmenus.py | 18 +++++++++++------- dibbler/menus/printermenu.py | 1 - 7 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dibbler/lib/printer_helpers.py b/dibbler/lib/printer_helpers.py index 6646df3..37c5707 100644 --- a/dibbler/lib/printer_helpers.py +++ b/dibbler/lib/printer_helpers.py @@ -1,4 +1,3 @@ - # import barcode # from brother_ql.brother_ql_create import create_label # from brother_ql.raster import BrotherQLRaster diff --git a/dibbler/main.py b/dibbler/main.py index 4190d3f..430f0af 100644 --- a/dibbler/main.py +++ b/dibbler/main.py @@ -35,9 +35,9 @@ def main(): engine = create_engine(config_db_string()) sql_session = Session( - engine, - expire_on_commit=False, - autoflush=False, + engine, + expire_on_commit=False, + autoflush=False, ) if args.subcommand == "loop": diff --git a/dibbler/menus/addstock.py b/dibbler/menus/addstock.py index fbc8e53..189d367 100644 --- a/dibbler/menus/addstock.py +++ b/dibbler/menus/addstock.py @@ -142,7 +142,8 @@ much money you're due in credits for the purchase when prompted.\n""" ceil(float(value) / (max(product.stock, 0) + self.products[product][0])), ) product.stock = max( - self.products[product][0], product.stock + self.products[product][0], + self.products[product][0], + product.stock + self.products[product][0], ) product.hidden = False print( diff --git a/dibbler/menus/buymenu.py b/dibbler/menus/buymenu.py index 7b6f8a2..711b8a0 100644 --- a/dibbler/menus/buymenu.py +++ b/dibbler/menus/buymenu.py @@ -162,7 +162,8 @@ When finished, write an empty line to confirm the purchase.\n""" if thing is None: if not self.complete_input(): if self.confirm( - "Not enough information entered. Abort purchase?", default=True, + "Not enough information entered. Abort purchase?", + default=True, ): return False continue @@ -219,7 +220,10 @@ When finished, write an empty line to confirm the purchase.\n""" string += "(empty)" else: string += ", ".join( - [t.user.name + ("*" if not self.credit_check(t.user) else "") for t in transactions], + [ + t.user.name + ("*" if not self.credit_check(t.user) else "") + for t in transactions + ], ) string += "\n products: " if len(entries) == 0: diff --git a/dibbler/menus/helpermenus.py b/dibbler/menus/helpermenus.py index daa9fd5..4ac5e71 100644 --- a/dibbler/menus/helpermenus.py +++ b/dibbler/menus/helpermenus.py @@ -433,9 +433,10 @@ class Menu: selection = selector.execute() if selection == "create": username = self.input_str( - "Username for new user (should be same as PVV username)", - User.name_re, - (1, 10), + prompt="Username for new user (should be same as PVV username)", + end_prompt=None, + regex=User.name_re, + length_range=(1, 10), ) user = User(username, string) self.sql_session.add(user) @@ -625,7 +626,9 @@ class ConfirmMenu(Menu): options = {True: "[y]/n", False: "y/[n]", None: "y/n"}[self.default] while True: result = self.input_str( - f"{self.prompt} ({options})", end_prompt=": ", timeout=self.timeout, + f"{self.prompt} ({options})", + end_prompt=": ", + timeout=self.timeout, ) result = result.lower().strip() if result in ["y", "yes"]: diff --git a/dibbler/menus/miscmenus.py b/dibbler/menus/miscmenus.py index 6bcdd60..0639365 100644 --- a/dibbler/menus/miscmenus.py +++ b/dibbler/menus/miscmenus.py @@ -212,11 +212,15 @@ class ProductSearchMenu(Menu): self.print_header() self.set_context("Enter (part of) product name or bar code") product = self.input_product() - print(", ".join([ - f"Result: {product.name}", - f"price: {product.price} kr", - f"bar code: {product.bar_code}", - f"stock: {product.stock}", - f"hidden: {'Y' if product.hidden else 'N'}", - ])) + print( + ", ".join( + [ + f"Result: {product.name}", + f"price: {product.price} kr", + f"bar code: {product.bar_code}", + f"stock: {product.stock}", + f"hidden: {'Y' if product.hidden else 'N'}", + ] + ) + ) # self.pause() diff --git a/dibbler/menus/printermenu.py b/dibbler/menus/printermenu.py index b3527c9..41aceab 100644 --- a/dibbler/menus/printermenu.py +++ b/dibbler/menus/printermenu.py @@ -1,4 +1,3 @@ - from sqlalchemy.orm import Session # from dibbler.lib.printer_helpers import print_bar_code, print_name_label