From 6e5abd933522b6387b79abc7de719b0e18e11e2d Mon Sep 17 00:00:00 2001 From: Krakinou Date: Tue, 9 Jul 2024 23:56:03 +0200 Subject: [PATCH 1/3] 0.6.22 --- manifest.toml | 6 ++-- scripts/install | 5 ++- .../main-optional-requirements.txt.patch | 36 +++++++++++-------- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/manifest.toml b/manifest.toml index 61fd3ea..4eda86e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Calibre-web" description.en = "Browsing, reading and downloading eBooks using a Calibre database" description.fr = "Explorer, lire et télécharger des eBooks à partir d'une base de données Calibre" -version = "0.96.21~ynh2" +version = "0.96.22~ynh1" maintainers = ["Krakinou"] @@ -71,8 +71,8 @@ ram.runtime = "200M" [resources] [resources.sources.main] - url = "https://github.com/janeczku/calibre-web/archive/refs/tags/0.6.21.zip" - sha256 = "570afeb74ec6506380e923244088c656921ffc94a616c9da46d68f5f39237fa4" + url = "https://github.com/janeczku/calibre-web/archive/refs/tags/0.6.22.zip" + sha256 = "59505b0edcf8771ac681cdb4fc9729d546a34ca2f5f4216201d8f09997ec338f" autoupdate.strategy = "latest_github_release" diff --git a/scripts/install b/scripts/install index 65f736d..6131fa8 100755 --- a/scripts/install +++ b/scripts/install @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers admin_mail=$(ynh_user_get_info --username="$admin" --key=mail) -if [ $public_library -eq 1 ]; then +if [ $public_library -eq 1 ]; then calibre_dir=$DOSSIER_MEDIA/share/eBook else # library is private calibre_dir=$DOSSIER_MEDIA/$admin/eBook @@ -26,7 +26,6 @@ fi # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Installing and patching sources to $install_dir..." --weight=10 -#REMOVEME? ynh_app_setting_set $app install_dir $install_dir #Set settings constant initializer of the app ynh_add_config --template="../sources/patches/main-config_sql.py.patch.src" --destination="../sources/patches/main-config_sql.py.patch" @@ -176,7 +175,7 @@ ynh_add_fail2ban_config --logpath="$log_file" --failregex="^.*LDAP Login failed ynh_script_progression --message="Start $app..." --weight=5 ynh_systemd_action --service_name=$app --action="start" --line_match="Starting Gevent server on" -t 30 -#Setting the proxy authentication in case calibre is not open to visitor. +#Setting the proxy authentication in case calibre is not open to visitor. #https://github.com/janeczku/calibre-web/wiki/Setup-Reverse-Proxy#login-via-header-from-upstream-authentication-source #We need to update the sso login parameter, but for that the app needs to have run at least once to initialize the tables. if ! $(ynh_permission_has_user --permission=main --user=visitors); then diff --git a/sources/patches/main-optional-requirements.txt.patch b/sources/patches/main-optional-requirements.txt.patch index 9c84db2..47fcef4 100644 --- a/sources/patches/main-optional-requirements.txt.patch +++ b/sources/patches/main-optional-requirements.txt.patch @@ -1,33 +1,39 @@ ---- a/optional-requirements.txt 2023-10-21 12:40:32.000000000 +0200 -+++ b/optional-requirements.txt 2023-11-09 23:07:35.075891057 +0100 +--- a/optional-requirements.txt 2024-07-06 04:29:16.000000000 +0200 ++++ b/optional-requirements.txt 2024-07-09 23:27:11.250122853 +0200 @@ -1,19 +1,5 @@ # GDrive Integration --google-api-python-client>=1.7.11,<2.98.0 - gevent>20.6.0,<24.0.0 --greenlet>=0.4.17,<2.1.0 +-google-api-python-client>=1.7.11,<2.200.0 + gevent>20.6.0,<24.3.0 +-greenlet>=0.4.17,<3.1.0 -httplib2>=0.9.2,<0.23.0 -oauth2client>=4.0.0,<4.1.4 -uritemplate>=3.0.0,<4.2.0 --pyasn1-modules>=0.0.8,<0.4.0 --pyasn1>=0.1.9,<0.6.0 --PyDrive2>=1.3.1,<1.18.0 +-pyasn1-modules>=0.0.8,<0.5.0 +-pyasn1>=0.1.9,<0.7.0 +-PyDrive2>=1.3.1,<1.20.0 -PyYAML>=3.12,<6.1 -rsa>=3.4.2,<4.10.0 - -# Gmail --google-auth-oauthlib>=0.4.3,<1.1.0 --google-api-python-client>=1.7.11,<2.98.0 +-google-auth-oauthlib>=0.4.3,<1.3.0 +-google-api-python-client>=1.7.11,<2.200.0 # goodreads goodreads>=0.3.2,<0.4.0 -@@ -23,10 +9,6 @@ +@@ -23,9 +9,6 @@ python-ldap>=3.0.0,<3.5.0 - Flask-SimpleLDAP>=1.4.0,<1.5.0 + Flask-SimpleLDAP>=1.4.0,<2.1.0 -# oauth -Flask-Dance>=2.0.0,<7.1.0 -SQLAlchemy-Utils>=0.33.5,<0.42.0 -- + # metadata extraction - rarfile>=3.2 - scholarly>=1.2.0,<1.8 + rarfile>=3.2,<5.0 +@@ -43,6 +26,3 @@ + + # Kobo integration + jsonschema>=3.2.0,<4.23.0 +- +-# Hide console Window on Windows +-pywin32>=220,<310 ; sys_platform == 'win32' From 5d2d26af8ed7b279384d982cf7dd2dde8c4f4565 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 9 Jul 2024 21:58:54 +0000 Subject: [PATCH 2/3] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0d1ec04..0f43572 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ It shall NOT be edited by hand. Browsing, reading and downloading eBooks using a Calibre database -**Shipped version:** 0.96.21~ynh2 +**Shipped version:** 0.96.22~ynh1 ## Screenshots diff --git a/README_es.md b/README_es.md index b18f38d..e0d6cec 100644 --- a/README_es.md +++ b/README_es.md @@ -18,7 +18,7 @@ No se debe editar a mano. Browsing, reading and downloading eBooks using a Calibre database -**Versión actual:** 0.96.21~ynh2 +**Versión actual:** 0.96.22~ynh1 ## Capturas diff --git a/README_eu.md b/README_eu.md index 8075ec8..9e92e7b 100644 --- a/README_eu.md +++ b/README_eu.md @@ -18,7 +18,7 @@ EZ editatu eskuz. Browsing, reading and downloading eBooks using a Calibre database -**Paketatutako bertsioa:** 0.96.21~ynh2 +**Paketatutako bertsioa:** 0.96.22~ynh1 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index aeec67a..c98f682 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. Explorer, lire et télécharger des eBooks à partir d'une base de données Calibre -**Version incluse :** 0.96.21~ynh2 +**Version incluse :** 0.96.22~ynh1 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index b246dd0..8db4f63 100644 --- a/README_gl.md +++ b/README_gl.md @@ -18,7 +18,7 @@ NON debe editarse manualmente. Browsing, reading and downloading eBooks using a Calibre database -**Versión proporcionada:** 0.96.21~ynh2 +**Versión proporcionada:** 0.96.22~ynh1 ## Capturas de pantalla diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 4442813..10d3a66 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -18,7 +18,7 @@ Browsing, reading and downloading eBooks using a Calibre database -**分发版本：** 0.96.21~ynh2 +**分发版本：** 0.96.22~ynh1 ## 截图 From 7b4568dec9118f1756d72390b2127c3784c7c271 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Thu, 11 Jul 2024 08:08:54 +0200 Subject: [PATCH 3/3] Change upgrade.from origin to 0.6.21 --- tests.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index fd4b2c5..c5f82f9 100644 --- a/tests.toml +++ b/tests.toml @@ -11,4 +11,4 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.b8f9f95.name = "0.6.19~ynh8" + test_upgrade_from.f5a1739.name = "0.6.21~ynh2"