Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Also report stderr when file dialog helper fails

Browse Source
This commit is contained in:
Kovid Goyal 2017-08-02 19:19:56 +05:30
parent 88da204be8
commit dace872e8e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/calibre/gui2/linux_file_dialogs.py
View File

@ -12,6 +12,7 @@ from threading import Thread
from PyQt5.Qt import QEventLoop from PyQt5.Qt import QEventLoop
from calibre import force_unicode
from calibre.constants import filesystem_encoding, preferred_encoding from calibre.constants import filesystem_encoding, preferred_encoding
from calibre.utils.config import dynamic from calibre.utils.config import dynamic
@ -94,13 +95,21 @@ def image_extensions():
return image_extensions() return image_extensions()
def decode_output(raw):
raw = raw or b''
try:
return raw.decode(preferred_encoding)
except UnicodeDecodeError:
return force_unicode(raw, 'utf-8')
def run(cmd): def run(cmd):
from calibre.gui2 import sanitize_env_vars from calibre.gui2 import sanitize_env_vars
with sanitize_env_vars(): with sanitize_env_vars():
p = subprocess.Popen(list(map(encode_arg, cmd)), stdout=subprocess.PIPE) p = subprocess.Popen(list(map(encode_arg, cmd)), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
raw = p.communicate()[0] stdout, stderr = p.communicate()
ret = p.wait() ret = p.wait()
return raw, ret return ret, decode_output(stdout), decode_output(stderr)
# KDE {{{ # KDE {{{
@ -113,16 +122,12 @@ def kde_cmd(window, title, *rest):
def run_kde(cmd): def run_kde(cmd):
raw, ret = run(cmd) ret, stdout, stderr = run(cmd)
if ret == 1: if ret == 1:
return # canceled return # canceled
if ret != 0: if ret != 0:
raise ValueError('KDE file dialog aborted with return code: {}'.format(ret)) raise ValueError('KDE file dialog aborted with return code: {} and stderr: {}'.format(ret, stderr))
try: ans = stdout.splitlines()
ans = raw.decode(filesystem_encoding)
except UnicodeDecodeError:
ans = raw.decode('utf-8')
ans = ans.splitlines()
return ans return ans
@ -199,16 +204,12 @@ def zenity_cmd(window, title, *rest):
def run_zenity(cmd): def run_zenity(cmd):
raw, ret = run(cmd) ret, stdout, stderr = run(cmd)
if ret == 1: if ret == 1:
return # canceled return # canceled
if ret != 0: if ret != 0:
raise ValueError('GTK file dialog aborted with return code: {}'.format(ret)) raise ValueError('GTK file dialog aborted with return code: {} and stderr: {}'.format(ret, stderr))
try: ans = stdout.splitlines()
ans = raw.decode(filesystem_encoding)
except UnicodeDecodeError:
ans = raw.decode('utf-8')
ans = ans.splitlines()
return ans return ans
@ -320,7 +321,7 @@ def linux_native_dialog(name):
if __name__ == '__main__': if __name__ == '__main__':
# print(repr(kdialog_choose_dir(None, 'testkddcd', 'Testing choose dir...'))) print(repr(kdialog_choose_dir(None, 'testkddcd', 'Testing choose dir...')))
# print(repr(kdialog_choose_files(None, 'testkddcf', 'Testing choose files...', select_only_single_file=True, filters=[ # print(repr(kdialog_choose_files(None, 'testkddcf', 'Testing choose files...', select_only_single_file=True, filters=[
# ('moo', 'epub png'.split()), ('boo', 'docx'.split())], all_files=False))) # ('moo', 'epub png'.split()), ('boo', 'docx'.split())], all_files=False)))
# print(repr(kdialog_choose_images(None, 'testkddci', 'Testing choose images...'))) # print(repr(kdialog_choose_images(None, 'testkddci', 'Testing choose images...')))
@ -330,4 +331,4 @@ if __name__ == '__main__':
# None, 'testzcf', 'Testing choose files...', select_only_single_file=False, # None, 'testzcf', 'Testing choose files...', select_only_single_file=False,
# filters=[('moo', 'epub png'.split()), ('boo', 'docx'.split())], all_files=True))) # filters=[('moo', 'epub png'.split()), ('boo', 'docx'.split())], all_files=True)))
# print(repr(kdialog_choose_images(None, 'testzi', 'Testing choose images...'))) # print(repr(kdialog_choose_images(None, 'testzi', 'Testing choose images...')))
print(repr(zenity_choose_save_file(None, 'testzcs', 'Testing choose save file...', filters=[('x', 'epub'.split())]))) # print(repr(zenity_choose_save_file(None, 'testzcs', 'Testing choose save file...', filters=[('x', 'epub'.split())])))