From 32a3c45ee0f7e13bd61075f32a4dcebc415585a1 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sat, 26 Mar 2022 19:35:56 +0100 Subject: [PATCH] Refactored load read status for web access and opds access Refactored and removed discover html page Bugfix show author Bugfix open dialog in author page Fix for #2341 (advanced search with linked read column and read column having a higher number than number of available custom columns) --- cps/db.py | 53 +- cps/opds.py | 68 +- cps/render_template.py | 6 +- cps/shelf.py | 2 +- cps/templates/author.html | 32 +- cps/templates/discover.html | 65 -- cps/templates/feed.xml | 32 +- cps/templates/index.html | 61 +- cps/templates/search.html | 2 +- cps/templates/shelf.html | 26 +- cps/templates/shelfdown.html | 18 +- cps/web.py | 141 ++- test/Calibre-Web TestSummary_Linux.html | 1042 ++++++++++++++--------- 13 files changed, 846 insertions(+), 702 deletions(-) delete mode 100644 cps/templates/discover.html diff --git a/cps/db.py b/cps/db.py index f2fe9b78..3b193e1a 100644 --- a/cps/db.py +++ b/cps/db.py @@ -680,6 +680,25 @@ class CalibreDB: return and_(lang_filter, pos_content_tags_filter, ~neg_content_tags_filter, pos_content_cc_filter, ~neg_content_cc_filter, archived_filter) + def generate_linked_query(self, config_read_column, database): + if not config_read_column: + query = (self.session.query(database, ub.ArchivedBook.is_archived, ub.ReadBook.read_status) + .select_from(Books) + .outerjoin(ub.ReadBook, + and_(ub.ReadBook.user_id == int(current_user.id), ub.ReadBook.book_id == Books.id))) + else: + try: + read_column = cc_classes[config_read_column] + query = (self.session.query(database, ub.ArchivedBook.is_archived, read_column.value) + .select_from(Books) + .outerjoin(read_column, read_column.book == Books.id)) + except (KeyError, AttributeError, IndexError): + log.error("Custom Column No.{} is not existing in calibre database".format(config_read_column)) + # Skip linking read column and return None instead of read status + query = self.session.query(database, None, ub.ArchivedBook.is_archived) + return query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id, + int(current_user.id) == ub.ArchivedBook.user_id)) + @staticmethod def get_checkbox_sorted(inputlist, state, offset, limit, order, combo=False): outcome = list() @@ -709,30 +728,14 @@ class CalibreDB: join_archive_read, config_read_column, *join): pagesize = pagesize or self.config.config_books_per_page if current_user.show_detail_random(): - randm = self.session.query(Books) \ - .filter(self.common_filters(allow_show_archived)) \ - .order_by(func.random()) \ - .limit(self.config.config_random_books).all() + random_query = self.generate_linked_query(config_read_column, database) + randm = (random_query.filter(self.common_filters(allow_show_archived)) + .order_by(func.random()) + .limit(self.config.config_random_books).all()) else: randm = false() if join_archive_read: - if not config_read_column: - query = (self.session.query(database, ub.ReadBook.read_status, ub.ArchivedBook.is_archived) - .select_from(Books) - .outerjoin(ub.ReadBook, - and_(ub.ReadBook.user_id == int(current_user.id), ub.ReadBook.book_id == Books.id))) - else: - try: - read_column = cc_classes[config_read_column] - query = (self.session.query(database, read_column.value, ub.ArchivedBook.is_archived) - .select_from(Books) - .outerjoin(read_column, read_column.book == Books.id)) - except (KeyError, AttributeError, IndexError): - log.error("Custom Column No.{} is not existing in calibre database".format(read_column)) - # Skip linking read column and return None instead of read status - query = self.session.query(database, None, ub.ArchivedBook.is_archived) - query = query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id, - int(current_user.id) == ub.ArchivedBook.user_id)) + query = self.generate_linked_query(config_read_column, database) else: query = self.session.query(database) off = int(int(pagesize) * (page - 1)) @@ -830,21 +833,23 @@ class CalibreDB: authorterms = re.split("[, ]+", term) for authorterm in authorterms: q.append(Books.authors.any(func.lower(Authors.name).ilike("%" + authorterm + "%"))) - if not config_read_column: + query = self.generate_linked_query(config_read_column, Books) + '''if not config_read_column: query = (self.session.query(Books, ub.ArchivedBook.is_archived, ub.ReadBook).select_from(Books) .outerjoin(ub.ReadBook, and_(Books.id == ub.ReadBook.book_id, int(current_user.id) == ub.ReadBook.user_id))) else: try: read_column = cc_classes[config_read_column] - query = (self.session.query(Books, ub.ArchivedBook.is_archived, read_column.value).select_from(Books) + query = (self.session.query(Books, ub.ArchivedBook.is_archived, read_column.value) + .select_from(Books) .outerjoin(read_column, read_column.book == Books.id)) except (KeyError, AttributeError, IndexError): log.error("Custom Column No.{} is not existing in calibre database".format(config_read_column)) # Skip linking read column query = self.session.query(Books, ub.ArchivedBook.is_archived, None) query = query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id, - int(current_user.id) == ub.ArchivedBook.user_id)) + int(current_user.id) == ub.ArchivedBook.user_id))''' if len(join) == 6: query = query.outerjoin(join[0], join[1]).outerjoin(join[2]).outerjoin(join[3], join[4]).outerjoin(join[5]) diff --git a/cps/opds.py b/cps/opds.py index 180fcacb..702ffe1e 100644 --- a/cps/opds.py +++ b/cps/opds.py @@ -26,7 +26,8 @@ from functools import wraps from flask import Blueprint, request, render_template, Response, g, make_response, abort from flask_login import current_user -from sqlalchemy.sql.expression import func, text, or_, and_, any_, true +from sqlalchemy.sql.expression import func, text, or_, and_, true +from sqlalchemy.exc import InvalidRequestError, OperationalError from werkzeug.security import check_password_hash from . import constants, logger, config, db, calibre_db, ub, services, get_locale, isoLanguages from .helper import get_download_link, get_book_cover @@ -108,7 +109,8 @@ def feed_letter_books(book_id): entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0, db.Books, letter, - [db.Books.sort]) + [db.Books.sort], + True, config.config_read_column) return render_xml_template('feed.xml', entries=entries, pagination=pagination) @@ -118,15 +120,16 @@ def feed_letter_books(book_id): def feed_new(): off = request.args.get("offset") or 0 entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0, - db.Books, True, [db.Books.timestamp.desc()]) + db.Books, True, [db.Books.timestamp.desc()], + True, config.config_read_column) return render_xml_template('feed.xml', entries=entries, pagination=pagination) @opds.route("/opds/discover") @requires_basic_auth_if_no_ano def feed_discover(): - entries = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()).order_by(func.random())\ - .limit(config.config_books_per_page) + query = calibre_db.generate_linked_query(config.config_read_column, db.Books) + entries = query.filter(calibre_db.common_filters()).order_by(func.random()).limit(config.config_books_per_page) pagination = Pagination(1, config.config_books_per_page, int(config.config_books_per_page)) return render_xml_template('feed.xml', entries=entries, pagination=pagination) @@ -137,7 +140,8 @@ def feed_best_rated(): off = request.args.get("offset") or 0 entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0, db.Books, db.Books.ratings.any(db.Ratings.rating > 9), - [db.Books.timestamp.desc()]) + [db.Books.timestamp.desc()], + True, config.config_read_column) return render_xml_template('feed.xml', entries=entries, pagination=pagination) @@ -150,11 +154,11 @@ def feed_hot(): hot_books = all_books.offset(off).limit(config.config_books_per_page) entries = list() for book in hot_books: - download_book = calibre_db.get_book(book.Downloads.book_id) + query = calibre_db.generate_linked_query(config.config_read_column, db.Books) + download_book = query.filter(calibre_db.common_filters()).filter( + book.Downloads.book_id == db.Books.id).first() if download_book: - entries.append( - calibre_db.get_filtered_book(book.Downloads.book_id) - ) + entries.append(download_book) else: ub.delete_download(book.Downloads.book_id) num_books = entries.__len__() @@ -270,7 +274,8 @@ def feed_series(book_id): entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0, db.Books, db.Books.series.any(db.Series.id == book_id), - [db.Books.series_index]) + [db.Books.series_index], + True, config.config_read_column) return render_xml_template('feed.xml', entries=entries, pagination=pagination) @@ -324,7 +329,8 @@ def feed_format(book_id): entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0, db.Books, db.Books.data.any(db.Data.format == book_id.upper()), - [db.Books.timestamp.desc()]) + [db.Books.timestamp.desc()], + True, config.config_read_column) return render_xml_template('feed.xml', entries=entries, pagination=pagination) @@ -351,7 +357,8 @@ def feed_languages(book_id): entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0, db.Books, db.Books.languages.any(db.Languages.id == book_id), - [db.Books.timestamp.desc()]) + [db.Books.timestamp.desc()], + True, config.config_read_column) return render_xml_template('feed.xml', entries=entries, pagination=pagination) @@ -381,13 +388,25 @@ def feed_shelf(book_id): result = list() # user is allowed to access shelf if shelf: - books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == book_id).order_by( - ub.BookShelf.order.asc()).all() - for book in books_in_shelf: - cur_book = calibre_db.get_book(book.book_id) - result.append(cur_book) - pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page, - len(result)) + result, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), + config.config_books_per_page, + db.Books, + ub.BookShelf.shelf == shelf.id, + [ub.BookShelf.order.asc()], + True, config.config_read_column, + ub.BookShelf, ub.BookShelf.book_id == db.Books.id) + # delete shelf entries where book is not existent anymore, can happen if book is deleted outside calibre-web + wrong_entries = calibre_db.session.query(ub.BookShelf) \ + .join(db.Books, ub.BookShelf.book_id == db.Books.id, isouter=True) \ + .filter(db.Books.id == None).all() + for entry in wrong_entries: + log.info('Not existing book {} in {} deleted'.format(entry.book_id, shelf)) + try: + ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == entry.book_id).delete() + ub.session.commit() + except (OperationalError, InvalidRequestError) as e: + ub.session.rollback() + log.error_or_exception("Settings Database error: {}".format(e)) return render_xml_template('feed.xml', entries=result, pagination=pagination) @@ -451,8 +470,7 @@ def feed_search(term): entries, __, ___ = calibre_db.get_search_results(term, config_read_column=config.config_read_column) entries_count = len(entries) if len(entries) > 0 else 1 pagination = Pagination(1, entries_count, entries_count) - items = [entry[0] for entry in entries] - return render_xml_template('feed.xml', searchterm=term, entries=items, pagination=pagination) + return render_xml_template('feed.xml', searchterm=term, entries=entries, pagination=pagination) else: return render_xml_template('feed.xml', searchterm="") @@ -493,14 +511,16 @@ def render_xml_dataset(data_table, book_id): entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0, db.Books, getattr(db.Books, data_table.__tablename__).any(data_table.id == book_id), - [db.Books.timestamp.desc()]) + [db.Books.timestamp.desc()], + True, config.config_read_column) return render_xml_template('feed.xml', entries=entries, pagination=pagination) def render_element_index(database_column, linked_table, folder): shift = 0 off = int(request.args.get("offset") or 0) - entries = calibre_db.session.query(func.upper(func.substr(database_column, 1, 1)).label('id')) + entries = calibre_db.session.query(func.upper(func.substr(database_column, 1, 1)).label('id'), None, None) + # query = calibre_db.generate_linked_query(config.config_read_column, db.Books) if linked_table is not None: entries = entries.join(linked_table).join(db.Books) entries = entries.filter(calibre_db.common_filters()).group_by(func.upper(func.substr(database_column, 1, 1))).all() diff --git a/cps/render_template.py b/cps/render_template.py index 91118049..1bc5454d 100644 --- a/cps/render_template.py +++ b/cps/render_template.py @@ -101,7 +101,7 @@ def get_sidebar_config(kwargs=None): "show_text": _('Show Books List'), "config_show": content}) return sidebar, simple -def get_readbooks_ids(): +'''def get_readbooks_ids(): if not config.config_read_column: readBooks = ub.session.query(ub.ReadBook).filter(ub.ReadBook.user_id == int(current_user.id))\ .filter(ub.ReadBook.read_status == ub.ReadBook.STATUS_FINISHED).all() @@ -113,11 +113,11 @@ def get_readbooks_ids(): return frozenset([x.book for x in readBooks]) except (KeyError, AttributeError, IndexError): log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column)) - return [] + return []''' # Returns the template for rendering and includes the instance name def render_title_template(*args, **kwargs): sidebar, simple = get_sidebar_config(kwargs) return render_template(instance=config.config_calibre_web_title, sidebar=sidebar, simple=simple, - accept=constants.EXTENSIONS_UPLOAD, read_book_ids=get_readbooks_ids(), + accept=constants.EXTENSIONS_UPLOAD, # read_book_ids=get_readbooks_ids(), *args, **kwargs) diff --git a/cps/shelf.py b/cps/shelf.py index 0bf12164..35f2941d 100644 --- a/cps/shelf.py +++ b/cps/shelf.py @@ -439,7 +439,7 @@ def render_show_shelf(shelf_type, shelf_id, page_no, sort_param): db.Books, ub.BookShelf.shelf == shelf_id, [ub.BookShelf.order.asc()], - False, 0, + True, config.config_read_column, ub.BookShelf, ub.BookShelf.book_id == db.Books.id) # delete chelf entries where book is not existent anymore, can happen if book is deleted outside calibre-web wrong_entries = calibre_db.session.query(ub.BookShelf) \ diff --git a/cps/templates/author.html b/cps/templates/author.html index b691d398..f7aeb3e1 100644 --- a/cps/templates/author.html +++ b/cps/templates/author.html @@ -31,23 +31,22 @@
- {% if entries[0] %} {% for entry in entries %}
- - - - {% if entry.id in read_book_ids %}{% endif %} + + + + {% if entry[2] == True %}{% endif %}
- -

{{entry.title|shortentitle}}

+ +

{{entry.Books.title|shortentitle}}

- {% for author in entry.ordered_authors %} + {% for author in entry.Books.authors %} {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %} {% if not loop.first %} & @@ -63,23 +62,23 @@ {{author.name.replace('|',',')|shortentitle(30)}} {% endif %} {% endfor %} - {% for format in entry.data %} + {% for format in entry.Books.data %} {% if format.format|lower in g.constants.EXTENSIONS_AUDIO %} {% endif %} {% endfor %}

- {% if entry.series.__len__() > 0 %} + {% if entry.Books.series.__len__() > 0 %}

- - {{entry.series[0].name}} + + {{entry.Books.series[0].name}} - ({{entry.series_index|formatseriesindex}}) + ({{entry.Books.series_index|formatseriesindex}})

{% endif %} - {% if entry.ratings.__len__() > 0 %} + {% if entry.Books.ratings.__len__() > 0 %}
- {% for number in range((entry.ratings[0].rating/2)|int(2)) %} + {% for number in range((entry.Books.ratings[0].rating/2)|int(2)) %} {% if loop.last and loop.index < 5 %} {% for numer in range(5 - loop.index) %} @@ -92,7 +91,6 @@
{% endfor %} - {% endif %}
@@ -110,7 +108,7 @@

{{entry.title|shortentitle}}

- {% for author in entry.ordered_authors %} + {% for author in entry.authors %} {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %} {{author.name.replace('|',',')}} {% if loop.last %} diff --git a/cps/templates/discover.html b/cps/templates/discover.html deleted file mode 100644 index 900dad8c..00000000 --- a/cps/templates/discover.html +++ /dev/null @@ -1,65 +0,0 @@ -{% extends "layout.html" %} -{% block body %} -

-

{{title}}

-
- {% for entry in entries %} -
-
- {% if entry.has_cover is defined %} - - - {{ entry.title }} - {% if entry.id in read_book_ids %}{% endif %} - - - {% endif %} -
-
- -

{{entry.title|shortentitle}}

- -

- {% for author in entry.ordered_authors %} - {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %} - {% if not loop.first %} - & - {% endif %} - {{author.name.replace('|',',')|shortentitle(30)}} - {% if loop.last %} - (...) - {% endif %} - {% else %} - {% if not loop.first %} - & - {% endif %} - {{author.name.replace('|',',')|shortentitle(30)}} - {% endif %} - {% endfor %} -

- {% if entry.series.__len__() > 0 %} -

- - {{entry.series[0].name}} - - ({{entry.series_index|formatseriesindex}}) -

- {% endif %} - {% if entry.ratings.__len__() > 0 %} -
- {% for number in range((entry.ratings[0].rating/2)|int(2)) %} - - {% if loop.last and loop.index < 5 %} - {% for numer in range(5 - loop.index) %} - - {% endfor %} - {% endif %} - {% endfor %} -
- {% endif %} -
-
- {% endfor %} -
-
-{% endblock %} diff --git a/cps/templates/feed.xml b/cps/templates/feed.xml index 9073142e..940fb0da 100644 --- a/cps/templates/feed.xml +++ b/cps/templates/feed.xml @@ -40,35 +40,35 @@ {% if entries and entries[0] %} {% for entry in entries %} - {{entry.title}} - urn:uuid:{{entry.uuid}} - {{entry.atom_timestamp}} - {% if entry.authors.__len__() > 0 %} + {{entry.Books.title}} + urn:uuid:{{entry.Books.uuid}} + {{entry.Books.atom_timestamp}} + {% if entry.Books.authors.__len__() > 0 %} - {{entry.authors[0].name}} + {{entry.Books.authors[0].name}} {% endif %} - {% if entry.publishers.__len__() > 0 %} + {% if entry.Books.publishers.__len__() > 0 %} - {{entry.publishers[0].name}} + {{entry.Books.publishers[0].name}} {% endif %} - {% for lang in entry.languages %} + {% for lang in entry.Books.languages %} {{lang.lang_code}} {% endfor %} - {% for tag in entry.tags %} + {% for tag in entry.Books.tags %} {% endfor %} - {% if entry.comments[0] %}{{entry.comments[0].text|striptags}}{% endif %} - {% if entry.has_cover %} - - + {% if entry.Books.comments[0] %}{{entry.Books.comments[0].text|striptags}}{% endif %} + {% if entry.Books.has_cover %} + + {% endif %} - {% for format in entry.data %} - + {% for format in entry.Books.data %} + {% endfor %} {% endfor %} diff --git a/cps/templates/index.html b/cps/templates/index.html index a4547705..4cbf520e 100644 --- a/cps/templates/index.html +++ b/cps/templates/index.html @@ -1,25 +1,25 @@ {% extends "layout.html" %} {% block body %} -{% if g.user.show_detail_random() %} +{% if g.user.show_detail_random() and page != "discover" %}

{{_('Discover (Random Books)')}}

{% for entry in random %}
- - - {{ entry.title }} - {% if entry.id in read_book_ids %}{% endif %} + + + {{ entry.Books.title }} + {% if entry[2] == True %}{% endif %}
- -

{{entry.title|shortentitle}}

+ +

{{entry.Books.title|shortentitle}}

- {% for author in entry.ordered_authors %} + {% for author in entry.Books.authors %} {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %} {% if not loop.first %} & @@ -36,17 +36,17 @@ {% endif %} {% endfor %}

- {% if entry.series.__len__() > 0 %} + {% if entry.Books.series.__len__() > 0 %}

- - {{entry.series[0].name}} + + {{entry.Books.series[0].name}} - ({{entry.series_index|formatseriesindex}}) + ({{entry.Books.series_index|formatseriesindex}})

{% endif %} - {% if entry.ratings.__len__() > 0 %} + {% if entry.Books.ratings.__len__() > 0 %}
- {% for number in range((entry.ratings[0].rating/2)|int(2)) %} + {% for number in range((entry.Books.ratings[0].rating/2)|int(2)) %} {% if loop.last and loop.index < 5 %} {% for numer in range(5 - loop.index) %} @@ -64,6 +64,7 @@ {% endif %}

{{title}}

+ {% if page != 'discover' %} - + {% endif %}
{% if entries[0] %} {% for entry in entries %}
- - - {{ entry.title }} - {% if entry.id in read_book_ids %}{% endif %} + + + {{ entry.Books.title }} + {% if entry[2] == True %}{% endif %}
- -

{{entry.title|shortentitle}}

+ +

{{entry.Books.title|shortentitle}}

- {% for author in entry.ordered_authors %} + {% for author in entry.Books.authors %} {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %} {% if not loop.first %} & @@ -117,27 +118,27 @@ {{author.name.replace('|',',')|shortentitle(30)}} {% endif %} {% endfor %} - {% for format in entry.data %} + {% for format in entry.Books.data %} {% if format.format|lower in g.constants.EXTENSIONS_AUDIO %} {% endif %} {%endfor%}

- {% if entry.series.__len__() > 0 %} + {% if entry.Books.series.__len__() > 0 %}

{% if page != "series" %} - - {{entry.series[0].name}} + + {{entry.Books.series[0].name}} {% else %} - {{entry.series[0].name}} + {{entry.Books.series[0].name}} {% endif %} - ({{entry.series_index|formatseriesindex}}) + ({{entry.Books.series_index|formatseriesindex}})

{% endif %} - {% if entry.ratings.__len__() > 0 %} + {% if entry.Books.ratings.__len__() > 0 %}
- {% for number in range((entry.ratings[0].rating/2)|int(2)) %} + {% for number in range((entry.Books.ratings[0].rating/2)|int(2)) %} {% if loop.last and loop.index < 5 %} {% for numer in range(5 - loop.index) %} diff --git a/cps/templates/search.html b/cps/templates/search.html index 77c01c80..318d06f1 100644 --- a/cps/templates/search.html +++ b/cps/templates/search.html @@ -46,7 +46,7 @@ {{ entry.Books.title }} - {% if entry.Books.id in read_book_ids %}{% endif %} + {% if entry[2] == True %}{% endif %} {% endif %} diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html index a7b5bcf0..0e9b0bd5 100644 --- a/cps/templates/shelf.html +++ b/cps/templates/shelf.html @@ -32,19 +32,19 @@ {% for entry in entries %}
- - - {{ entry.title }} - {% if entry.id in read_book_ids %}{% endif %} + + + {{ entry.Books.title }} + {% if entry[2] == True %}{% endif %}
- -

{{entry.title|shortentitle}}

+ +

{{entry.Books.title|shortentitle}}

- {% for author in entry.ordered_authors %} + {% for author in entry.Books.authors %} {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %} {% if not loop.first %} & @@ -61,17 +61,17 @@ {% endif %} {% endfor %}

- {% if entry.series.__len__() > 0 %} + {% if entry.Books.series.__len__() > 0 %}

- - {{entry.series[0].name}} + + {{entry.Books.series[0].name}} - ({{entry.series_index|formatseriesindex}}) + ({{entry.Books.series_index|formatseriesindex}})

{% endif %} - {% if entry.ratings.__len__() > 0 %} + {% if entry.Books.ratings.__len__() > 0 %}
- {% for number in range((entry.ratings[0].rating/2)|int(2)) %} + {% for number in range((entry.Books.ratings[0].rating/2)|int(2)) %} {% if loop.last and loop.index < 5 %} {% for numer in range(5 - loop.index) %} diff --git a/cps/templates/shelfdown.html b/cps/templates/shelfdown.html index c800dca7..f1a0b137 100644 --- a/cps/templates/shelfdown.html +++ b/cps/templates/shelfdown.html @@ -35,31 +35,31 @@
-

{{entry.title|shortentitle}}

+

{{entry.Books.title|shortentitle}}

- {% for author in entry.ordered_authors %} + {% for author in entry.Books.authors %} {{author.name.replace('|',',')}} {% if not loop.last %} & {% endif %} {% endfor %}

- {% if entry.series.__len__() > 0 %} + {% if entry.Books.series.__len__() > 0 %}

- - {{entry.series[0].name}} + + {{entry.Books.series[0].name}} - ({{entry.series_index}}) + ({{entry.Books.series_index}})

{% endif %}
{% if g.user.role_download() %} - {% if entry.data|length %} + {% if entry.Books.data|length %}
- {% for format in entry.data %} - + {% for format in entry.Books.data %} + {{format.format}} ({{ format.uncompressed_size|filesizeformat }}) {% endfor %} diff --git a/cps/web.py b/cps/web.py index d21ba630..525fccbe 100644 --- a/cps/web.py +++ b/cps/web.py @@ -85,7 +85,10 @@ except ImportError: def add_security_headers(resp): csp = "default-src 'self'" csp += ''.join([' ' + host for host in config.config_trustedhosts.strip().split(',')]) - csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' data:" + csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' " + if request.path.startswith("/author/") and config.config_use_goodreads: + csp += "images.gr-assets.com i.gr-assets.com s.gr-assets.com" + csp += " data:" resp.headers['Content-Security-Policy'] = csp if request.endpoint == "edit-book.show_edit_book" or config.config_use_google_drive: resp.headers['Content-Security-Policy'] += " *" @@ -350,7 +353,7 @@ def render_books_list(data, sort_param, book_id, page): if data == "rated": return render_rated_books(page, book_id, order=order) elif data == "discover": - return render_discover_books(page, book_id) + return render_discover_books(book_id) elif data == "unread": return render_read_books(page, False, order=order) elif data == "read": @@ -386,7 +389,7 @@ def render_books_list(data, sort_param, book_id, page): else: website = data or "newest" entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, order[0], - False, 0, + True, config.config_read_column, db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series) @@ -400,7 +403,7 @@ def render_rated_books(page, book_id, order): db.Books, db.Books.ratings.any(db.Ratings.rating > 9), order[0], - False, 0, + True, config.config_read_column, db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series) @@ -411,11 +414,13 @@ def render_rated_books(page, book_id, order): abort(404) -def render_discover_books(page, book_id): +def render_discover_books(book_id): if current_user.check_visibility(constants.SIDEBAR_RANDOM): - entries, __, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, [func.randomblob(2)]) + entries, __, ___ = calibre_db.fill_indexpage(1, 0, db.Books, True, [func.randomblob(2)], + join_archive_read=True, + config_read_column=config.config_read_column) pagination = Pagination(1, config.config_books_per_page, config.config_books_per_page) - return render_title_template('discover.html', entries=entries, pagination=pagination, id=book_id, + return render_title_template('index.html', random=false(), entries=entries, pagination=pagination, id=book_id, title=_(u"Discover (Random Books)"), page="discover") else: abort(404) @@ -429,18 +434,22 @@ def render_hot_books(page, order): # order[0][0].compare(func.count(ub.Downloads.book_id).asc())): order = [func.count(ub.Downloads.book_id).desc()], 'hotdesc' if current_user.show_detail_random(): - random = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()) \ - .order_by(func.random()).limit(config.config_random_books) + random_query = calibre_db.generate_linked_query(config.config_read_column, db.Books) + random = (random_query.filter(calibre_db.common_filters()) + .order_by(func.random()) + .limit(config.config_random_books).all()) else: random = false() + off = int(int(config.config_books_per_page) * (page - 1)) all_books = ub.session.query(ub.Downloads, func.count(ub.Downloads.book_id)) \ .order_by(*order[0]).group_by(ub.Downloads.book_id) hot_books = all_books.offset(off).limit(config.config_books_per_page) entries = list() for book in hot_books: - download_book = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()).filter( - db.Books.id == book.Downloads.book_id).first() + query = calibre_db.generate_linked_query(config.config_read_column, db.Books) + download_book = query.filter(calibre_db.common_filters()).filter( + book.Downloads.book_id == db.Books.id).first() if download_book: entries.append(download_book) else: @@ -459,26 +468,20 @@ def render_downloaded_books(page, order, user_id): else: user_id = current_user.id if current_user.check_visibility(constants.SIDEBAR_DOWNLOAD): - if current_user.show_detail_random(): - random = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()) \ - .order_by(func.random()).limit(config.config_random_books) - else: - random = false() - - entries, __, pagination = calibre_db.fill_indexpage(page, + entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, ub.Downloads.user_id == user_id, order[0], - False, 0, + True, config.config_read_column, db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series, ub.Downloads, db.Books.id == ub.Downloads.book_id) for book in entries: - if not calibre_db.session.query(db.Books).\ - filter(calibre_db.common_filters()).filter(db.Books.id == book.id).first(): - ub.delete_download(book.id) + if not (calibre_db.session.query(db.Books).filter(calibre_db.common_filters()) + .filter(db.Books.id == book.Books.id).first()): + ub.delete_download(book.Books.id) user = ub.session.query(ub.User).filter(ub.User.id == user_id).first() return render_title_template('index.html', random=random, @@ -497,9 +500,9 @@ def render_author_books(page, author_id, order): db.Books, db.Books.authors.any(db.Authors.id == author_id), [order[0][0], db.Series.name, db.Books.series_index], - False, 0, + True, config.config_read_column, db.books_series_link, - db.Books.id == db.books_series_link.c.book, + db.books_series_link.c.book == db.Books.id, db.Series) if entries is None or not len(entries): flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"), @@ -515,7 +518,8 @@ def render_author_books(page, author_id, order): other_books = [] if services.goodreads_support and config.config_use_goodreads: author_info = services.goodreads_support.get_author_info(author_name) - other_books = services.goodreads_support.get_other_books(author_info, entries) + book_entries = [entry.Books for entry in entries] + other_books = services.goodreads_support.get_other_books(author_info, book_entries) return render_title_template('author.html', entries=entries, pagination=pagination, id=author_id, title=_(u"Author: %(name)s", name=author_name), author=author_info, other_books=other_books, page="author", order=order[1]) @@ -528,7 +532,7 @@ def render_publisher_books(page, book_id, order): db.Books, db.Books.publishers.any(db.Publishers.id == book_id), [db.Series.name, order[0][0], db.Books.series_index], - False, 0, + True, config.config_read_column, db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series) @@ -546,7 +550,8 @@ def render_series_books(page, book_id, order): entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, db.Books.series.any(db.Series.id == book_id), - [order[0][0]]) + [order[0][0]], + True, config.config_read_column) return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id, title=_(u"Series: %(serie)s", serie=name.name), page="series", order=order[1]) else: @@ -558,7 +563,8 @@ def render_ratings_books(page, book_id, order): entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, db.Books.ratings.any(db.Ratings.id == book_id), - [order[0][0]]) + [order[0][0]], + True, config.config_read_column) if name and name.rating <= 10: return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id, title=_(u"Rating: %(rating)s stars", rating=int(name.rating / 2)), @@ -574,7 +580,8 @@ def render_formats_books(page, book_id, order): entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, db.Books.data.any(db.Data.format == book_id.upper()), - [order[0][0]]) + [order[0][0]], + True, config.config_read_column) return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id, title=_(u"File format: %(format)s", format=name.format), page="formats", @@ -590,7 +597,7 @@ def render_category_books(page, book_id, order): db.Books, db.Books.tags.any(db.Tags.id == book_id), [order[0][0], db.Series.name, db.Books.series_index], - False, 0, + True, config.config_read_column, db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series) @@ -609,7 +616,8 @@ def render_language_books(page, name, order): entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, db.Books.languages.any(db.Languages.lang_code == name), - [order[0][0]]) + [order[0][0]], + True, config.config_read_column) return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name, title=_(u"Language: %(name)s", name=lang_name), page="language", order=order[1]) @@ -622,30 +630,12 @@ def render_read_books(page, are_read, as_xml=False, order=None): ub.ReadBook.read_status == ub.ReadBook.STATUS_FINISHED) else: db_filter = coalesce(ub.ReadBook.read_status, 0) != ub.ReadBook.STATUS_FINISHED - entries, random, pagination = calibre_db.fill_indexpage(page, 0, - db.Books, - db_filter, - sort_param, - False, 0, - db.books_series_link, - db.Books.id == db.books_series_link.c.book, - db.Series, - ub.ReadBook, db.Books.id == ub.ReadBook.book_id) else: try: if are_read: db_filter = db.cc_classes[config.config_read_column].value == True else: db_filter = coalesce(db.cc_classes[config.config_read_column].value, False) != True - entries, random, pagination = calibre_db.fill_indexpage(page, 0, - db.Books, - db_filter, - sort_param, - False, 0, - db.books_series_link, - db.Books.id == db.books_series_link.c.book, - db.Series, - db.cc_classes[config.config_read_column]) except (KeyError, AttributeError, IndexError): log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column)) if not as_xml: @@ -655,6 +645,15 @@ def render_read_books(page, are_read, as_xml=False, order=None): return redirect(url_for("web.index")) return [] # ToDo: Handle error Case for opds + entries, random, pagination = calibre_db.fill_indexpage(page, 0, + db.Books, + db_filter, + sort_param, + True, config.config_read_column, + db.books_series_link, + db.Books.id == db.books_series_link.c.book, + db.Series) + if as_xml: return entries, pagination else: @@ -683,7 +682,7 @@ def render_archived_books(page, sort_param): archived_filter, order, True, - False, 0) + True, config.config_read_column) name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')' page_name = "archived" @@ -723,7 +722,7 @@ def render_prepare_search_form(cc): def render_search_results(term, offset=None, order=None, limit=None): - join = db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series + join = db.books_series_link, db.books_series_link.c.book == db.Books.id, db.Series entries, result_count, pagination = calibre_db.get_search_results(term, offset, order, @@ -813,27 +812,8 @@ def list_books(): books = calibre_db.search_query(search_param, config.config_read_column).all() filtered_count = len(books) else: - if not config.config_read_column: - books = (calibre_db.session.query(db.Books, ub.ReadBook.read_status, ub.ArchivedBook.is_archived) - .select_from(db.Books) - .outerjoin(ub.ReadBook, - and_(ub.ReadBook.user_id == int(current_user.id), - ub.ReadBook.book_id == db.Books.id))) - else: - read_column = "" - try: - read_column = db.cc_classes[config.config_read_column] - books = (calibre_db.session.query(db.Books, read_column.value, ub.ArchivedBook.is_archived) - .select_from(db.Books) - .outerjoin(read_column, read_column.book == db.Books.id)) - except (KeyError, AttributeError, IndexError): - log.error( - "Custom Column No.{} is not existing in calibre database".format(config.config_read_column)) - # Skip linking read column and return None instead of read status - books = calibre_db.session.query(db.Books, None, ub.ArchivedBook.is_archived) - books = (books.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id, - int(current_user.id) == ub.ArchivedBook.user_id)) - .filter(calibre_db.common_filters(allow_show_archived=True)).all()) + query = calibre_db.generate_linked_query(config.config_read_column, db.Books) + books = query.filter(calibre_db.common_filters(allow_show_archived=True)).all() entries = calibre_db.get_checkbox_sorted(books, state, off, limit, order, True) elif search_param: entries, filtered_count, __ = calibre_db.get_search_results(search_param, @@ -856,8 +836,8 @@ def list_books(): result = list() for entry in entries: val = entry[0] - val.read_status = entry[1] == ub.ReadBook.STATUS_FINISHED - val.is_archived = entry[2] is True + val.is_archived = entry[1] is True + val.read_status = entry[2] == ub.ReadBook.STATUS_FINISHED for lang_index in range(0, len(val.languages)): val.languages[lang_index].language_name = isoLanguages.get_language_name(get_locale(), val.languages[ lang_index].lang_code) @@ -1254,24 +1234,25 @@ def render_adv_search_results(term, offset=None, order=None, limit=None): cc = get_cc_columns(filter_config_custom_read=True) calibre_db.session.connection().connection.connection.create_function("lower", 1, db.lcase) - if not config.config_read_column: + query = calibre_db.generate_linked_query(config.config_read_column, db.Books) + '''if not config.config_read_column: query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, ub.ReadBook).select_from(db.Books) .outerjoin(ub.ReadBook, and_(db.Books.id == ub.ReadBook.book_id, int(current_user.id) == ub.ReadBook.user_id))) else: try: - read_column = cc[config.config_read_column] + read_column = db.cc_classes[config.config_read_column] query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, read_column.value) - .select_from(db.Books) - .outerjoin(read_column, read_column.book == db.Books.id)) + .select_from(db.Books) + .outerjoin(read_column, read_column.book == db.Books.id)) except (KeyError, AttributeError, IndexError): log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column)) # Skip linking read column query = calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, None) query = query.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id, - int(current_user.id) == ub.ArchivedBook.user_id)) + int(current_user.id) == ub.ArchivedBook.user_id))''' - q = query.outerjoin(db.books_series_link, db.Books.id == db.books_series_link.c.book) \ + q = query.outerjoin(db.books_series_link, db.books_series_link.c.book == db.Books.id) \ .outerjoin(db.Series) \ .filter(calibre_db.common_filters(True)) diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index 7be8da35..4427548a 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2022-03-19 22:04:05

+

Start Time: 2022-03-26 21:40:01

-

Stop Time: 2022-03-20 02:50:09

+

Stop Time: 2022-03-27 04:18:33

-

Duration: 3h 58 min

+

Duration: 4h 50 min

@@ -891,11 +891,11 @@ - + TestEditBooks 36 - 35 - 0 + 34 + 1 0 1 @@ -1237,11 +1237,31 @@ - +
TestEditBooks - test_upload_cover_hdd
- PASS + +
+ FAIL +
+ + + + @@ -1589,8 +1609,8 @@ TestEditBooksOnGdrive 20 - 16 - 4 + 18 + 2 0 0 @@ -1735,31 +1755,11 @@ - +
TestEditBooksOnGdrive - test_edit_title
- -
- FAIL -
- - - - + PASS @@ -1833,31 +1833,11 @@ AssertionError: 0.0 not greater than 0.02 - +
TestEditBooksOnGdrive - test_watch_metadata
- -
- FAIL -
- - - - + PASS @@ -2031,11 +2011,11 @@ AssertionError: 'series' unexpectedly found in {'id': 5, 're - + TestErrorReadColumn 2 - 2 - 0 + 1 + 1 0 0 @@ -2054,11 +2034,87 @@ AssertionError: 'series' unexpectedly found in {'id': 5, 're - +
TestErrorReadColumn - test_invalid_custom_read_column
- PASS + +
+ FAIL +
+ + + + + + + + + + + _ErrorHolder + 1 + 0 + 0 + 1 + 0 + + Detail + + + + + + + +
tearDownClass (test_error_read_column)
+ + +
+ ERROR +
+ + + + @@ -2072,13 +2128,13 @@ AssertionError: 'series' unexpectedly found in {'id': 5, 're 0 1 - Detail + Detail - +
TestFilePicker - test_filepicker_limited_file
@@ -2087,19 +2143,19 @@ AssertionError: 'series' unexpectedly found in {'id': 5, 're - +
TestFilePicker - test_filepicker_new_file
- SKIP + SKIP
-