From 7c623941de04f8c3612facf187b27eb28d29238b Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Mon, 7 Feb 2022 13:55:18 +0100 Subject: [PATCH] Bugfixes after testrun Enabled re-encode of bookformats --- cps/editbooks.py | 2 +- cps/tasks/convert.py | 62 +++---- test/Calibre-Web TestSummary_Linux.html | 210 +++++++++++++++--------- 3 files changed, 167 insertions(+), 107 deletions(-) diff --git a/cps/editbooks.py b/cps/editbooks.py index 9fce1272..fcf043a5 100755 --- a/cps/editbooks.py +++ b/cps/editbooks.py @@ -670,7 +670,7 @@ def upload_single_file(request, book, book_id): # Queue uploader info link = '{}'.format(url_for('web.show_book', book_id=book.id), escape(book.title)) uploadText=_(u"File format %(ext)s added to %(book)s", ext=file_ext.upper(), book=link) - WorkerThread.add(current_user.name, TaskUpload(uploadText), escape(book.title)) + WorkerThread.add(current_user.name, TaskUpload(uploadText, escape(book.title))) return uploader.process( saved_filename, *os.path.splitext(requested_file.filename), diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py index 90513b09..c8b8229c 100644 --- a/cps/tasks/convert.py +++ b/cps/tasks/convert.py @@ -118,21 +118,24 @@ class TaskConvert(CalibreTask): self.title = cur_book.title self.results['path'] = cur_book.path self.results['title'] = self.title - new_format = db.Data(name=os.path.basename(file_path), - book_format=self.settings['new_book_format'].upper(), - book=book_id, uncompressed_size=os.path.getsize(file_path + format_new_ext)) - try: - local_db.session.merge(new_format) - local_db.session.commit() - except SQLAlchemyError as e: - local_db.session.rollback() - log.error("Database error: %s", e) + new_format = local_db.session.query(db.Data).filter(db.Data.book == book_id)\ + .filter(db.Data.format == self.settings['new_book_format'].upper()).one_or_none() + if not new_format: + new_format = db.Data(name=os.path.basename(file_path), + book_format=self.settings['new_book_format'].upper(), + book=book_id, uncompressed_size=os.path.getsize(file_path + format_new_ext)) + try: + local_db.session.merge(new_format) + local_db.session.commit() + except SQLAlchemyError as e: + local_db.session.rollback() + log.error("Database error: %s", e) + local_db.session.close() + self._handleError(error_message) + return + self._handleSuccess() local_db.session.close() - self._handleError(error_message) - return - self._handleSuccess() - local_db.session.close() - return os.path.basename(file_path + format_new_ext) + return os.path.basename(file_path + format_new_ext) else: log.info("Book id %d - target format of %s does not exist. Moving forward with convert.", book_id, @@ -153,22 +156,25 @@ class TaskConvert(CalibreTask): if check == 0: cur_book = local_db.get_book(book_id) if os.path.isfile(file_path + format_new_ext): - new_format = db.Data(name=cur_book.data[0].name, + new_format = local_db.session.query(db.Data).filter(db.Data.book == book_id) \ + .filter(db.Data.format == self.settings['new_book_format'].upper()).one_or_none() + if not new_format: + new_format = db.Data(name=cur_book.data[0].name, book_format=self.settings['new_book_format'].upper(), book=book_id, uncompressed_size=os.path.getsize(file_path + format_new_ext)) - try: - local_db.session.merge(new_format) - local_db.session.commit() - if self.settings['new_book_format'].upper() in ['KEPUB', 'EPUB', 'EPUB3']: - ub_session = ini() - remove_synced_book(book_id, True, ub_session) - ub_session.close() - except SQLAlchemyError as e: - local_db.session.rollback() - log.error("Database error: %s", e) - local_db.session.close() - self._handleError(error_message) - return + try: + local_db.session.merge(new_format) + local_db.session.commit() + if self.settings['new_book_format'].upper() in ['KEPUB', 'EPUB', 'EPUB3']: + ub_session = ini() + remove_synced_book(book_id, True, ub_session) + ub_session.close() + except SQLAlchemyError as e: + local_db.session.rollback() + log.error("Database error: %s", e) + local_db.session.close() + self._handleError(error_message) + return self.results['path'] = cur_book.path self.title = cur_book.title self.results['title'] = self.title diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index bd12238c..1be6540c 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2022-02-01 20:32:05

+

Start Time: 2022-02-06 21:09:18

-

Stop Time: 2022-02-02 00:57:41

+

Stop Time: 2022-02-07 01:33:46

-

Duration: 3h 39 min

+

Duration: 3h 38 min

@@ -639,11 +639,11 @@ - + TestEbookConvertKepubify 3 - 3 - 0 + 2 + 1 0 0 @@ -662,11 +662,33 @@ - +
TestEbookConvertKepubify - test_convert_only
- PASS + +
+ FAIL +
+ + + + @@ -681,11 +703,11 @@ - + TestEbookConvertGDriveKepubify 3 - 3 - 0 + 2 + 1 0 0 @@ -704,11 +726,33 @@ - +
TestEbookConvertGDriveKepubify - test_convert_only
- PASS + +
+ FAIL +
+ + + + @@ -723,13 +767,13 @@ - + TestEditAdditionalBooks 19 - 17 - 0 + 15 0 2 + 2 Detail @@ -764,20 +808,70 @@ - +
TestEditAdditionalBooks - test_delete_role
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_details_popup
- PASS + +
+ ERROR +
+ + + + @@ -1351,11 +1445,11 @@ - + TestEditAuthorsGdrive 6 - 5 - 1 + 6 + 0 0 0 @@ -1410,31 +1504,11 @@ - +
TestEditAuthorsGdrive - test_rename_capital_on_upload
- -
- FAIL -
- - - - + PASS @@ -1617,13 +1691,13 @@ AssertionError: <selenium.webdriver.remote.webelement.WebElement (session= - + TestLoadMetadata 1 - 0 1 0 0 + 0 Detail @@ -1631,31 +1705,11 @@ AssertionError: <selenium.webdriver.remote.webelement.WebElement (session= - +
TestLoadMetadata - test_load_metadata
- -
- FAIL -
- - - - + PASS @@ -4572,9 +4626,9 @@ AssertionError: 0.0 not greater than or equal to 0.05 Total 404 - 395 + 393 + 2 2 - 0 7   @@ -4741,7 +4795,7 @@ AssertionError: 0.0 not greater than or equal to 0.05 httplib2 - 0.20.2 + 0.20.4 TestCliGdrivedb @@ -4771,7 +4825,7 @@ AssertionError: 0.0 not greater than or equal to 0.05 httplib2 - 0.20.2 + 0.20.4 TestEbookConvertCalibreGDrive @@ -4801,7 +4855,7 @@ AssertionError: 0.0 not greater than or equal to 0.05 httplib2 - 0.20.2 + 0.20.4 TestEbookConvertGDriveKepubify @@ -4843,7 +4897,7 @@ AssertionError: 0.0 not greater than or equal to 0.05 httplib2 - 0.20.2 + 0.20.4 TestEditAuthorsGdrive @@ -4879,7 +4933,7 @@ AssertionError: 0.0 not greater than or equal to 0.05 httplib2 - 0.20.2 + 0.20.4 TestEditBooksOnGdrive @@ -4921,7 +4975,7 @@ AssertionError: 0.0 not greater than or equal to 0.05 httplib2 - 0.20.2 + 0.20.4 TestSetupGdrive @@ -5005,7 +5059,7 @@ AssertionError: 0.0 not greater than or equal to 0.05