From c1be944a484ccaef30ecadeda2036ab190fa1d11 Mon Sep 17 00:00:00 2001
From: Webysther Sperandio <webysther@gmail.com>
Date: Mon, 26 Jan 2026 19:36:47 +0100
Subject: [PATCH 1/9] =?UTF-8?q?=F0=9F=92=84=20style(ui):=20limit=20add-to-?=
 =?UTF-8?q?shelves=20dropdown=20height=20=20=20-=20=E3=80=90style=E3=80=91?=
 =?UTF-8?q?=20constrain=20add-to-shelves=20dropdown=20height=20and=20enabl?=
 =?UTF-8?q?e=20scroll=20=20=20-=20=E3=80=90style=E3=80=91=20prevent=20over?=
 =?UTF-8?q?ly=20tall=20menus=20from=20overflowing=20the=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cps/static/css/style.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index 51a70d5f4b..2f89a574b2 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -1,3 +1,7 @@
+#add-to-shelves.dropdown-menu {
+  max-height: 300px;
+  overflow-y: auto;
+}
 
 .tooltip.bottom .tooltip-inner {
   font-size: 13px;

From 5ad6b7fa64a6b85605028fa9a108c028330d5423 Mon Sep 17 00:00:00 2001
From: Webysther Sperandio <webysther@gmail.com>
Date: Mon, 26 Jan 2026 19:39:36 +0100
Subject: [PATCH 2/9] =?UTF-8?q?=F0=9F=92=84=20style(ui):=20limit=20add-to-?=
 =?UTF-8?q?shelves=20dropdown=20height=20=20=20-=20=E3=80=90style=E3=80=91?=
 =?UTF-8?q?=20constrain=20add-to-shelves=20dropdown=20height=20and=20enabl?=
 =?UTF-8?q?e=20scroll=20=20=20-=20=E3=80=90style=E3=80=91=20prevent=20over?=
 =?UTF-8?q?ly=20tall=20menus=20from=20overflowing=20the=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cps/templates/detail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index b273ef9eec..69ec460f7a 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -294,7 +294,7 @@ <h3 id="decription">{{ _('Description:') }}</h3>
                 {% if current_user.is_authenticated %}
                     {% if current_user.shelf.all() or g.shelves_access %}
                         <div id="shelf-actions" class="btn-toolbar" role="toolbar">
-                            <div class="btn-group" role="group" aria-label="Add to shelves">
+                            <div class="btn-group dropup" role="group" aria-label="Add to shelves">
                                 <button id="add-to-shelf" type="button"
                                         class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown"
                                         aria-haspopup="true" aria-expanded="false">

From a91724edb07a3e1c04227aef7a4f2b37b3d0bdec Mon Sep 17 00:00:00 2001
From: Webysther Sperandio <webysther@gmail.com>
Date: Wed, 28 Jan 2026 21:09:47 +0100
Subject: [PATCH 3/9] =?UTF-8?q?=F0=9F=92=84=20style(css):=20include=20remo?=
 =?UTF-8?q?ve=20menu=20in=20dropdown=20scroll=20styling?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cps/static/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index 2f89a574b2..9d5a8f6a26 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -1,4 +1,4 @@
-#add-to-shelves.dropdown-menu {
+#add-to-shelves.dropdown-menu, #remove-from-shelves.dropdown-menu {
   max-height: 300px;
   overflow-y: auto;
 }

From 315584690d45f641355c7490dba38dd1d8ee15b9 Mon Sep 17 00:00:00 2001
From: lb803 <47544021+lb803@users.noreply.github.com>
Date: Thu, 5 Feb 2026 21:40:45 +0000
Subject: [PATCH 4/9] remove exclamation marks

---
 cps/static/js/get_meta.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js
index df4119dca2..ce1fbfd203 100644
--- a/cps/static/js/get_meta.js
+++ b/cps/static/js/get_meta.js
@@ -103,11 +103,11 @@ $(function () {
                         });
                     }
                     else {
-                        $("#meta-info").html("<p class=\"text-danger\">" + msg.no_result + "!</p>" + $("#meta-info")[0].innerHTML)
+                        $("#meta-info").html("<p class=\"text-danger\">" + msg.no_result + "</p>" + $("#meta-info")[0].innerHTML)
                     }
                 },
                 error: function error() {
-                    $("#meta-info").html("<p class=\"text-danger\">" + msg.search_error + "!</p>" + $("#meta-info")[0].innerHTML);
+                    $("#meta-info").html("<p class=\"text-danger\">" + msg.search_error + "</p>" + $("#meta-info")[0].innerHTML);
                 },
             });
         }

From 3aef161cb859c257300bf75d2c87b0689cb9a063 Mon Sep 17 00:00:00 2001
From: Courville Software <software@courville.org>
Date: Sat, 14 Feb 2026 17:06:44 +0100
Subject: [PATCH 5/9] fix title sort with "l'" in french

regex should not impose a space after "l'" otherwise detection for "L'arbre" fails.
---
 cps/config_sql.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/config_sql.py b/cps/config_sql.py
index c73a6cf07f..3d64d8185d 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -85,7 +85,7 @@ class _Settings(_Base):
     config_read_column = Column(Integer, default=0)
     config_title_regex = Column(String,
                                 default=r'^(A|The|An|Der|Die|Das|Den|Ein|Eine'
-                                        r'|Einen|Dem|Des|Einem|Eines|Le|La|Les|L\'|Un|Une)\s+')
+                                        r"|Einen|Dem|Des|Einem|Eines|Le|La|Les|L'|Un|Une)(\s+|(?<='))")
     config_theme = Column(Integer, default=0)
 
     config_log_level = Column(SmallInteger, default=logger.DEFAULT_LOG_LEVEL)

From d229f71151f868845b76de264f9ae09c3a518160 Mon Sep 17 00:00:00 2001
From: leahjessie <740226+leahjessie@users.noreply.github.com>
Date: Tue, 17 Feb 2026 16:34:46 -0800
Subject: [PATCH 6/9] Fix Kobo "Return to last page read" popup caused by
 float/int mismatch

---
 cps/kobo.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index da9c9bc55f..4427bff581 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -887,14 +887,21 @@ def get_statistics_response(statistics):
     return resp
 
 
+def _clean_progress(value):
+    """Return progress as int if it's a whole number, preserving Kobo device expectations."""
+    if value is not None and value == int(value):
+        return int(value)
+    return value
+
+
 def get_current_bookmark_response(current_bookmark):
     resp = {
         "LastModified": convert_to_kobo_timestamp_string(current_bookmark.last_modified),
     }
     if current_bookmark.progress_percent:
-        resp["ProgressPercent"] = current_bookmark.progress_percent
+        resp["ProgressPercent"] = _clean_progress(current_bookmark.progress_percent)
     if current_bookmark.content_source_progress_percent:
-        resp["ContentSourceProgressPercent"] = current_bookmark.content_source_progress_percent
+        resp["ContentSourceProgressPercent"] = _clean_progress(current_bookmark.content_source_progress_percent)
     if current_bookmark.location_value:
         resp["Location"] = {
             "Value": current_bookmark.location_value,

From a9713bd497be9622cdcb51b24cc1cb589bbd3ede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Sierra-Velasquez?= <rakjlou@gmail.com>
Date: Thu, 19 Feb 2026 18:14:14 +0100
Subject: [PATCH 7/9] Fix Kobo sync failure behind reverse proxy: rewrite
 library_sync URL in init response

The HandleInitRequest() function rewrites image URLs to point to the local
Calibre-Web instance, but library_sync was left pointing to storeapi.kobo.com.
This caused Kobo e-readers to call Kobo's servers for sync instead of the local
server, resulting in no books being synced when running behind a reverse proxy.
---
 cps/kobo.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cps/kobo.py b/cps/kobo.py
index da9c9bc55f..776510a10f 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -1101,6 +1101,8 @@ def HandleInitRequest():
                                                                width="{width}",
                                                                height="{height}",
                                                                isGreyscale='false'))
+        kobo_resources["library_sync"] = calibre_web_url + url_for("kobo.HandleSyncRequest",
+                                                                    auth_token=kobo_auth.get_auth_token())
     else:
         kobo_resources["image_host"] = url_for("web.index", _external=True).strip("/")
         kobo_resources["image_url_quality_template"] = unquote(url_for("kobo.HandleCoverImageRequest",
@@ -1118,6 +1120,9 @@ def HandleInitRequest():
                                                                height="{height}",
                                                                isGreyscale='false',
                                                                _external=True))
+        kobo_resources["library_sync"] = url_for("kobo.HandleSyncRequest",
+                                                  auth_token=kobo_auth.get_auth_token(),
+                                                  _external=True)
 
     response = make_response(jsonify({"Resources": kobo_resources}))
     response.headers["x-kobo-apitoken"] = "e30="

From a4bf028537aafc469d0a0878b0cb22a452e9d6c3 Mon Sep 17 00:00:00 2001
From: leahjessie <740226+leahjessie@users.noreply.github.com>
Date: Fri, 20 Feb 2026 15:34:25 -0800
Subject: [PATCH 8/9] Fix Kobo popup when ProgressPercent is 0 by using
 is-not-None check instead of truthiness

---
 cps/kobo.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index 4427bff581..d8ef42efc5 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -898,9 +898,9 @@ def get_current_bookmark_response(current_bookmark):
     resp = {
         "LastModified": convert_to_kobo_timestamp_string(current_bookmark.last_modified),
     }
-    if current_bookmark.progress_percent:
+    if current_bookmark.progress_percent is not None:
         resp["ProgressPercent"] = _clean_progress(current_bookmark.progress_percent)
-    if current_bookmark.content_source_progress_percent:
+    if current_bookmark.content_source_progress_percent is not None:
         resp["ContentSourceProgressPercent"] = _clean_progress(current_bookmark.content_source_progress_percent)
     if current_bookmark.location_value:
         resp["Location"] = {

From 36a7ff19bcd9b7321f43b4a7ce5ee6e4097f2fc3 Mon Sep 17 00:00:00 2001
From: Rafik Farhad <rafikfarhad@gmail.com>
Date: Sat, 21 Feb 2026 16:52:49 -0600
Subject: [PATCH 9/9] Fix AttributeError on unauthenticated OPDS requests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

request_username() is used as flask-limiter's key_func for the OPDS
blueprint. The limiter evaluates key_func in a before_request handler,
before the route's auth decorator runs. When no Authorization header is
present, request.authorization is None, causing an AttributeError and
a 500 response instead of the expected 401.

Guard against None so unauthenticated requests fall back to an empty
string key, allowing the auth decorator to handle the 401 correctly.

Fixes #3592

Disclaimer: AI assisted—humans supervised.
---
 cps/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/main.py b/cps/main.py
index b0f56b6d47..cc05bb50a6 100644
--- a/cps/main.py
+++ b/cps/main.py
@@ -24,7 +24,7 @@
 
 
 def request_username():
-    return request.authorization.username
+    return request.authorization.username if request.authorization else ""
 
 
 def main():