RunasSudo/gimp-xsanecli
1
Fork 0
Code Issues Pull Requests Activity

Compare commits

base: RunasSudo:df8c4042c4d23d7f755dd911bc081b854b7d7b44
Branches Tags
RunasSudo:master
...
compare: RunasSudo:c86630230a41f6c3f96d9a6f2e1c4164ea8ec749
Branches Tags
RunasSudo:master

2 Commits
df8c4042c4 ... c86630230a

Author SHA1 Message Date
RunasSudo
c86630230a
Correct copyright metadata 2025-04-20 16:30:44 +10:00
Piotr Chmura
ec6495eecc
Gracefully handle non-UTF8 characters in xsane output 
Thanks to Peter for the fix
 2025-04-20 16:28:05 +10:00
2 changed files with 20 additions and 23 deletions
Show Stats Expand all files Collapse all files

1
CONTRIBUTORS Normal file
View File

@ -0,0 +1 @@
Piotr Chmura

24
xsanecli.py Executable file → Normal file
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3
# GIMP 3.0 plug-in for scanning via XSane
# Copyright (C) 2024-2025 Lee Yingtong Li (RunasSudo)
# Copyright (C) 2024-2025 Lee Yingtong Li (RunasSudo) and CONTRIBUTORS
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -52,19 +52,15 @@ def xsanecli_run(procedure, config, run_data, *args):
args = ['xsane', '--save', '--no-mode-selection', '--force-filename', png_out, '--print-filenames'] + ([DEVICE_NAME] if DEVICE_NAME else [])
proc = subprocess.Popen(args, stdout=subprocess.PIPE, encoding='utf-8', env=xsane_env)
while True:
while proc.poll() is None:
# Wait until XSane prints the name of the scanned file, indicating scanning is finished
# This blocks Python but that is ok because GIMP UI is not affected
try:
result = proc.stdout.readline().strip()
except UnicodeDecodeError as e:
result = ''
if result == '':
# XSane was closed
break
if result != 'XSANE_IMAGE_FILENAME: ' + png_out:
Gimp.message('Unexpected XSane result')
return Gimp.ValueArray.new_from_values([GObject.Value(Gimp.PDBStatusType, Gimp.PDBStatusType.EXECUTION_ERROR)])
if result == 'XSANE_IMAGE_FILENAME: ' + png_out:
# Open image
image = Gimp.file_load(Gimp.RunMode.NONINTERACTIVE, Gio.File.new_for_path(png_out))
Gimp.Display.new(image)
@ -74,7 +70,7 @@ def xsanecli_run(procedure, config, run_data, *args):
if not SCAN_MULTIPLE:
proc.terminate()
break
os.rmdir(tempdir)
@ -99,9 +95,9 @@ class XSaneCLI(Gimp.PlugIn):
raise Exception('Unknown procedure')
procedure.set_attribution(
'Lee Yingtong Li (RunasSudo)', # Author
'Lee Yingtong Li (RunasSudo)', # Copyright
'Lee Yingtong Li (RunasSudo)' # Year
'Lee Yingtong Li (RunasSudo) and CONTRIBUTORS', # Author
'Lee Yingtong Li (RunasSudo) and CONTRIBUTORS', # Copyright
'2024–2025' # Year
)
return procedure