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

Fix for convert + email task with gdrive

Browse Source
This commit is contained in:
Ozzieisaacs 2020-09-30 19:29:57 +02:00
parent 2d98285545
commit 0d64692c84
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cps/editbooks.py
View File

@ -260,7 +260,7 @@ def delete_book(book_id, book_format, jsonResponse):
filter(db.Data.format == book_format).delete() filter(db.Data.format == book_format).delete()
calibre_db.session.commit() calibre_db.session.commit()
except Exception as e: except Exception as e:
log.debug(e) log.exception(e)
calibre_db.session.rollback() calibre_db.session.rollback()
else: else:
# book not found # book not found

5
cps/tasks/convert.py
View File

@ -52,7 +52,6 @@ class TaskConvert(CalibreTask):
return self._handleError(str(e)) return self._handleError(str(e))
def _convert_ebook_format(self): def _convert_ebook_format(self):
error_message = None
local_session = db.Session() local_session = db.Session()
file_path = self.file_path file_path = self.file_path
book_id = self.bookid book_id = self.bookid
@ -68,7 +67,7 @@ class TaskConvert(CalibreTask):
self.results['path'] = file_path self.results['path'] = file_path
self.results['title'] = cur_book.title self.results['title'] = cur_book.title
self._handleSuccess() self._handleSuccess()
return file_path + format_new_ext return os.path.basename(file_path + format_new_ext)
else: else:
log.info("Book id %d - target format of %s does not exist. Moving forward with convert.", log.info("Book id %d - target format of %s does not exist. Moving forward with convert.",
book_id, book_id,
@ -105,7 +104,7 @@ class TaskConvert(CalibreTask):
if config.config_use_google_drive: if config.config_use_google_drive:
os.remove(file_path + format_old_ext) os.remove(file_path + format_old_ext)
self._handleSuccess() self._handleSuccess()
return file_path + format_new_ext return os.path.basename(file_path + format_new_ext)
else: else:
error_message = _('%(format)s format not found on disk', format=format_new_ext.upper()) error_message = _('%(format)s format not found on disk', format=format_new_ext.upper())
log.info("ebook converter failed with error while converting book") log.info("ebook converter failed with error while converting book")