From 32e27712f0f71fdec646add20cd78b4ce75acfce Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Fri, 27 Aug 2021 09:43:32 +0200 Subject: [PATCH 1/4] Added lxml to needed requirements Improved displaying of series title, book of series, comments and custom comments --- cps/editbooks.py | 13 +++++++++---- cps/jinjia.py | 7 ++++++- cps/templates/detail.html | 3 +-- cps/templates/index.html | 2 +- cps/ub.py | 6 +++--- optional-requirements.txt | 1 - requirements.txt | 1 + 7 files changed, 21 insertions(+), 12 deletions(-) diff --git a/cps/editbooks.py b/cps/editbooks.py index fbfc4483..afc07513 100644 --- a/cps/editbooks.py +++ b/cps/editbooks.py @@ -26,15 +26,14 @@ from datetime import datetime import json from shutil import copyfile from uuid import uuid4 +from lxml.html.clean import clean_html # Improve this to check if scholarly is available in a global way, like other pythonic libraries -have_scholar = True try: from scholarly import scholarly + have_scholar = True except ImportError: have_scholar = False - pass - from babel import Locale as LC from babel.core import UnknownLocaleError @@ -57,6 +56,8 @@ except ImportError: pass # We're not using Python 3 + + editbook = Blueprint('editbook', __name__) log = logger.create() @@ -459,9 +460,11 @@ def edit_book_series_index(series_index, book): # Handle book comments/description def edit_book_comments(comments, book): modif_date = False + if comments: + comments = clean_html(comments) if len(book.comments): if book.comments[0].text != comments: - book.comments[0].text = comments + book.comments[0].text = clean_html(comments) modif_date = True else: if comments: @@ -515,6 +518,8 @@ def edit_cc_data_value(book_id, book, c, to_save, cc_db_value, cc_string): to_save[cc_string] = 1 if to_save[cc_string] == 'True' else 0 elif c.datatype == 'comments': to_save[cc_string] = Markup(to_save[cc_string]).unescape() + if to_save[cc_string]: + to_save[cc_string] = clean_html(to_save[cc_string]) elif c.datatype == 'datetime': try: to_save[cc_string] = datetime.strptime(to_save[cc_string], "%Y-%m-%d") diff --git a/cps/jinjia.py b/cps/jinjia.py index 70a6090e..2d18c6f0 100644 --- a/cps/jinjia.py +++ b/cps/jinjia.py @@ -28,10 +28,11 @@ import mimetypes from uuid import uuid4 from babel.dates import format_date +from flask_babel import gettext as _ from flask import Blueprint, request, url_for from flask_babel import get_locale from flask_login import current_user - +from markupsafe import escape from . import logger @@ -129,6 +130,10 @@ def formatseriesindex_filter(series_index): return series_index return 0 +@jinjia.app_template_filter('escapedlink') +def escapedlink_filter(url, text): + return "{}".format(url, escape(text)) + @jinjia.app_template_filter('uuidfilter') def uuidfilter(var): return uuid4() diff --git a/cps/templates/detail.html b/cps/templates/detail.html index fe19cb6f..4a3d8f23 100644 --- a/cps/templates/detail.html +++ b/cps/templates/detail.html @@ -120,9 +120,8 @@

{% endif %} - {% if entry.series|length > 0 %} -

{{_("Book %(index)s of %(range)s", index=entry.series_index|formatfloat(2), range=("" + entry.series[0].name + "")|safe) }}

+

{{_("Book %(index)s of %(range)s", index=entry.series_index | formatfloat(2), range=(url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id)|escapedlink(entry.series[0].name))|safe)}}

{% endif %} diff --git a/cps/templates/index.html b/cps/templates/index.html index b11500e4..dabcd8da 100644 --- a/cps/templates/index.html +++ b/cps/templates/index.html @@ -63,7 +63,7 @@ {% endif %}
-

{{_(title)}}

+

{{title}}