From 994b707b5c376c23e845ce2a1179106f7f82bca5 Mon Sep 17 00:00:00 2001 From: Alex Iribarren Date: Sat, 13 May 2023 18:59:04 +0200 Subject: [PATCH 1/4] Fix call to error function --- printer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/printer.py b/printer.py index c2839d7..0023d77 100644 --- a/printer.py +++ b/printer.py @@ -769,7 +769,7 @@ def _main(): Printer = printer return if len(devices) == 0: - error(i18n('no-available-devices-found'), error=PrinterError) + error(i18n('no-available-devices-found'), exception=PrinterError) if len(devices) == 1 or getattr(args, '0th'): info(i18n('connecting')) printer.connect(devices[0].name, devices[0].address) From 0aa68adc065004cadbdb684dde98f5e37f45b4f1 Mon Sep 17 00:00:00 2001 From: Alex Iribarren Date: Sat, 13 May 2023 19:02:02 +0200 Subject: [PATCH 2/4] Connect to camera first so we know the paper_width --- printer.py | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/printer.py b/printer.py index 0023d77..4f379a7 100644 --- a/printer.py +++ b/printer.py @@ -734,23 +734,6 @@ def _main(): mode = 'pbm' - # Prepare image / text - if args.text: - info(i18n('text-printing-mode')) - printer.font_family = font_family or 'font' - if 'pf2' not in text_param: - file = magick_text(file, printer.model.paper_width, - font_size, font_family) - else: - printer.font_scale = font_size - mode = 'text' - elif args.convert: - file = magick_image(file, printer.model.paper_width, ( - 'None' - if args.convert == 'text' - else 'FloydSteinberg') - ) - # Connect to printer if args.dry: info(i18n('dry-run-test-print-process-only')) @@ -788,6 +771,25 @@ def _main(): pass info(i18n('connecting')) printer.connect(devices[choice].name, devices[choice].address) + + # Prepare image / text + print(f"printer: {printer.model}") + if args.text: + info(i18n('text-printing-mode')) + printer.font_family = font_family or 'font' + if 'pf2' not in text_param: + file = magick_text(file, printer.model.paper_width, + font_size, font_family) + else: + printer.font_scale = font_size + mode = 'text' + elif args.convert: + file = magick_image(file, printer.model.paper_width, ( + 'None' + if args.convert == 'text' + else 'FloydSteinberg') + ) + try: printer.print(file, mode=mode) info(i18n('finished')) From 32c5359f34f70a86fe5c6f38de2a492d348b10fa Mon Sep 17 00:00:00 2001 From: Alex Iribarren Date: Sat, 13 May 2023 19:03:36 +0200 Subject: [PATCH 3/4] Add env/ to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fcadbe0..7e776ae 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ test.png .directory thumbs.db thumbs.db:encryptable +env/ From d65db504b0f947092c28dc0a338f897449609786 Mon Sep 17 00:00:00 2001 From: Alex Iribarren Date: Mon, 15 May 2023 11:26:31 +0200 Subject: [PATCH 4/4] Remove left-over debug message --- printer.py | 1 - 1 file changed, 1 deletion(-) diff --git a/printer.py b/printer.py index 4f379a7..ec8151b 100644 --- a/printer.py +++ b/printer.py @@ -773,7 +773,6 @@ def _main(): printer.connect(devices[choice].name, devices[choice].address) # Prepare image / text - print(f"printer: {printer.model}") if args.text: info(i18n('text-printing-mode')) printer.font_family = font_family or 'font'