YunoHost-Apps/calibreweb_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/calibreweb_ynh.git synced 2024-09-03 18:16:20 +02:00
Code Issues Activity Actions

Merge pull request #144 from YunoHost-Apps/0.96.22

Browse source 
0.96.22
This commit is contained in:
Krakinou 2024-07-11 08:09:33 +02:00 • committed by GitHub
commit eac5fd85a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -18,7 +18,7 @@ It shall NOT be edited by hand.
Browsing, reading and downloading eBooks using a Calibre database Browsing, reading and downloading eBooks using a Calibre database
**Shipped version:** 0.96.21~ynh2 **Shipped version:** 0.96.22~ynh1
## Screenshots ## Screenshots

2
README_es.md
View file

@ -18,7 +18,7 @@ No se debe editar a mano.
Browsing, reading and downloading eBooks using a Calibre database Browsing, reading and downloading eBooks using a Calibre database
**Versión actual:** 0.96.21~ynh2 **Versión actual:** 0.96.22~ynh1
## Capturas ## Capturas

2
README_eu.md
View file

@ -18,7 +18,7 @@ EZ editatu eskuz.
Browsing, reading and downloading eBooks using a Calibre database Browsing, reading and downloading eBooks using a Calibre database
**Paketatutako bertsioa:** 0.96.21~ynh2 **Paketatutako bertsioa:** 0.96.22~ynh1
## Pantaila-argazkiak ## Pantaila-argazkiak

2
README_fr.md
View file

@ -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 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 ## Captures d’écran

2
README_gl.md
View file

@ -18,7 +18,7 @@ NON debe editarse manualmente.
Browsing, reading and downloading eBooks using a Calibre database 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 ## Capturas de pantalla

2
README_zh_Hans.md
View file

@ -18,7 +18,7 @@
Browsing, reading and downloading eBooks using a Calibre database Browsing, reading and downloading eBooks using a Calibre database
**分发版本：** 0.96.21~ynh2 **分发版本：** 0.96.22~ynh1
## 截图 ## 截图

6
manifest.toml
View file

@ -7,7 +7,7 @@ name = "Calibre-web"
description.en = "Browsing, reading and downloading eBooks using a Calibre database" 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" 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"] maintainers = ["Krakinou"]
@ -71,8 +71,8 @@ ram.runtime = "200M"
[resources] [resources]
[resources.sources.main] [resources.sources.main]
url = "https://github.com/janeczku/calibre-web/archive/refs/tags/0.6.21.zip" url = "https://github.com/janeczku/calibre-web/archive/refs/tags/0.6.22.zip"
sha256 = "570afeb74ec6506380e923244088c656921ffc94a616c9da46d68f5f39237fa4" sha256 = "59505b0edcf8771ac681cdb4fc9729d546a34ca2f5f4216201d8f09997ec338f"
autoupdate.strategy = "latest_github_release" autoupdate.strategy = "latest_github_release"

5
scripts/install
View file

@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers
admin_mail=$(ynh_user_get_info --username="$admin" --key=mail) 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 calibre_dir=$DOSSIER_MEDIA/share/eBook
else # library is private else # library is private
calibre_dir=$DOSSIER_MEDIA/$admin/eBook calibre_dir=$DOSSIER_MEDIA/$admin/eBook
@ -26,7 +26,6 @@ fi
# DOWNLOAD, CHECK AND UNPACK SOURCE # DOWNLOAD, CHECK AND UNPACK SOURCE
#================================================= #=================================================
ynh_script_progression --message="Installing and patching sources to $install_dir..." --weight=10 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 #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" 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_script_progression --message="Start $app..." --weight=5
ynh_systemd_action --service_name=$app --action="start" --line_match="Starting Gevent server on" -t 30 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 #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. #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 if ! $(ynh_permission_has_user --permission=main --user=visitors); then

36
sources/patches/main-optional-requirements.txt.patch
View file

@ -1,33 +1,39 @@
--- a/optional-requirements.txt 2023-10-21 12:40:32.000000000 +0200 --- a/optional-requirements.txt 2024-07-06 04:29:16.000000000 +0200
+++ b/optional-requirements.txt 2023-11-09 23:07:35.075891057 +0100 +++ b/optional-requirements.txt 2024-07-09 23:27:11.250122853 +0200
@@ -1,19 +1,5 @@ @@ -1,19 +1,5 @@
# GDrive Integration # GDrive Integration
-google-api-python-client>=1.7.11,<2.98.0 -google-api-python-client>=1.7.11,<2.200.0
gevent>20.6.0,<24.0.0 gevent>20.6.0,<24.3.0
-greenlet>=0.4.17,<2.1.0 -greenlet>=0.4.17,<3.1.0
-httplib2>=0.9.2,<0.23.0 -httplib2>=0.9.2,<0.23.0
-oauth2client>=4.0.0,<4.1.4 -oauth2client>=4.0.0,<4.1.4
-uritemplate>=3.0.0,<4.2.0 -uritemplate>=3.0.0,<4.2.0
-pyasn1-modules>=0.0.8,<0.4.0 -pyasn1-modules>=0.0.8,<0.5.0
-pyasn1>=0.1.9,<0.6.0 -pyasn1>=0.1.9,<0.7.0
-PyDrive2>=1.3.1,<1.18.0 -PyDrive2>=1.3.1,<1.20.0
-PyYAML>=3.12,<6.1 -PyYAML>=3.12,<6.1
-rsa>=3.4.2,<4.10.0 -rsa>=3.4.2,<4.10.0
- -
-# Gmail -# Gmail
-google-auth-oauthlib>=0.4.3,<1.1.0 -google-auth-oauthlib>=0.4.3,<1.3.0
-google-api-python-client>=1.7.11,<2.98.0 -google-api-python-client>=1.7.11,<2.200.0
# goodreads # goodreads
goodreads>=0.3.2,<0.4.0 goodreads>=0.3.2,<0.4.0
@@ -23,10 +9,6 @@ @@ -23,9 +9,6 @@
python-ldap>=3.0.0,<3.5.0 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 -# oauth
-Flask-Dance>=2.0.0,<7.1.0 -Flask-Dance>=2.0.0,<7.1.0
-SQLAlchemy-Utils>=0.33.5,<0.42.0 -SQLAlchemy-Utils>=0.33.5,<0.42.0
-
# metadata extraction # metadata extraction
rarfile>=3.2 rarfile>=3.2,<5.0
scholarly>=1.2.0,<1.8 @@ -43,6 +26,3 @@
# Kobo integration
jsonschema>=3.2.0,<4.23.0
-
-# Hide console Window on Windows
-pywin32>=220,<310 ; sys_platform == 'win32'

2
tests.toml
View file

@ -11,4 +11,4 @@ test_format = 1.0
# Commits to test upgrade from # Commits to test upgrade from
# ------------------------------- # -------------------------------
test_upgrade_from.b8f9f95.name = "0.6.19~ynh8" test_upgrade_from.f5a1739.name = "0.6.21~ynh2"