diff --git a/README.md b/README.md index 6292876..9127743 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Browsing, reading and downloading eBooks using a Calibre database -**Shipped version:** 0.6.19 +**Shipped version:** 0.6.20 ## Screenshots ![Screenshot of Calibre-web](./doc/screenshots/screenshot.png) diff --git a/README_fr.md b/README_fr.md index 033ec49..ebb1bd3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Explorer, lire et télécharger des eBooks à partir d'une base de données Calibre -**Version incluse :** 0.6.19 +**Version incluse :** 0.6.20 ## Captures d’écran ![Capture d’écran de Calibre-web](./doc/screenshots/screenshot.png) diff --git a/check_process b/check_process index 335fa01..e1d3435 100644 --- a/check_process +++ b/check_process @@ -16,7 +16,8 @@ setup_private=1 setup_public=1 upgrade=1 - #upgrade=1 from_commit=581a4e1de5caa7aa19a64f63348b174b7602753 # FIXME : this commit doesnt exist ... +#Last version + upgrade=1 from_commit=3d6385a2a58984a53c328a4f1aa1b900a84aba1e backup_restore=1 multi_instance=1 port_already_use=1 (8083) diff --git a/conf/app.src b/conf/app.src index 129ea79..9ef0ec0 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,3 +1,3 @@ -SOURCE_URL=https://github.com/janeczku/calibre-web/releases/download/0.6.19/calibre-web-0.6.19.zip -SOURCE_SUM=fbb0b328dcba04d895a717c61af181897bf9ef081f1a3cf52a7223b1bbbfb015 +SOURCE_URL=https://github.com/janeczku/calibre-web/releases/download/0.6.20/calibre-web-0.6.20.zip +SOURCE_SUM=2f1f8a5ae06f182986193a90796fa96a7b0b5c61fdd29971969b49245b1aaf24 SOURCE_FORMAT=zip diff --git a/manifest.json b/manifest.json index 9c0e4ad..32c2a06 100644 --- a/manifest.json +++ b/manifest.json @@ -6,10 +6,10 @@ "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" }, - "version": "0.96.19~ynh8", + "version": "0.6.20~ynh1", "url": "https://github.com/janeczku/calibre-web", "upstream": { - "version": "0.6.19", + "version": "0.6.20", "license": "GPL-3.0-only", "admindoc": "https://github.com/janeczku/calibre-web/wiki", "code": "https://github.com/janeczku/calibre-web" @@ -27,7 +27,7 @@ "nginx" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" @@ -45,9 +45,9 @@ { "name": "is_public", "type": "boolean", - "help":{ - "en":"No will set the library in /home/yunohost.multimedia/admin/eBook, except if you set the library as public", - "fr":"Non parametrera la bibliothèque pour /home/yunohost.multimedia/admin/eBook sauf si la bibliothèque est également publique" + "help": { + "en": "No will set the library in /home/yunohost.multimedia/admin/eBook, except if you set the library as public", + "fr": "Non parametrera la bibliothèque pour /home/yunohost.multimedia/admin/eBook sauf si la bibliothèque est également publique" }, "default": false }, @@ -59,38 +59,43 @@ "en": "Select a default language", "fr": "Choisissez une langue par défaut" }, - "help":{ - "en":"You may change it later in the app", - "fr":"Vous pourrez la changer ultérieurement dans l'application" + "help": { + "en": "You may change it later in the app", + "fr": "Vous pourrez la changer ultérieurement dans l'application" }, - "choices": [ "fr", "en", "es", "de"], + "choices": [ + "fr", + "en", + "es", + "de" + ], "default": "fr" }, { "name": "upload", - "type":"boolean", + "type": "boolean", "optional": true, "ask": { "en": "Do you want to allow uploading of books?", "fr": "Voulez vous autoriser le téléversement de livres?" }, - "help":{ - "en":"You may change it later in the app", - "fr":"Vous pourrez le changer ultérieurement dans l'application" + "help": { + "en": "You may change it later in the app", + "fr": "Vous pourrez le changer ultérieurement dans l'application" }, "default": false }, { "name": "public_library", - "type":"boolean", + "type": "boolean", "optional": true, "ask": { "en": "Do you want to allow access to the library to all Yunohost users? ", "fr": "Voulez vous autoriser l'accès à la bibliothèque à tous les utilisateurs Yunohost?" }, - "help":{ - "en":"Yes will set the library in /home/yunohost.multimedia/share/eBook", - "fr":"Oui parametrera la bibliothèque pour /home/yunohost.multimedia/share/eBook" + "help": { + "en": "Yes will set the library in /home/yunohost.multimedia/share/eBook", + "fr": "Oui parametrera la bibliothèque pour /home/yunohost.multimedia/share/eBook" }, "default": true } diff --git a/scripts/install b/scripts/install index fa13bf7..fa49f0c 100755 --- a/scripts/install +++ b/scripts/install @@ -18,6 +18,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN +admin_mail=$(ynh_user_get_info --username="$admin" --key=mail) is_public=$YNH_APP_ARG_IS_PUBLIC language=$YNH_APP_ARG_LANGUAGE upload=$YNH_APP_ARG_UPLOAD diff --git a/scripts/upgrade b/scripts/upgrade index 88b28e9..3e18a0c 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,6 +22,7 @@ domain=$(ynh_app_setting_get $app domain) port=$(ynh_app_setting_get $app port) path_url=$(ynh_app_setting_get $app path) admin=$(ynh_app_setting_get $app admin) +admin_mail=$(ynh_user_get_info --username="$admin" --key=mail) final_path=$(ynh_app_setting_get $app final_path) language=$(ynh_app_setting_get $app language) diff --git a/sources/patches/app-config_sql.py.patch.src b/sources/patches/app-config_sql.py.patch.src index 73bcd7e..6fad06e 100644 --- a/sources/patches/app-config_sql.py.patch.src +++ b/sources/patches/app-config_sql.py.patch.src @@ -59,11 +59,3 @@ config_converterpath = Column(String, default=None) config_calibre = Column(String) config_rarfile_location = Column(String, default=None) -@@ -269,6 +269,7 @@ - def set_from_dictionary(self, dictionary, field, convertor=None, default=None, encode=None): - """Possibly updates a field of this object. - The new value, if present, is grabbed from the given dictionary, and optionally passed through a convertor. -+ - :returns: `True` if the field has changed value - """ - new_value = dictionary.get(field, default) diff --git a/sources/patches/app-optional-requirements.txt.patch b/sources/patches/app-optional-requirements.txt.patch index 706845b..861e31f 100644 --- a/sources/patches/app-optional-requirements.txt.patch +++ b/sources/patches/app-optional-requirements.txt.patch @@ -1,22 +1,22 @@ ---- a/optional-requirements.txt 2022-04-03 20:17:34.000000000 +0200 -+++ b/optional-requirements.txt 2022-04-18 12:10:55.761291352 +0200 +--- a/optional-requirements.txt 2023-03-27 19:49:57.000000000 +0200 ++++ b/optional-requirements.txt 2023-04-08 15:37:08.576678746 +0200 @@ -1,19 +1,5 @@ # GDrive Integration --google-api-python-client>=1.7.11,<2.50.0 - gevent>20.6.0,<22.0.0 --greenlet>=0.4.17,<1.2.0 --httplib2>=0.9.2,<0.21.0 +-google-api-python-client>=1.7.11,<2.90.0 + gevent>20.6.0,<23.0.0 +-greenlet>=0.4.17,<2.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.3.0 -pyasn1>=0.1.9,<0.5.0 --PyDrive2>=1.3.1,<1.11.0 +-PyDrive2>=1.3.1,<1.16.0 -PyYAML>=3.12 --rsa>=3.4.2,<4.9.0 +-rsa>=3.4.2,<4.10.0 - -# Gmail --google-auth-oauthlib>=0.4.3,<0.6.0 --google-api-python-client>=1.7.11,<2.50.0 +-google-auth-oauthlib>=0.4.3,<0.9.0 +-google-api-python-client>=1.7.11,<2.90.0 # goodreads goodreads>=0.3.2,<0.4.0 @@ -25,8 +25,8 @@ Flask-SimpleLDAP>=1.4.0,<1.5.0 -# oauth --Flask-Dance>=2.0.0,<5.2.0 --SQLAlchemy-Utils>=0.33.5,<0.39.0 +-Flask-Dance>=2.0.0,<6.3.0 +-SQLAlchemy-Utils>=0.33.5,<0.40.0 - # metadata extraction rarfile>=3.2 diff --git a/sources/patches/app-ub.py.patch.src b/sources/patches/app-ub.py.patch.src index c7601bf..802a808 100644 --- a/sources/patches/app-ub.py.patch.src +++ b/sources/patches/app-ub.py.patch.src @@ -1,6 +1,6 @@ ---- a/cps/ub.py 2022-03-06 16:10:41.000000000 +0100 -+++ b/cps/ub.py 2022-03-08 21:09:41.238818846 +0100 -@@ -231,7 +231,7 @@ +--- a/cps/ub.py 2023-03-27 19:49:57.000000000 +0200 ++++ b/cps/ub.py 2023-04-08 15:48:09.987725888 +0200 +@@ -235,7 +235,7 @@ kindle_mail = Column(String(120), default="") shelf = relationship('Shelf', backref='user', lazy='dynamic', order_by='Shelf.name') downloads = relationship('Downloads', backref='user', lazy='dynamic') @@ -9,12 +9,14 @@ sidebar_view = Column(Integer, default=1) default_language = Column(String(3), default="all") denied_tags = Column(String, default="") -@@ -768,7 +768,7 @@ +@@ -796,8 +796,8 @@ # Generate User admin with admin123 password, and access to everything def create_admin_user(_session): user = User() - user.name = "admin" +- user.email = "admin@example.org" + user.name = "__ADMIN__" ++ user.email = "__ADMIN_MAIL__" user.role = constants.ADMIN_USER_ROLES user.sidebar_view = constants.ADMIN_USER_SIDEBAR