NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Started addressing some PR comments

Browse Source
This commit is contained in:
mmonkey 2021-09-16 23:20:11 -05:00
parent 04a5db5c1d
commit 9a08bcd2bc
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cps/admin.py
View File

@ -41,7 +41,6 @@ from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
from sqlalchemy.sql.expression import func, or_, text from sqlalchemy.sql.expression import func, or_, text
from . import constants, logger, helper, services, isoLanguages, fs from . import constants, logger, helper, services, isoLanguages, fs
from .cli import filepicker
from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils
from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \ from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \
valid_email, check_username valid_email, check_username

3
cps/templates/book_cover.html
View File

@ -1,5 +1,6 @@
{% macro book_cover_image(book, thumbnails) -%} {% macro book_cover_image(book, thumbnails, title) -%}
{%- set book_title = book.title if book.title else book.name -%} {%- set book_title = book.title if book.title else book.name -%}
{%- set book_title = title if title else book_title -%}
{% set srcset = thumbnails|get_book_thumbnail_srcset if thumbnails|length else '' %} {% set srcset = thumbnails|get_book_thumbnail_srcset if thumbnails|length else '' %}
{%- if srcset|length -%} {%- if srcset|length -%}
<img <img

2
cps/updater.py
View File

@ -265,7 +265,7 @@ class Updater(threading.Thread):
os.sep + 'gdrive_credentials', os.sep + 'settings.yaml', os.sep + 'venv', os.sep + 'virtualenv', os.sep + 'gdrive_credentials', os.sep + 'settings.yaml', os.sep + 'venv', os.sep + 'virtualenv',
os.sep + 'access.log', os.sep + 'access.log1', os.sep + 'access.log2', os.sep + 'access.log', os.sep + 'access.log1', os.sep + 'access.log2',
os.sep + '.calibre-web.log.swp', os.sep + '_sqlite3.so', os.sep + 'cps' + os.sep + '.HOMEDIR', os.sep + '.calibre-web.log.swp', os.sep + '_sqlite3.so', os.sep + 'cps' + os.sep + '.HOMEDIR',
os.sep + 'gmail.json' os.sep + 'gmail.json', os.sep + 'cps' + os.sep + 'cache'
) )
additional_path = self.is_venv() additional_path = self.is_venv()
if additional_path: if additional_path:

26
cps/web.py
View File

@ -415,7 +415,8 @@ def render_books_list(data, sort, book_id, page):
db.books_series_link, db.books_series_link,
db.Books.id == db.books_series_link.c.book, db.Books.id == db.books_series_link.c.book,
db.Series) db.Series)
thumbnails = get_thumbnails_for_books(entries + random)
thumbnails = get_thumbnails_for_books(entries + random if random else entries)
return render_title_template('index.html', random=random, entries=entries, pagination=pagination, return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
title=_(u"Books"), page=website, thumbnails=thumbnails) title=_(u"Books"), page=website, thumbnails=thumbnails)
@ -466,7 +467,7 @@ def render_hot_books(page):
ub.delete_download(book.Downloads.book_id) ub.delete_download(book.Downloads.book_id)
numBooks = entries.__len__() numBooks = entries.__len__()
pagination = Pagination(page, config.config_books_per_page, numBooks) pagination = Pagination(page, config.config_books_per_page, numBooks)
thumbnails = get_thumbnails_for_books(entries + random) thumbnails = get_thumbnails_for_books(entries + random if random else entries)
return render_title_template('index.html', random=random, entries=entries, pagination=pagination, return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
title=_(u"Hot Books (Most Downloaded)"), page="hot", thumbnails=thumbnails) title=_(u"Hot Books (Most Downloaded)"), page="hot", thumbnails=thumbnails)
else: else:
@ -497,7 +498,7 @@ def render_downloaded_books(page, order, user_id):
ub.delete_download(book.id) ub.delete_download(book.id)
user = ub.session.query(ub.User).filter(ub.User.id == user_id).first() user = ub.session.query(ub.User).filter(ub.User.id == user_id).first()
thumbnails = get_thumbnails_for_books(entries + random) thumbnails = get_thumbnails_for_books(entries + random if random else entries)
return render_title_template('index.html', return render_title_template('index.html',
random=random, random=random,
entries=entries, entries=entries,
@ -550,7 +551,7 @@ def render_publisher_books(page, book_id, order):
db.books_series_link, db.books_series_link,
db.Books.id == db.books_series_link.c.book, db.Books.id == db.books_series_link.c.book,
db.Series) db.Series)
thumbnails = get_thumbnails_for_books(entries + random) thumbnails = get_thumbnails_for_books(entries + random if random else entries)
return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id, return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher", title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher",
thumbnails=thumbnails) thumbnails=thumbnails)
@ -565,7 +566,7 @@ def render_series_books(page, book_id, order):
db.Books, db.Books,
db.Books.series.any(db.Series.id == book_id), db.Books.series.any(db.Series.id == book_id),
[order[0]]) [order[0]])
thumbnails = get_thumbnails_for_books(entries + random) thumbnails = get_thumbnails_for_books(entries + random if random else entries)
return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id, 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", title=_(u"Series: %(serie)s", serie=name.name), page="series",
thumbnails=thumbnails) thumbnails=thumbnails)
@ -580,7 +581,7 @@ def render_ratings_books(page, book_id, order):
db.Books.ratings.any(db.Ratings.id == book_id), db.Books.ratings.any(db.Ratings.id == book_id),
[order[0]]) [order[0]])
if name and name.rating <= 10: if name and name.rating <= 10:
thumbnails = get_thumbnails_for_books(entries + random) thumbnails = get_thumbnails_for_books(entries + random if random else entries)
return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id, 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)), page="ratings", title=_(u"Rating: %(rating)s stars", rating=int(name.rating / 2)), page="ratings",
thumbnails=thumbnails) thumbnails=thumbnails)
@ -595,7 +596,7 @@ def render_formats_books(page, book_id, order):
db.Books, db.Books,
db.Books.data.any(db.Data.format == book_id.upper()), db.Books.data.any(db.Data.format == book_id.upper()),
[order[0]]) [order[0]])
thumbnails = get_thumbnails_for_books(entries + random) thumbnails = get_thumbnails_for_books(entries + random if random else entries)
return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id, 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", title=_(u"File format: %(format)s", format=name.format), page="formats",
thumbnails=thumbnails) thumbnails=thumbnails)
@ -613,7 +614,7 @@ def render_category_books(page, book_id, order):
db.books_series_link, db.books_series_link,
db.Books.id == db.books_series_link.c.book, db.Books.id == db.books_series_link.c.book,
db.Series) db.Series)
thumbnails = get_thumbnails_for_books(entries + random) thumbnails = get_thumbnails_for_books(entries + random if random else entries)
return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id, return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
title=_(u"Category: %(name)s", name=name.name), page="category", title=_(u"Category: %(name)s", name=name.name), page="category",
thumbnails=thumbnails) thumbnails=thumbnails)
@ -634,7 +635,7 @@ def render_language_books(page, name, order):
db.Books, db.Books,
db.Books.languages.any(db.Languages.lang_code == name), db.Books.languages.any(db.Languages.lang_code == name),
[order[0]]) [order[0]])
thumbnails = get_thumbnails_for_books(entries + random) thumbnails = get_thumbnails_for_books(entries + random if random else entries)
return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name, return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
title=_(u"Language: %(name)s", name=lang_name), page="language", thumbnails=thumbnails) title=_(u"Language: %(name)s", name=lang_name), page="language", thumbnails=thumbnails)
@ -687,7 +688,7 @@ def render_read_books(page, are_read, as_xml=False, order=None):
name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')' name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')'
pagename = "unread" pagename = "unread"
thumbnails = get_thumbnails_for_books(entries + random) thumbnails = get_thumbnails_for_books(entries + random if random else entries)
return render_title_template('index.html', random=random, entries=entries, pagination=pagination, return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
title=name, page=pagename, thumbnails=thumbnails) title=name, page=pagename, thumbnails=thumbnails)
@ -712,7 +713,7 @@ def render_archived_books(page, order):
name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')' name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
pagename = "archived" pagename = "archived"
thumbnails = get_thumbnails_for_books(entries + random) thumbnails = get_thumbnails_for_books(entries + random if random else entries)
return render_title_template('index.html', random=random, entries=entries, pagination=pagination, return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
title=name, page=pagename, thumbnails=thumbnails) title=name, page=pagename, thumbnails=thumbnails)
@ -1392,11 +1393,12 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
offset = 0 offset = 0
limit_all = result_count limit_all = result_count
entries = q[offset:limit_all]
thumbnails = get_thumbnails_for_books(entries) thumbnails = get_thumbnails_for_books(entries)
return render_title_template('search.html', return render_title_template('search.html',
adv_searchterm=searchterm, adv_searchterm=searchterm,
pagination=pagination, pagination=pagination,
entries=q[offset:limit_all], entries=entries,
result_count=result_count, result_count=result_count,
title=_(u"Advanced Search"), title=_(u"Advanced Search"),
page="advsearch", page="advsearch",