diff --git a/printer.py b/printer.py index 06b35a3..3eab310 100644 --- a/printer.py +++ b/printer.py @@ -592,12 +592,13 @@ def fallback_program(*programs): return None _MagickExe = fallback_program('magick', 'magick.exe', 'convert', 'convert.exe') -if _MagickExe is None: - error(i18n("imagemagick-not-found")) def magick_text(stdin, image_width, font_size, font_family): 'Pipe an io to ImageMagick for processing text to image, return output io' read_fd, write_fd = os.pipe() + if _MagickExe is None: + error(i18n("imagemagick-not-found")) + exit(129) subprocess.Popen([_MagickExe, '-background', 'white', '-fill', 'black', '-size', f'{image_width}x', '-font', font_family, '-pointsize', str(font_size), 'caption:@-', 'pbm:-'], @@ -607,6 +608,9 @@ def magick_text(stdin, image_width, font_size, font_family): def magick_image(stdin, image_width, dither): 'Pipe an io to ImageMagick for processing "usual" image to pbm, return output io' read_fd, write_fd = os.pipe() + if _MagickExe is None: + error(i18n("imagemagick-not-found")) + exit(129) subprocess.Popen([_MagickExe, '-', '-fill', 'white', '-opaque', 'transparent', '-resize', f'{image_width}x', '-dither', dither, '-monochrome', 'pbm:-'], stdin=stdin, stdout=io.FileIO(write_fd, 'w')) diff --git a/www/lang/en-US.json b/www/lang/en-US.json index 5102b76..6da2fba 100644 --- a/www/lang/en-US.json +++ b/www/lang/en-US.json @@ -160,6 +160,6 @@ "scan": "Scan", "now-will-scan-for-all-bluetooth-devices-nearby": "Scan set to search for all bluetooth devides nearby.", "pf2-font-not-found-or-broken-0": "PF2 font not found or broken: '{0}'", - "imagemagick-not-found": "ImageMagick not found, please install it before trying any command line hackery." + "imagemagick-not-found": "ImageMagick not found, please install it and retry." } \ No newline at end of file diff --git a/www/lang/lolcat.json b/www/lang/lolcat.json index d1a0141..f898bf2 100644 --- a/www/lang/lolcat.json +++ b/www/lang/lolcat.json @@ -138,6 +138,6 @@ "now-will-scan-for-all-bluetooth-devices-nearby": "WIL FIND ALL THINY KITTE OR NOT", "scan": "FIND", "pf2-font-not-found-or-broken-0": "KITTE FONT LOST OR DEAD> {0}", - "image-magick-not-found": "IMAGEMAGICK NOT FINDZ, PLZ INSTALL IT BEFORE TRYIN ANY COMMAND LINE FEATUREZ." + "image-magick-not-found": "IMAGEMAGICK NOT FINDZ, PLZ INSTALL IT AND HAVES ANODA GO." } diff --git a/www/lang/zh-CN.json b/www/lang/zh-CN.json index c900570..629b585 100644 --- a/www/lang/zh-CN.json +++ b/www/lang/zh-CN.json @@ -150,5 +150,5 @@ "free-software": "自由软件", "free-software-description": "尊重您计算自由的软件。", "pf2-font-not-found-or-broken-0": "PF2 字体丢失或损坏:'{0}'", - "image-magick-not-found": "未找到 ImageMagick,请在尝试任何命令行功能之前安装它。" + "image-magick-not-found": "未找到 ImageMagick,请安装并重试。" } \ No newline at end of file diff --git a/www/lang/zh-HK.json b/www/lang/zh-HK.json index eae6d33..d793ed6 100644 --- a/www/lang/zh-HK.json +++ b/www/lang/zh-HK.json @@ -150,5 +150,5 @@ "free-software": "自由軟件", "free-software-description": "尊重您計算自由的軟件。", "pf2-font-not-found-or-broken-0": "PF2 字體丟失或損壞:'{0}'", - "imagemagick-not-found": "未找到 ImageMagick,請在嘗試任何命令行功能之前安裝它。" + "imagemagick-not-found": "未找到 ImageMagick,請安裝並重試。" } \ No newline at end of file diff --git a/www/lang/zh-Hant-CN.json b/www/lang/zh-Hant-CN.json index 205021b..1afb3a3 100644 --- a/www/lang/zh-Hant-CN.json +++ b/www/lang/zh-Hant-CN.json @@ -150,5 +150,5 @@ "free-software": "自由軟件", "free-software-description": "尊重您計算自由的軟件。", "pf2-font-not-found-or-broken-0": "PF2 字體丟失或損壞:'{0}'", - "imagemagick-not-found": "未找到 ImageMagick,請在嘗試任何命令行功能之前安裝它。" + "imagemagick-not-found": "未找到 ImageMagick,請安裝並重試。" } \ No newline at end of file diff --git a/www/lang/zh-TW.json b/www/lang/zh-TW.json index 011a2b3..2081b97 100644 --- a/www/lang/zh-TW.json +++ b/www/lang/zh-TW.json @@ -149,5 +149,5 @@ "javascript-catprinter-description": "貓咪印表機 (Cat-Printer) 主指令碼", "free-software": "自由軟體", "free-software-description": "尊重您計算自由的軟體。", - "pf2-font-not-found-or-broken-0": "未找到 ImageMagick,請在嘗試任何命令行功能之前安裝它。" + "pf2-font-not-found-or-broken-0": "未找到 ImageMagick,請安裝並重試。" } \ No newline at end of file