Fix archiving bookm for kobo sync

Fix back function without search parameter Updated Testresults
janeczku · Aug 4, 2024 · c4fad3c · c4fad3c
2 parents abc923a + 9b520b1
commit c4fad3c
Show file tree

Hide file tree

Showing 4 changed files with 530 additions and 854 deletions.
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
@@ -171,6 +171,9 @@ $("#back").click(function() {
    }
    sessionStorage.removeItem("back");
    sessionStorage.removeItem("search");
+   if (param === null) {
+       param = "";
+   }
    window.location.href = loc + param;
 
 });

diff --git a/cps/web.py b/cps/web.py
@@ -183,9 +183,9 @@ def toggle_read(book_id):
 @web.route("/ajax/togglearchived/<int:book_id>", methods=['POST'])
 @user_login_required
 def toggle_archived(book_id):
-    is_archived = change_archived_books(book_id, message="Book {} archive bit toggled".format(book_id))
-    if is_archived:
-        remove_synced_book(book_id)
+    change_archived_books(book_id, message="Book {} archive bit toggled".format(book_id))
+    # Remove book from syncd books list to force resync (?)
+    remove_synced_book(book_id)
     return ""
 
 

diff --git a/setup.cfg b/setup.cfg
@@ -38,11 +38,9 @@ console_scripts =
 [options]
 include_package_data = True
 install_requires = 
-	Werkzeug<3.0.0
 	APScheduler>=3.6.3,<3.11.0
 	Babel>=1.3,<3.0
 	Flask-Babel>=0.11.1,<4.1.0
-	Flask-Login>=0.3.2,<0.6.4
 	Flask-Principal>=0.3.2,<0.5.1
 	Flask>=1.0.2,<3.1.0
 	iso-639>=0.4.5,<0.5.0
@@ -57,10 +55,11 @@ install_requires =
 	flask-wtf>=0.14.2,<1.3.0
 	chardet>=3.0.0,<4.1.0
 	advocate>=1.0.0,<1.1.0
-	Flask-Limiter>=2.3.0,<3.6.0
+	Flask-Limiter>=2.3.0,<3.9.0
 	regex>=2022.3.2,<2024.6.25
 	bleach>=6.0.0,<6.2.0
 	python-magic>=0.4.27,<0.5.0
+	flask-httpAuth>=4.4.0,<5.0.0
 
 
 [options.packages.find]
@@ -105,5 +104,5 @@ comics =
 	natsort>=2.2.0,<8.5.0
 	comicapi>=2.2.0,<3.3.0
 kobo = 
-	jsonschema>=3.2.0,<4.23.0
+	jsonschema>=3.2.0,<4.24.0