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

Merge pull request #145 from YunoHost-Apps/testing

0.96.22
This commit is contained in:
Krakinou 2024-07-12 07:59:27 +02:00 committed by GitHub
commit b19d3501c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 43 additions and 35 deletions

View file

@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# Calibre-web for YunoHost
[![Integration level](https://dash.yunohost.org/integration/calibreweb.svg)](https://dash.yunohost.org/appci/app/calibreweb) ![Working status](https://ci-apps.yunohost.org/ci/badges/calibreweb.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/calibreweb.maintain.svg)
[![Integration level](https://dash.yunohost.org/integration/calibreweb.svg)](https://ci-apps.yunohost.org/ci/apps/calibreweb/) ![Working status](https://ci-apps.yunohost.org/ci/badges/calibreweb.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/calibreweb.maintain.svg)
[![Install Calibre-web with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calibreweb)
@ -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

View file

@ -5,7 +5,7 @@ No se debe editar a mano.
# Calibre-web para Yunohost
[![Nivel de integración](https://dash.yunohost.org/integration/calibreweb.svg)](https://dash.yunohost.org/appci/app/calibreweb) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/calibreweb.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/calibreweb.maintain.svg)
[![Nivel de integración](https://dash.yunohost.org/integration/calibreweb.svg)](https://ci-apps.yunohost.org/ci/apps/calibreweb/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/calibreweb.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/calibreweb.maintain.svg)
[![Instalar Calibre-web con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calibreweb)
@ -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

View file

@ -5,7 +5,7 @@ EZ editatu eskuz.
# Calibre-web YunoHost-erako
[![Integrazio maila](https://dash.yunohost.org/integration/calibreweb.svg)](https://dash.yunohost.org/appci/app/calibreweb) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/calibreweb.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/calibreweb.maintain.svg)
[![Integrazio maila](https://dash.yunohost.org/integration/calibreweb.svg)](https://ci-apps.yunohost.org/ci/apps/calibreweb/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/calibreweb.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/calibreweb.maintain.svg)
[![Instalatu Calibre-web YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calibreweb)
@ -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

View file

@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
# Calibre-web pour YunoHost
[![Niveau dintégration](https://dash.yunohost.org/integration/calibreweb.svg)](https://dash.yunohost.org/appci/app/calibreweb) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/calibreweb.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/calibreweb.maintain.svg)
[![Niveau dintégration](https://dash.yunohost.org/integration/calibreweb.svg)](https://ci-apps.yunohost.org/ci/apps/calibreweb/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/calibreweb.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/calibreweb.maintain.svg)
[![Installer Calibre-web avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calibreweb)
@ -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

View file

@ -5,7 +5,7 @@ NON debe editarse manualmente.
# Calibre-web para YunoHost
[![Nivel de integración](https://dash.yunohost.org/integration/calibreweb.svg)](https://dash.yunohost.org/appci/app/calibreweb) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/calibreweb.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/calibreweb.maintain.svg)
[![Nivel de integración](https://dash.yunohost.org/integration/calibreweb.svg)](https://ci-apps.yunohost.org/ci/apps/calibreweb/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/calibreweb.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/calibreweb.maintain.svg)
[![Instalar Calibre-web con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calibreweb)
@ -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

View file

@ -5,7 +5,7 @@
# YunoHost 上的 Calibre-web
[![集成程度](https://dash.yunohost.org/integration/calibreweb.svg)](https://dash.yunohost.org/appci/app/calibreweb) ![工作状态](https://ci-apps.yunohost.org/ci/badges/calibreweb.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/calibreweb.maintain.svg)
[![集成程度](https://dash.yunohost.org/integration/calibreweb.svg)](https://ci-apps.yunohost.org/ci/apps/calibreweb/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/calibreweb.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/calibreweb.maintain.svg)
[![使用 YunoHost 安装 Calibre-web](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calibreweb)
@ -18,7 +18,7 @@
Browsing, reading and downloading eBooks using a Calibre database
**分发版本:** 0.96.21~ynh2
**分发版本:** 0.96.22~ynh1
## 截图

View file

@ -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"
@ -91,6 +91,10 @@ ram.runtime = "200M"
autoupdate.upstream = "https://github.com/pgaskin/kepubify"
autoupdate.strategy = "latest_github_release"
autoupdate.asset.amd64 = "kepubify-linux-64bit"
autoupdate.asset.i386 = "kepubify-linux-32bit"
autoupdate.asset.armhf = "kepubify-linux-arm$"
autoupdate.asset.arm64 = "kepubify-linux-arm64"
[resources.system_user]

View file

@ -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

View file

@ -91,7 +91,6 @@ if [ -z /etc/ImageMagick-6/policy.xml ]; then
--target_file="/etc/ImageMagick-6/policy.xml"
fi
# Remove the log files
ynh_script_progression --message="Removing log file..." --weight=1
ynh_secure_remove "$log_file"
ynh_secure_remove "$access_log_file"

View file

@ -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'

View file

@ -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"