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 #104 from YunoHost-Apps/0.6.19

Browse source 
0.6.19
This commit is contained in:
Krakinou 2022-08-13 09:49:18 +02:00 • committed by GitHub
commit 9b5ba824bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 43 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
README.md
View file

@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# Calibre-web for YunoHost # Calibre-web for YunoHost
[![Integration level](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) [![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)
[![Install Calibre-web with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calibreweb) [![Install Calibre-web with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calibreweb)
*[Lire ce readme en français.](./README_fr.md)* *[Lire ce readme en français.](./README_fr.md)*
@ -17,13 +17,12 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Browsing, reading and downloading eBooks using a Calibre database Browsing, reading and downloading eBooks using a Calibre database
**Shipped version:** 0.6.18 **Shipped version:** 0.6.19
## Screenshots ## Screenshots
![](./doc/screenshots/screenshot.png) ![Screenshot of Calibre-web](./doc/screenshots/screenshot.png)
## Disclaimers / important information ## Disclaimers / important information
@ -87,20 +86,21 @@ Version number in Yunohost is different from the upstream Calibre-web app : vers
## Documentation and resources ## Documentation and resources
* Official admin documentation: https://github.com/janeczku/calibre-web/wiki * Official admin documentation: <https://github.com/janeczku/calibre-web/wiki>
* Upstream app code repository: https://github.com/janeczku/calibre-web * Upstream app code repository: <https://github.com/janeczku/calibre-web>
* YunoHost documentation for this app: https://yunohost.org/app_calibreweb * YunoHost documentation for this app: <https://yunohost.org/app_calibreweb>
* Report a bug: https://github.com/YunoHost-Apps/calibreweb_ynh/issues * Report a bug: <https://github.com/YunoHost-Apps/calibreweb_ynh/issues>
## Developer info ## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/calibreweb_ynh/tree/testing). Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/calibreweb_ynh/tree/testing).
To try the testing branch, please proceed like that. To try the testing branch, please proceed like that.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/calibreweb_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/calibreweb_ynh/tree/testing --debug
or or
sudo yunohost app upgrade calibreweb -u https://github.com/YunoHost-Apps/calibreweb_ynh/tree/testing --debug sudo yunohost app upgrade calibreweb -u https://github.com/YunoHost-Apps/calibreweb_ynh/tree/testing --debug
``` ```
**More info regarding app packaging:** https://yunohost.org/packaging_apps **More info regarding app packaging:** <https://yunohost.org/packaging_apps>

26
README_fr.md
View file

@ -1,10 +1,14 @@
<!--
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
It shall NOT be edited by hand.
-->
# Calibre-web pour YunoHost # Calibre-web pour YunoHost
[![Niveau d'intégration](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) [![Niveau d'inté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)
[![Installer Calibre-web avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calibreweb) [![Installer Calibre-web avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calibreweb)
*[Read this readme in english.](./README.md)* *[Read this readme in english.](./README.md)*
*[Lire ce readme en français.](./README_fr.md)*
> *Ce package vous permet d'installer Calibre-web rapidement et simplement sur un serveur YunoHost. > *Ce package vous permet d'installer Calibre-web rapidement et simplement sur un serveur YunoHost.
Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
@ -13,13 +17,12 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
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.6.18 **Version incluse :** 0.6.19
## Captures d'écran ## Captures d'écran
![](./doc/screenshots/screenshot.png) ![Capture d'écran de Calibre-web](./doc/screenshots/screenshot.png)
## Avertissements / informations importantes ## Avertissements / informations importantes
@ -83,20 +86,21 @@ La numérotation est modifiée dans yunohost par rapport à Calibre-web: la vers
## Documentations et ressources ## Documentations et ressources
* Documentation officielle de l'admin : https://github.com/janeczku/calibre-web/wiki * Documentation officielle de l'admin : <https://github.com/janeczku/calibre-web/wiki>
* Dépôt de code officiel de l'app : https://github.com/janeczku/calibre-web * Dépôt de code officiel de l'app : <https://github.com/janeczku/calibre-web>
* Documentation YunoHost pour cette app : https://yunohost.org/app_calibreweb * Documentation YunoHost pour cette app : <https://yunohost.org/app_calibreweb>
* Signaler un bug : https://github.com/YunoHost-Apps/calibreweb_ynh/issues * Signaler un bug : <https://github.com/YunoHost-Apps/calibreweb_ynh/issues>
## Informations pour les développeurs ## Informations pour les développeurs
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/calibreweb_ynh/tree/testing). Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/calibreweb_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit. Pour essayer la branche testing, procédez comme suit.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/calibreweb_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/calibreweb_ynh/tree/testing --debug
ou ou
sudo yunohost app upgrade calibreweb -u https://github.com/YunoHost-Apps/calibreweb_ynh/tree/testing --debug sudo yunohost app upgrade calibreweb -u https://github.com/YunoHost-Apps/calibreweb_ynh/tree/testing --debug
``` ```
**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps **Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>

4
conf/app.src
View file

@ -1,3 +1,3 @@
SOURCE_URL=https://github.com/janeczku/calibre-web/releases/download/0.6.18/calibre-web-0.6.18.zip SOURCE_URL=https://github.com/janeczku/calibre-web/releases/download/0.6.19/calibre-web-0.6.19.zip
SOURCE_SUM=65a267fc44629f9373a391333154b277a3fb9124031c1e20cd1b3acac939c95a SOURCE_SUM=fbb0b328dcba04d895a717c61af181897bf9ef081f1a3cf52a7223b1bbbfb015
SOURCE_FORMAT=zip SOURCE_FORMAT=zip

4
manifest.json
View file

@ -6,10 +6,10 @@
"en": "Browsing, reading and downloading eBooks using a Calibre database", "en": "Browsing, reading and downloading eBooks using a Calibre database",
"fr": "Explorer, lire et télécharger des eBooks à partir d'une base de données Calibre" "fr": "Explorer, lire et télécharger des eBooks à partir d'une base de données Calibre"
}, },
"version": "0.96.18~ynh1", "version": "0.96.19~ynh1",
"url": "https://github.com/janeczku/calibre-web", "url": "https://github.com/janeczku/calibre-web",
"upstream": { "upstream": {
"version": "0.6.18", "version": "0.6.19",
"license": "GPL-3.0-only", "license": "GPL-3.0-only",
"admindoc": "https://github.com/janeczku/calibre-web/wiki", "admindoc": "https://github.com/janeczku/calibre-web/wiki",
"code": "https://github.com/janeczku/calibre-web" "code": "https://github.com/janeczku/calibre-web"

4
scripts/install
View file

@ -125,8 +125,8 @@ chown -R "$app:" "$final_path"
set -o nounset set -o nounset
ynh_exec_as $app $final_path/venv/bin/python3 -m ensurepip ynh_exec_as $app $final_path/venv/bin/python3 -m ensurepip
ynh_exec_as $app $final_path/venv/bin/pip3 install --upgrade wheel pip setuptools ynh_exec_as $app $final_path/venv/bin/pip3 install --upgrade wheel pip setuptools
ynh_exec_as $app $final_path/venv/bin/pip3 install --no-cache-dir --upgrade --target $final_path/vendor -r "$final_path/requirements.txt" ynh_exec_as $app $final_path/venv/bin/pip3 install --no-cache-dir --upgrade -r "$final_path/requirements.txt"
ynh_exec_as $app $final_path/venv/bin/pip3 install --no-cache-dir --upgrade --target $final_path/vendor -r "$final_path/optional-requirements.txt" ynh_exec_as $app $final_path/venv/bin/pip3 install --no-cache-dir --upgrade -r "$final_path/optional-requirements.txt"
) )

4
scripts/upgrade
View file

@ -198,8 +198,8 @@ then
set -o nounset set -o nounset
ynh_exec_as $app $final_path/venv/bin/python3 -m ensurepip ynh_exec_as $app $final_path/venv/bin/python3 -m ensurepip
ynh_exec_as $app $final_path/venv/bin/pip3 install --upgrade wheel pip setuptools ynh_exec_as $app $final_path/venv/bin/pip3 install --upgrade wheel pip setuptools
ynh_exec_as $app $final_path/venv/bin/pip3 install --no-cache-dir --upgrade --target $final_path/vendor -r "$final_path/requirements.txt" ynh_exec_as $app $final_path/venv/bin/pip3 install --no-cache-dir --upgrade -r "$final_path/requirements.txt"
ynh_exec_as $app $final_path/venv/bin/pip3 install --no-cache-dir --upgrade --target $final_path/vendor -r "$final_path/optional-requirements.txt" ynh_exec_as $app $final_path/venv/bin/pip3 install --no-cache-dir --upgrade -r "$final_path/optional-requirements.txt"
) )
fi fi

14
sources/patches/app-config_sql.py.patch.src
View file

@ -1,6 +1,6 @@
--- a/cps/config_sql.py 2022-03-06 16:10:41.000000000 +0100 --- a/cps/config_sql.py 2022-08-12 13:48:46.980029500 +0200
+++ b/cps/config_sql.py 2022-03-08 21:04:33.966228954 +0100 +++ b/cps/config_sql.py 2022-08-12 13:51:56.223434627 +0200
@@ -61,7 +61,7 @@ @@ -62,7 +62,7 @@
mail_server_type = Column(SmallInteger, default=0) mail_server_type = Column(SmallInteger, default=0)
mail_gmail_token = Column(JSON, default={}) mail_gmail_token = Column(JSON, default={})
@ -9,7 +9,7 @@
config_calibre_uuid = Column(String) config_calibre_uuid = Column(String)
config_port = Column(Integer, default=constants.DEFAULT_PORT) config_port = Column(Integer, default=constants.DEFAULT_PORT)
config_external_port = Column(Integer, default=constants.DEFAULT_PORT) config_external_port = Column(Integer, default=constants.DEFAULT_PORT)
@@ -78,11 +78,11 @@ @@ -79,11 +79,11 @@
config_theme = Column(Integer, default=0) config_theme = Column(Integer, default=0)
config_log_level = Column(SmallInteger, default=logger.DEFAULT_LOG_LEVEL) config_log_level = Column(SmallInteger, default=logger.DEFAULT_LOG_LEVEL)
@ -25,7 +25,7 @@
config_anonbrowse = Column(SmallInteger, default=0) config_anonbrowse = Column(SmallInteger, default=0)
config_public_reg = Column(SmallInteger, default=0) config_public_reg = Column(SmallInteger, default=0)
config_remote_login = Column(Boolean, default=False) config_remote_login = Column(Boolean, default=False)
@@ -108,11 +108,11 @@ @@ -109,11 +109,11 @@
config_goodreads_api_key = Column(String) config_goodreads_api_key = Column(String)
config_goodreads_api_secret = Column(String) config_goodreads_api_secret = Column(String)
config_register_email = Column(Boolean, default=False) config_register_email = Column(Boolean, default=False)
@ -39,7 +39,7 @@
config_ldap_port = Column(SmallInteger, default=389) config_ldap_port = Column(SmallInteger, default=389)
config_ldap_authentication = Column(SmallInteger, default=constants.LDAP_AUTH_SIMPLE) config_ldap_authentication = Column(SmallInteger, default=constants.LDAP_AUTH_SIMPLE)
config_ldap_serv_username = Column(String, default='cn=admin,dc=example,dc=org') config_ldap_serv_username = Column(String, default='cn=admin,dc=example,dc=org')
@@ -121,11 +121,11 @@ @@ -122,11 +122,11 @@
config_ldap_cacert_path = Column(String, default="") config_ldap_cacert_path = Column(String, default="")
config_ldap_cert_path = Column(String, default="") config_ldap_cert_path = Column(String, default="")
config_ldap_key_path = Column(String, default="") config_ldap_key_path = Column(String, default="")
@ -47,7 +47,7 @@
- config_ldap_user_object = Column(String, default='uid=%s') - config_ldap_user_object = Column(String, default='uid=%s')
+ config_ldap_dn = Column(String, default='dc=yunohost,dc=org') + config_ldap_dn = Column(String, default='dc=yunohost,dc=org')
+ config_ldap_user_object = Column(String, default='(&(objectClass=posixAccount)(permission=cn=calibreweb.main,ou=permission,dc=yunohost,dc=org)(uid=%s))') + config_ldap_user_object = Column(String, default='(&(objectClass=posixAccount)(permission=cn=calibreweb.main,ou=permission,dc=yunohost,dc=org)(uid=%s))')
config_ldap_member_user_object = Column(String, default='') # config_ldap_member_user_object = Column(String, default='')
config_ldap_openldap = Column(Boolean, default=True) config_ldap_openldap = Column(Boolean, default=True)
- config_ldap_group_object_filter = Column(String, default='(&(objectclass=posixGroup)(cn=%s))') - config_ldap_group_object_filter = Column(String, default='(&(objectclass=posixGroup)(cn=%s))')
+ config_ldap_group_object_filter = Column(String, default='(&(objectClass=posixGroup)(cn=%s.main))') + config_ldap_group_object_filter = Column(String, default='(&(objectClass=posixGroup)(cn=%s.main))')

13
sources/patches/app-optional-requirements.txt.patch
View file

@ -2,7 +2,7 @@
+++ b/optional-requirements.txt 2022-04-18 12:10:55.761291352 +0200 +++ b/optional-requirements.txt 2022-04-18 12:10:55.761291352 +0200
@@ -1,19 +1,5 @@ @@ -1,19 +1,5 @@
# GDrive Integration # GDrive Integration
-google-api-python-client>=1.7.11,<2.43.0 -google-api-python-client>=1.7.11,<2.50.0
gevent>20.6.0,<22.0.0 gevent>20.6.0,<22.0.0
-greenlet>=0.4.17,<1.2.0 -greenlet>=0.4.17,<1.2.0
-httplib2>=0.9.2,<0.21.0 -httplib2>=0.9.2,<0.21.0
@ -16,7 +16,7 @@
- -
-# Gmail -# Gmail
-google-auth-oauthlib>=0.4.3,<0.6.0 -google-auth-oauthlib>=0.4.3,<0.6.0
-google-api-python-client>=1.7.11,<2.43.0 -google-api-python-client>=1.7.11,<2.50.0
# goodreads # goodreads
goodreads>=0.3.2,<0.4.0 goodreads>=0.3.2,<0.4.0
@ -30,11 +30,4 @@
- -
# metadata extraction # metadata extraction
rarfile>=3.2 rarfile>=3.2
scholarly>=1.2.0,<1.7 scholarly>=1.2.0,<1.8
@@ -42,3 +24,6 @@
# Kobo integration
jsonschema>=3.2.0,<4.5.0
+
+#readded to avoid 2.2 from dependencies
+werkzeug<2.1.0