v/Cat-Printer
1
0
Fork 0
mirror of https://github.com/NaitLee/Cat-Printer.git synced 2025-05-18 00:00:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #66 from alexiri/bugs

Browse Source 
Fix a couple of bugs
This commit is contained in:
NaitLee 2023-05-15 19:36:02 +08:00 committed by GitHub
commit f75fecceee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -44,3 +44,4 @@ test.png
.directory .directory
thumbs.db thumbs.db
thumbs.db:encryptable thumbs.db:encryptable
env/

37
printer.py
View File

@ -734,23 +734,6 @@ def _main():
mode = 'pbm' 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 # Connect to printer
if args.dry: if args.dry:
info(i18n('dry-run-test-print-process-only')) info(i18n('dry-run-test-print-process-only'))
@ -769,7 +752,7 @@ def _main():
Printer = printer Printer = printer
return return
if len(devices) == 0: 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'): if len(devices) == 1 or getattr(args, '0th'):
info(i18n('connecting')) info(i18n('connecting'))
printer.connect(devices[0].name, devices[0].address) printer.connect(devices[0].name, devices[0].address)
@ -788,6 +771,24 @@ def _main():
pass pass
info(i18n('connecting')) info(i18n('connecting'))
printer.connect(devices[choice].name, devices[choice].address) printer.connect(devices[choice].name, devices[choice].address)
# 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')
)
try: try:
printer.print(file, mode=mode) printer.print(file, mode=mode)
info(i18n('finished')) info(i18n('finished'))