NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update for running calibre-convert in docker

Browse Source
This commit is contained in:
OzzieIsaacs 2018-08-22 21:24:28 +02:00
parent 7917347508
commit 72fff2a297
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cps/worker.py
View File

@ -233,15 +233,23 @@ class WorkerThread(threading.Thread):
if web.ub.config.config_ebookconverter == 1: if web.ub.config.config_ebookconverter == 1:
command = [web.ub.config.config_converterpath, u'"' + file_path + u'.epub"'] command = [web.ub.config.config_converterpath, u'"' + file_path + u'.epub"']
else: else:
command = [web.ub.config.config_converterpath, '"' + file_path + u'.epub"', # Linux py2.7 encode as list without quotes no empty element for parameters
'"'+file_path + u'.mobi"'] # linux py3.x no encode and as list without quotes no empty element for parameters
if web.ub.config.config_calibre: # windows py2.7 encode as string with qoutes empty element for parameters is okay
command.append(web.ub.config.config_calibre) # windows py 3.x no encode and as string with qoutes empty element for parameters is okay
# special handling for windows # seperate handling for windows and linux
if os.name == 'nt': if os.name == 'nt':
command = ' '.join(command) command = web.ub.config.config_converterpath + u' "' + file_path + u'.epub" "' + \
file_path + u'.mobi" ' + web.ub.config.config_calibre
if sys.version_info < (3, 0): if sys.version_info < (3, 0):
command = command.encode(sys.getfilesystemencoding()) command = command.encode(sys.getfilesystemencoding())
else:
command = [web.ub.config.config_converterpath, (file_path + u'.epub'),
(file_path + u'.mobi')]
if web.ub.config.config_calibre:
command.append(web.ub.config.config_calibre)
if sys.version_info < (3, 0):
command = [ x.encode(sys.getfilesystemencoding()) for x in command ]
p = subprocess.Popen(command, stdout=subprocess.PIPE, universal_newlines=True) p = subprocess.Popen(command, stdout=subprocess.PIPE, universal_newlines=True)
except OSError as e: except OSError as e: