fix: use display scanner name in job summaries

- Universalized device name formatting in tools

Author: danillatency

src/bot/routers/printing/print_settings/printer_setup.py

@@ -18,7 +18,7 @@
     PrinterCallback,
     discard_job_settings_message,
     format_configure_message,
-    format_printer_status,
+    format_printer_name,
 )
 from src.bot.routers.tools import ensure_same_structural_message
 from src.config_schema import Printer
@@ -64,7 +64,7 @@ def printers_keyboard(statuses_and_printers: list[PrinterStatus | Printer]) -> I
     for status_or_printer in statuses_and_printers:
         if isinstance(status_or_printer, PrinterStatus):
             button = InlineKeyboardButton(
-                text=format_printer_status(status_or_printer),
+                text=format_printer_name(status_or_printer),
                 callback_data=PrinterCallback(cups_name=status_or_printer.printer.cups_name).pack(),
             )
         elif isinstance(status_or_printer, Printer):

src/bot/routers/printing/printing_tools.py

@@ -51,11 +51,11 @@ def format_configure_message(
         )
     }\n"
 
-    caption += html.bold(f"🖨 {format_printer_status(status)}\n")
+    caption += html.bold(f"🖨 {format_printer_name(status)}\n")
 
     layout = {"1": "1x1", "2": "1x2", "4": "2x2", "6": "2x3", "9": "3x3", "16": "4x4"}.get(data["number_up"])
     sides = "One side" if data["sides"] == "one-sided" else "Both sides"
-    display_printer = button_text_align_left(f"✏️ {status.printer.display_name if status else '—'}")
+    display_printer = button_text_align_left(f"✏️ {format_printer_name(status, False)}")
     display_copies = button_text_align_left(f"✏️ {data['copies']}")
     display_page_ranges = button_text_align_left(f"✏️ {data['page_ranges'] if data['page_ranges'] else 'all'}")
     display_layout = button_text_align_left(f"✏️ {layout}")
@@ -92,10 +92,12 @@ def format_configure_message(
     return caption, markup
 
 
-def format_printer_status(status: PrinterStatus) -> str:
+def format_printer_name(status: PrinterStatus | None, decorated_with_status=True) -> str:
     if not status:
         return "—"
     show_text = f"{status.printer.display_name}"
+    if not decorated_with_status:
+        return show_text
     if status.offline:
         show_text += ", ☠️ Offline"
     elif status.toner_percentage is not None and status.paper_percentage is not None:

src/bot/routers/scanning/scan_settings/scanner_setup.py

@@ -10,7 +10,7 @@
 from src.bot.routers.printing.printing_tools import discard_job_settings_message
 from src.bot.routers.scanning.scan_settings.mode_setup import start_scan_mode_setup
 from src.bot.routers.scanning.scanning_states import ScanWork
-from src.bot.routers.scanning.scanning_tools import ScanConfigureCallback, ScannerCallback, format_scanner_status
+from src.bot.routers.scanning.scanning_tools import ScanConfigureCallback, ScannerCallback, format_scanner_name
 from src.bot.routers.tools import ensure_same_structural_message
 from src.config_schema import Scanner
 from src.modules.scanning.entity_models import ScannerStatus
@@ -48,7 +48,7 @@ def scanners_keyboard(statuses_and_scanners: list[ScannerStatus | Scanner]) -> I
     for status_or_scanner in statuses_and_scanners:
         if isinstance(status_or_scanner, ScannerStatus):
             button = InlineKeyboardButton(
-                text=format_scanner_status(status_or_scanner),
+                text=format_scanner_name(status_or_scanner),
                 callback_data=ScannerCallback(name=status_or_scanner.scanner.name).pack(),
             )
         elif isinstance(status_or_scanner, Scanner):

src/bot/routers/scanning/scanning_tools.py

@@ -39,10 +39,10 @@ def format_configure_message(data: FSMData, scanner_status: ScannerStatus | None
         )
         text += "You will be able to scan multiple pages one-by-one.\n\n"
 
-    text += "📠 " + html.bold(format_scanner_status(scanner_status))
+    text += "📠 " + html.bold(format_scanner_name(scanner_status))
 
     display_mode = button_text_align_left(f"✏️ {f'{data["mode"].capitalize()} Scan' if data['mode'] else '—'}")
-    display_scanner = button_text_align_left(f"✏️ {scanner_status.scanner.display_name if scanner_status else '—'}")
+    display_scanner = button_text_align_left(f"✏️ {format_scanner_name(scanner_status, False)}")
     display_quality = button_text_align_left(f"✏️ {data['quality']} DPI")
     display_sides = button_text_align_left(f"✏️ {'One side' if data['scan_sides'] == 'false' else 'Both sides'}")
     display_crop = button_text_align_left(f"✏️ {'Disabled' if data['crop'] == 'false' else 'Enabled'}")
@@ -80,15 +80,13 @@ def format_configure_message(data: FSMData, scanner_status: ScannerStatus | None
     return text, markup
 
 
-def format_scanner_status(status: ScannerStatus) -> str:
+def format_scanner_name(status: ScannerStatus | None, decorated_with_status=True) -> str:
     if not status:
         return "—"
-    else:
-        show_text = f"{status.scanner.display_name}"
-        if status.offline:
-            return show_text + ", ☠️ offline"
-        else:
-            return show_text + ", ✔️ online"
+    show_text = f"{status.scanner.display_name}"
+    if not decorated_with_status:
+        return show_text
+    return show_text + f", {"☠️ offline" if status.offline else "✔️ online"}"
 
 
 def format_scanning_message(
@@ -110,7 +108,7 @@ def format_scanning_message(
 
 
 def scan_job_summary(data: FSMData, scanner_status: ScannerStatus | None) -> str:
-    display_scanner = html.bold(html.quote(scanner_status.scanner.name if scanner_status else "—"))
+    display_scanner = html.bold(html.quote(format_scanner_name(scanner_status, False)))
     display_quality = html.bold(html.quote(f"{data['quality']} DPI"))
     display_sides = html.bold("One side" if data["scan_sides"] == "false" else "Both sides")
     display_crop = html.bold("Disabled" if data["crop"] == "false" else "Enabled")