Delete temp dir not shown in tasks overview
Handle case no cover during convert ebook
This commit is contained in:
parent
7fbbb85f47
commit
fd90d6e375
|
@ -33,7 +33,7 @@ def get_scheduled_tasks(reconnect=True):
|
||||||
tasks.append([lambda: TaskReconnectDatabase(), 'reconnect', False])
|
tasks.append([lambda: TaskReconnectDatabase(), 'reconnect', False])
|
||||||
|
|
||||||
# Delete temp folder
|
# Delete temp folder
|
||||||
tasks.append([lambda: TaskDeleteTempFolder(), 'delete temp', False])
|
tasks.append([lambda: TaskDeleteTempFolder(), 'delete temp', True])
|
||||||
|
|
||||||
# Generate metadata.opf file for each changed book
|
# Generate metadata.opf file for each changed book
|
||||||
if config.schedule_metadata_backup:
|
if config.schedule_metadata_backup:
|
||||||
|
@ -91,7 +91,7 @@ def register_startup_tasks():
|
||||||
if constants.APP_MODE in ['development', 'test'] and not should_task_be_running(start, duration):
|
if constants.APP_MODE in ['development', 'test'] and not should_task_be_running(start, duration):
|
||||||
scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(False))
|
scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(False))
|
||||||
else:
|
else:
|
||||||
scheduler.schedule_tasks_immediately(tasks=[[lambda: TaskDeleteTempFolder(), 'delete temp', False]])
|
scheduler.schedule_tasks_immediately(tasks=[[lambda: TaskDeleteTempFolder(), 'delete temp', True]])
|
||||||
|
|
||||||
|
|
||||||
def should_task_be_running(start, duration):
|
def should_task_be_running(start, duration):
|
||||||
|
|
|
@ -49,6 +49,7 @@ class TaskConvert(CalibreTask):
|
||||||
self.file_path = file_path
|
self.file_path = file_path
|
||||||
self.book_id = book_id
|
self.book_id = book_id
|
||||||
self.title = ""
|
self.title = ""
|
||||||
|
self.has_cover = None
|
||||||
self.settings = settings
|
self.settings = settings
|
||||||
self.ereader_mail = ereader_mail
|
self.ereader_mail = ereader_mail
|
||||||
self.user = user
|
self.user = user
|
||||||
|
@ -161,7 +162,8 @@ class TaskConvert(CalibreTask):
|
||||||
if not os.path.exists(config.config_converterpath):
|
if not os.path.exists(config.config_converterpath):
|
||||||
self._handleError(N_("Calibre ebook-convert %(tool)s not found", tool=config.config_converterpath))
|
self._handleError(N_("Calibre ebook-convert %(tool)s not found", tool=config.config_converterpath))
|
||||||
return
|
return
|
||||||
check, error_message = self._convert_calibre(file_path, format_old_ext, format_new_ext)
|
has_cover = local_db.get_book(book_id).has_cover
|
||||||
|
check, error_message = self._convert_calibre(file_path, format_old_ext, format_new_ext, has_cover)
|
||||||
|
|
||||||
if check == 0:
|
if check == 0:
|
||||||
cur_book = local_db.get_book(book_id)
|
cur_book = local_db.get_book(book_id)
|
||||||
|
@ -233,7 +235,7 @@ class TaskConvert(CalibreTask):
|
||||||
folder=os.path.dirname(file_path))
|
folder=os.path.dirname(file_path))
|
||||||
return check, None
|
return check, None
|
||||||
|
|
||||||
def _convert_calibre(self, file_path, format_old_ext, format_new_ext):
|
def _convert_calibre(self, file_path, format_old_ext, format_new_ext, has_cover):
|
||||||
book_id = self.book_id
|
book_id = self.book_id
|
||||||
try:
|
try:
|
||||||
# Linux py2.7 encode as list without quotes no empty element for parameters
|
# Linux py2.7 encode as list without quotes no empty element for parameters
|
||||||
|
@ -257,8 +259,9 @@ class TaskConvert(CalibreTask):
|
||||||
|
|
||||||
quotes = [1, 2, 4, 6]
|
quotes = [1, 2, 4, 6]
|
||||||
command = [config.config_converterpath, (file_path + format_old_ext),
|
command = [config.config_converterpath, (file_path + format_old_ext),
|
||||||
(file_path + format_new_ext), '--from-opf', path_tmp_opf,
|
(file_path + format_new_ext), '--from-opf', path_tmp_opf]
|
||||||
'--cover', os.path.join(os.path.dirname(file_path), 'cover.jpg')]
|
if has_cover:
|
||||||
|
command.extend(['--cover', os.path.join(os.path.dirname(file_path), 'cover.jpg')])
|
||||||
quotes_index = 3
|
quotes_index = 3
|
||||||
if config.config_calibre:
|
if config.config_calibre:
|
||||||
parameters = config.config_calibre.split(" ")
|
parameters = config.config_calibre.split(" ")
|
||||||
|
|
Loading…
Reference in New Issue
Block a user