Merge remote-tracking branch 'upstream/main' into koreader-sync

Author: demitrix

root/app/calibre-web/cps/cwa_functions.py

@@ -72,7 +72,7 @@ def cwa_switch_theme():
         config.config_default_show |= constants.DETAIL_RANDOM
 
     config.save()
-    return redirect("/", code=302)
+    return redirect(url_for("web.index"), code=302)
 
 ##————————————————————————————————————————————————————————————————————————————##
 ##                                                                            ##
@@ -96,7 +96,7 @@ def cwa_library_refresh():
     else:
         flash(_("Library Refresh: An unexpected error occurred, check the logs."), category="cwa_refresh")
 
-    return redirect("/", code=302)
+    return redirect(url_for("web.index"), code=302)
 
 ##————————————————————————————————————————————————————————————————————————————##
 ##                                                                            ##
@@ -688,4 +688,4 @@ def get_status():
     progress = extract_progress(status)
     statusList = {'status':status,
                   'progress':progress}
-    return json.dumps(statusList)
+    return json.dumps(statusList)

root/etc/s6-overlay/s6-rc.d/cwa-auto-zipper/run

@@ -8,9 +8,11 @@ mkdir -p /config/processed_books/imported
 mkdir -p /config/processed_books/failed
 mkdir -p /config/processed_books/fixed_originals
 mkdir -p /config/log_archive
+mkdir -p /config/.cwa_conversion_tmp
 
 chown -R abc:abc /config/processed_books
 chown -R abc:abc /config/log_archive
+chown -R abc:abc /config/.cwa_conversion_tmp
 
 
 tz=$(printcontenv TZ)