diff --git a/cps/editbooks.py b/cps/editbooks.py index 80e73697..6eefc61f 100644 --- a/cps/editbooks.py +++ b/cps/editbooks.py @@ -455,7 +455,7 @@ def do_edit_book(book_id, upload_formats=None): # Update folder of book on local disk edited_books_id = None title_author_error = None - upload_mode = False + # upload_mode = False # handle book title change if "title" in to_save: title_change = handle_title_on_edit(book, to_save["title"]) @@ -1005,7 +1005,7 @@ def edit_book_ratings(to_save, book): def edit_book_tags(tags, book): - if tags: + if tags is not None: input_tags = tags.split(',') input_tags = list(map(lambda it: strip_whitespaces(it), input_tags)) # Remove duplicates @@ -1014,7 +1014,7 @@ def edit_book_tags(tags, book): return False def edit_book_series(series, book): - if series: + if series is not None: input_series = [strip_whitespaces(series)] input_series = [x for x in input_series if x != ''] return modify_database_object(input_series, book.series, db.Series, calibre_db.session, 'series') @@ -1054,10 +1054,13 @@ def edit_book_comments(comments, book): def edit_book_languages(languages, book, upload_mode=False, invalid=None): - if languages: + if languages is not None: input_languages = languages.split(',') unknown_languages = [] - input_l = isoLanguages.get_language_code_from_name(get_locale(), input_languages, unknown_languages) + if not upload_mode: + input_l = isoLanguages.get_language_code_from_name(get_locale(), input_languages, unknown_languages) + else: + input_l = isoLanguages.get_valid_language_codes_from_code(get_locale(), input_languages, unknown_languages) for lang in unknown_languages: log.error("'%s' is not a valid language", lang) if isinstance(invalid, list): @@ -1078,7 +1081,7 @@ def edit_book_languages(languages, book, upload_mode=False, invalid=None): def edit_book_publisher(publishers, book): - if publishers: + if publishers is not None: changed = False if publishers: publisher = strip_whitespaces(publishers) @@ -1169,7 +1172,7 @@ def edit_cc_data(book_id, book, to_save, cc): changed = False for c in cc: cc_string = "custom_column_" + str(c.id) - if to_save.get(cc_string): + if to_save.get(cc_string) is not None: if not c.is_multiple: if len(getattr(book, cc_string)) > 0: cc_db_value = getattr(book, cc_string)[0].value @@ -1279,11 +1282,11 @@ def upload_book_formats(requested_files, book, book_id, no_cover=True): rar_executable=config.config_rarfile_location, no_cover=no_cover) merge_metadata(book, meta, to_save) - if to_save.get('languages'): - langs = [] - for lang_code in to_save['languages']: - langs.append(isoLanguages.get_language_name(get_locale(), lang_code)) - to_save['languages'] = ",".join(langs) + #if to_save.get('languages'): + # langs = [] + # for lang_code in to_save['languages'].split(','): + # langs.append(isoLanguages.get_language_name(get_locale(), lang_code)) + # to_save['languages'] = ",".join(langs) return to_save, error diff --git a/cps/search.py b/cps/search.py index 29dda16d..8cdb9b4a 100644 --- a/cps/search.py +++ b/cps/search.py @@ -265,7 +265,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None): pub_end = term.get("publishend") rating_low = term.get("ratinghigh") rating_high = term.get("ratinglow") - description = term.get("comments") + description = term.get("comment") read_status = term.get("read_status") if author_name: author_name = strip_whitespaces(author_name).lower().replace(',', '|') diff --git a/cps/templates/search_form.html b/cps/templates/search_form.html index 58585d28..bdd8d8fc 100644 --- a/cps/templates/search_form.html +++ b/cps/templates/search_form.html @@ -151,8 +151,8 @@
Start Time: 2024-08-16 21:16:11
+Start Time: 2024-08-20 20:27:17
Stop Time: 2024-08-17 04:31:06
+Stop Time: 2024-08-21 03:36:02
Duration: 6h 5 min
+Duration: 6h 2 min
Traceback (most recent call last): - File "/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py", line 495, in test_thumbnail_cache - self.assertEqual(count_files(thumbnail_cache_path), 30) -AssertionError: 25 != 30-
Traceback (most recent call last): - File "/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py", line 765, in test_delete_role - submit.click() - File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webelement.py", line 93, in click - self._execute(Command.CLICK_ELEMENT) - File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webelement.py", line 403, in _execute - return self._parent.execute(command, params) - File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py", line 440, in execute - self.error_handler.check_response(response) - File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py", line 245, in check_response - raise exception_class(message, screen, stacktrace) -selenium.common.exceptions.ElementClickInterceptedException: Message: Element <button id="submit" class="btn btn-default" type="submit"> is not clickable at point (688,665) because another element <div class="modal-backdrop fade in"> obscures it -Stacktrace: -RemoteError@chrome://remote/content/shared/RemoteError.sys.mjs:8:8 -WebDriverError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:193:5 -ElementClickInterceptedError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:337:5 -webdriverClickElement@chrome://remote/content/marionette/interaction.sys.mjs:177:11 -interaction.clickElement@chrome://remote/content/marionette/interaction.sys.mjs:136:11 -clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.sys.mjs:205:29 -receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.sys.mjs:85:31-
Traceback (most recent call last): - File "/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py", line 918, in test_details_popup - books[1][0]['ele'].click() -IndexError: list index out of range-
Traceback (most recent call last): - File "/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py", line 608, in test_rename_capital_on_upload - self.assertEqual(['Frodo Beutlin', 'Norbert Halagal', 'Liu Yang', 'Hector Gonçalves'], details['author']) -AssertionError: Lists differ: ['Frodo Beutlin', 'Norbert Halagal', 'Liu Yang', 'Hector Gonçalves'] != [] - -First list contains 4 additional elements. -First extra element 0: -'Frodo Beutlin' - -- ['Frodo Beutlin', 'Norbert Halagal', 'Liu Yang', 'Hector Gonçalves'] -+ []-
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py", line 936, in test_watch_metadata + self.assertTrue(button) +AssertionError: False is not true+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_embed_metadata.py", line 271, in test_email_epub_embed_metadata + task_len, ret = self.wait_tasks(tasks, 1) + File "/home/ozzie/Development/calibre-web-test/test/helper_ui.py", line 1636, in wait_tasks + self.assertEqual(expected, task_len) +AssertionError: 1 != 2+
ImportError: Failed to import test module: test_pip_install -Traceback (most recent call last): - File "/usr/lib/python3.10/unittest/loader.py", line 436, in _find_test_path - module = self._get_module_from_name(name) - File "/usr/lib/python3.10/unittest/loader.py", line 377, in _get_module_from_name - __import__(name) - File "/home/ozzie/Development/calibre-web-test/test/test_pip_install.py", line 23, in <module> - from build_release import make_release -ModuleNotFoundError: No module named 'build_release'-
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_register.py", line 37, in setUpClass + cls.email_server.start() + File "/home/ozzie/Development/calibre-web-test/test/aiosmtpd/controller.py", line 88, in start + raise self._thread_exception + File "/home/ozzie/Development/calibre-web-test/test/aiosmtpd/controller.py", line 65, in _run + self.server = self.loop.run_until_complete( + File "/usr/lib/python3.10/asyncio/base_events.py", line 649, in run_until_complete + return future.result() + File "/usr/lib/python3.10/asyncio/base_events.py", line 1519, in create_server + raise OSError(err.errno, 'error while attempting ' +OSError: [Errno 98] error while attempting to bind on address ('127.0.0.1', 1025): address already in use+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_split_library.py", line 102, in test_email_ebook + self.email_server.start() + File "/home/ozzie/Development/calibre-web-test/test/aiosmtpd/controller.py", line 88, in start + raise self._thread_exception + File "/home/ozzie/Development/calibre-web-test/test/aiosmtpd/controller.py", line 65, in _run + self.server = self.loop.run_until_complete( + File "/usr/lib/python3.10/asyncio/base_events.py", line 649, in run_until_complete + return future.result() + File "/usr/lib/python3.10/asyncio/base_events.py", line 1519, in create_server + raise OSError(err.errno, 'error while attempting ' +OSError: [Errno 98] error while attempting to bind on address ('127.0.0.1', 1025): address already in use+
Traceback (most recent call last): - File "/home/ozzie/Development/calibre-web-test/test/test_thumbnail_env.py", line 85, in test_cover_cache_env_on_database_change - self.assertEqual(count_files(thumbnail_cache_path), 20) -AssertionError: 30 != 20-
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py", line 327, in test_sideloaded_book + self.assertGreaterEqual(diff(BytesIO(list_cover), BytesIO(new_list_cover), delete_diff_file=True), 0.04) +AssertionError: 0.039521531544059706 not greater than or equal to 0.04+
Traceback (most recent call last): - File "/home/ozzie/Development/calibre-web-test/test/test_updater.py", line 375, in test_perform_update - self.assertEqual(20, count_files(thumbnail_cache_path)) -AssertionError: 20 != 30-