Merge remote-tracking branch 'worker/db' into Develop

# Conflicts: # cps/tasks/convert.py
2020-10-06 21:40:47 +02:00
parent 4b68a6ff23 0480edce2a
commit 3b8e5ddfb3
4 changed files with 880 additions and 457 deletions
@@ -70,7 +70,8 @@ class TaskConvert(CalibreTask):
                    return self._handleError(str(e))

    def _convert_ebook_format(self):
-        local_session = db.Session()
+        error_message = None
+        local_session = db.CalibreDB()
        file_path = self.file_path
        book_id = self.bookid
        format_old_ext = u'.' + self.settings['old_book_format'].lower()