From f5b79930ad56f62281d7e173f23558178d55215b Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sun, 20 Mar 2022 20:02:57 +0100 Subject: [PATCH 1/2] Bugfix remember sort order of series and authors if entered from link below book cover (#2340) --- cps/templates/author.html | 8 ++++---- cps/templates/discover.html | 6 +++--- cps/templates/index.html | 12 ++++++------ cps/templates/languages.html | 2 +- cps/templates/search.html | 6 +++--- cps/templates/shelf.html | 6 +++--- cps/templates/shelfdown.html | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cps/templates/author.html b/cps/templates/author.html index fc811368..b691d398 100644 --- a/cps/templates/author.html +++ b/cps/templates/author.html @@ -52,7 +52,7 @@ {% if not loop.first %} & {% endif %} - {{author.name.replace('|',',')|shortentitle(30)}} + {{author.name.replace('|',',')|shortentitle(30)}} {% if loop.last %} (...) {% endif %} @@ -60,7 +60,7 @@ {% if not loop.first %} & {% endif %} - {{author.name.replace('|',',')|shortentitle(30)}} + {{author.name.replace('|',',')|shortentitle(30)}} {% endif %} {% endfor %} {% for format in entry.data %} @@ -71,7 +71,7 @@

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

- + {{entry.series[0].name}} ({{entry.series_index|formatseriesindex}}) @@ -123,7 +123,7 @@

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

- + {{entry.series[0].name}} ({{entry.series_index|formatseriesindex}}) diff --git a/cps/templates/discover.html b/cps/templates/discover.html index bceb6a8a..852d6210 100644 --- a/cps/templates/discover.html +++ b/cps/templates/discover.html @@ -25,7 +25,7 @@ {% if not loop.first %} & {% endif %} - {{author.name.replace('|',',')|shortentitle(30)}} + {{author.name.replace('|',',')|shortentitle(30)}} {% if loop.last %} (...) {% endif %} @@ -33,13 +33,13 @@ {% if not loop.first %} & {% endif %} - {{author.name.replace('|',',')|shortentitle(30)}} + {{author.name.replace('|',',')|shortentitle(30)}} {% endif %} {% endfor %}

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

- + {{entry.series[0].name}} ({{entry.series_index|formatseriesindex}}) diff --git a/cps/templates/index.html b/cps/templates/index.html index b69a9284..79ee29b6 100644 --- a/cps/templates/index.html +++ b/cps/templates/index.html @@ -24,7 +24,7 @@ {% if not loop.first %} & {% endif %} - {{author.name.replace('|',',')|shortentitle(30)}} + {{author.name.replace('|',',')|shortentitle(30)}} {% if loop.last %} (...) {% endif %} @@ -32,13 +32,13 @@ {% if not loop.first %} & {% endif %} - {{author.name.replace('|',',')|shortentitle(30)}} + {{author.name.replace('|',',')|shortentitle(30)}} {% endif %} {% endfor %}

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

- + {{entry.series[0].name}} ({{entry.series_index|formatseriesindex}}) @@ -106,7 +106,7 @@ {% if not loop.first %} & {% endif %} - {{author.name.replace('|',',')|shortentitle(30)}} + {{author.name.replace('|',',')|shortentitle(30)}} {% if loop.last %} (...) {% endif %} @@ -114,7 +114,7 @@ {% if not loop.first %} & {% endif %} - {{author.name.replace('|',',')|shortentitle(30)}} + {{author.name.replace('|',',')|shortentitle(30)}} {% endif %} {% endfor %} {% for format in entry.data %} @@ -125,7 +125,7 @@

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

- + {{entry.series[0].name}} ({{entry.series_index|formatseriesindex}}) diff --git a/cps/templates/languages.html b/cps/templates/languages.html index 8331cb94..c83398d5 100644 --- a/cps/templates/languages.html +++ b/cps/templates/languages.html @@ -23,7 +23,7 @@ {% endif %}

{{lang[1]}}
-
{{lang[0].name}}
+
{{lang[0].name}}
{% endfor %} diff --git a/cps/templates/search.html b/cps/templates/search.html index a7ba5e68..4f8d607b 100644 --- a/cps/templates/search.html +++ b/cps/templates/search.html @@ -61,7 +61,7 @@ {% if not loop.first %} & {% endif %} - {{author.name.replace('|',',')|shortentitle(30)}} + {{author.name.replace('|',',')|shortentitle(30)}} {% if loop.last %} (...) {% endif %} @@ -69,7 +69,7 @@ {% if not loop.first %} & {% endif %} - {{author.name.replace('|',',')|shortentitle(30)}} + {{author.name.replace('|',',')|shortentitle(30)}} {% endif %} {% endfor %} {% for format in entry.Books.data %} @@ -80,7 +80,7 @@

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

- + {{entry.Books.series[0].name}} ({{entry.Books.series_index|formatseriesindex}}) diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html index 2e4cf906..e5cb2ffb 100644 --- a/cps/templates/shelf.html +++ b/cps/templates/shelf.html @@ -49,7 +49,7 @@ {% if not loop.first %} & {% endif %} - {{author.name.replace('|',',')|shortentitle(30)}} + {{author.name.replace('|',',')|shortentitle(30)}} {% if loop.last %} (...) {% endif %} @@ -57,13 +57,13 @@ {% if not loop.first %} & {% endif %} - {{author.name.replace('|',',')|shortentitle(30)}} + {{author.name.replace('|',',')|shortentitle(30)}} {% endif %} {% endfor %}

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

- + {{entry.series[0].name}} ({{entry.series_index|formatseriesindex}}) diff --git a/cps/templates/shelfdown.html b/cps/templates/shelfdown.html index 78f00b5e..c800dca7 100644 --- a/cps/templates/shelfdown.html +++ b/cps/templates/shelfdown.html @@ -38,7 +38,7 @@

{{entry.title|shortentitle}}

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

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

- + {{entry.series[0].name}} ({{entry.series_index}}) From 0d49b56883dc525a8b687d84f070e29363625144 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Mon, 21 Mar 2022 18:50:02 +0100 Subject: [PATCH 2/2] Update gmail.json location --- README.md | 2 +- cps/services/gmail.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d9c50f7f..fb8bcd7f 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d 1. To avoid problems with already installed python dependencies, it's recommended to create a virtual environment for Calibre-Web 2. Install Calibre-Web via pip with the command `pip install calibreweb` (Depending on your OS and or distro the command could also be `pip3`). 3. Optional features can also be installed via pip, please refer to [this page](https://github.com/janeczku/calibre-web/wiki/Dependencies-in-Calibre-Web-Linux-Windows) for details -4. Calibre-Web can be started afterwards by typing `cps` or `python3 -m cps` +4. Calibre-Web can be started afterwards by typing `cps` In the Wiki there are also examples for a [manual installation](https://github.com/janeczku/calibre-web/wiki/Manual-installation) and for installation on [Linux Mint](https://github.com/janeczku/calibre-web/wiki/How-To:Install-Calibre-Web-in-Linux-Mint-19-or-20) diff --git a/cps/services/gmail.py b/cps/services/gmail.py index ff36b308..3a4eab7f 100644 --- a/cps/services/gmail.py +++ b/cps/services/gmail.py @@ -25,7 +25,7 @@ from google.oauth2.credentials import Credentials from datetime import datetime import base64 from flask_babel import gettext as _ -from ..constants import BASE_DIR +from ..constants import CONFIG_DIR from .. import logger @@ -53,11 +53,11 @@ def setup_gmail(token): if creds and creds.expired and creds.refresh_token: creds.refresh(Request()) else: - cred_file = os.path.join(BASE_DIR, 'gmail.json') + cred_file = os.path.join(CONFIG_DIR, 'gmail.json') if not os.path.exists(cred_file): raise Exception(_("Found no valid gmail.json file with OAuth information")) flow = InstalledAppFlow.from_client_secrets_file( - os.path.join(BASE_DIR, 'gmail.json'), SCOPES) + os.path.join(CONFIG_DIR, 'gmail.json'), SCOPES) creds = flow.run_local_server(port=0) user_info = get_user_info(creds) return {