diff --git a/README.md b/README.md index e3b6fcdb..4ebb5cd8 100644 --- a/README.md +++ b/README.md @@ -72,14 +72,7 @@ Optionally, to enable on-the-fly conversion from one ebook format to another whe ## Docker Images -Pre-built Docker images are available in these Docker Hub repositories: - -#### **Technosoft2000 - x64** -+ Docker Hub - [https://hub.docker.com/r/technosoft2000/calibre-web](https://hub.docker.com/r/technosoft2000/calibre-web) -+ Github - [https://github.com/Technosoft2000/docker-calibre-web](https://github.com/Technosoft2000/docker-calibre-web) - - Includes the Calibre `ebook-convert` binary. - + The "path to convertertool" should be set to `/opt/calibre/ebook-convert` +A pre-built Docker image is available in these Docker Hub repository (maintained by the LinuxServer team): #### **LinuxServer - x64, armhf, aarch64** + Docker Hub - [https://hub.docker.com/r/linuxserver/calibre-web](https://hub.docker.com/r/linuxserver/calibre-web) diff --git a/cps/__init__.py b/cps/__init__.py index a36a8925..e50a74cf 100644 --- a/cps/__init__.py +++ b/cps/__init__.py @@ -66,6 +66,8 @@ mimetypes.add_type('application/mp4', '.m4a') mimetypes.add_type('application/mp4', '.m4b') mimetypes.add_type('application/ogg', '.ogg') mimetypes.add_type('application/ogg', '.oga') +mimetypes.add_type('text/css', '.css') +mimetypes.add_type('text/javascript; charset=UTF-8', '.js') app = Flask(__name__) app.config.update( diff --git a/cps/editbooks.py b/cps/editbooks.py index 99d4f69a..263a69fb 100644 --- a/cps/editbooks.py +++ b/cps/editbooks.py @@ -1096,6 +1096,7 @@ def table_get_custom_enum(c_id): cc = (calibre_db.session.query(db.Custom_Columns) .filter(db.Custom_Columns.id == c_id) .filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).one_or_none()) + ret.append({'value': "", 'text': ""}) for idx, en in enumerate(cc.get_display_dict()['enum_values']): ret.append({'value': en, 'text': en}) return json.dumps(ret) diff --git a/cps/static/js/table.js b/cps/static/js/table.js index d1a32862..0600f0b3 100644 --- a/cps/static/js/table.js +++ b/cps/static/js/table.js @@ -645,6 +645,9 @@ function singlecheckboxFormatter(value, row){ } function ratingFormatter(value, row) { + if (value == 0) { + return ""; + } return (value/2); } diff --git a/cps/templates/book_table.html b/cps/templates/book_table.html index 6f8e8747..fb0cfed8 100644 --- a/cps/templates/book_table.html +++ b/cps/templates/book_table.html @@ -76,7 +76,7 @@ {% if c.datatype == "int" %}
Start Time: 2021-10-12 06:15:04
+Start Time: 2021-10-29 07:17:17
Stop Time: 2021-10-12 09:37:09
+Stop Time: 2021-10-29 10:46:29
Duration: 2h 43 min
+Duration: 2h 49 min
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_delete_database.py", line 77, in test_delete_books_in_database + self.assertEqual("", bl['table'][0]['selector']['text']) +AssertionError: '' != 'No matching records found' ++ No matching records found+
Traceback (most recent call last): - File "/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py", line 730, in test_xss_author_edit - self.assertEqual(200, result.status_code) -AssertionError: 200 != 400-
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py", line 287, in test_list_visibility + self.assertEqual(9, len(bl['column_elements'])) +AssertionError: 9 != 17+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py", line 928, in test_watch_metadata + self.assertNotIn('series', book) +AssertionError: 'series' unexpectedly found in {'id': 5, 'reader': [], 'title': 'testbook', 'author': ['John Döe'], 'rating': 0, 'languages': ['English'], 'identifier': [], 'cover': '/cover/5?edit=7a19f85c-19e9-45b0-ba12-3c54b9b88d6d', 'tag': [], 'publisher': ['Randomhäus'], 'pubdate': 'Jan 19, 2017', 'comment': 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate', 'add_shelf': [], 'del_shelf': [], 'edit_enable': True, 'kindle': None, 'kindlebtn': None, 'download': ['EPUB (6.7 kB)'], 'read': False, 'archived': False, 'series_all': 'Book 1 of test', 'series_index': '1', 'series': 'test', 'cust_columns': []}+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py", line 278, in test_kobo_sync_selected_shelfs + self.assertIn("NewTag", data3[2]) +IndexError: list index out of range+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py", line 185, in test_sync_changed_book + self.assertTrue('ChangedEntitlement' in data[0][0]) +IndexError: list index out of range+
Traceback (most recent call last): + File "/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py", line 200, in test_sync_shelf + self.assertEqual(1, len(data[0])) +AssertionError: 1 != 0+