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 #97 from YunoHost-Apps/testing

Browse source 
0.6.17
This commit is contained in:
Krakinou 2022-03-13 21:01:24 +01:00 • committed by GitHub
commit 7581a4e1de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 43 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -17,7 +17,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.16
**Shipped version:** 0.6.17

2
README_fr.md
View file

@ -13,7 +13,7 @@ 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
**Version incluse :** 0.6.16
**Version incluse :** 0.6.17

4
conf/app.src
View file

@ -1,3 +1,3 @@
SOURCE_URL=https://github.com/janeczku/calibre-web/releases/download/0.6.16/calibre-web-0.6.16.zip
SOURCE_SUM=7f9f1217b0010625765796c2122bd941b23f9d1a99f83eb6c9c4c9fa3cb2dcbc
SOURCE_URL=https://github.com/janeczku/calibre-web/releases/download/0.6.17/calibre-web-0.6.17.zip
SOURCE_SUM=3560aa9f793eead98d8df053963a569fbe08ace93418b6e8e70a2831a9314733
SOURCE_FORMAT=zip

4
manifest.json
View file

@ -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.16~ynh2",
"version": "0.96.17~ynh1",
"url": "https://github.com/janeczku/calibre-web",
"upstream": {
"version": "0.6.16",
"version": "0.6.17",
"license": "GPL-3.0-only",
"admindoc": "https://github.com/janeczku/calibre-web/wiki",
"code": "https://github.com/janeczku/calibre-web"

2
scripts/_common.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash
PKG_DEPENDENCIES="sqlite3 libldap2-dev libsasl2-dev python3-dev imagemagick python3-lxml libjpeg-dev zlib1g-dev"
PKG_DEPENDENCIES="sqlite3 libldap2-dev libsasl2-dev python3-dev imagemagick python3-lxml libjpeg-dev zlib1g-dev libffi-dev"
#PKG_DEPENDENCIES="sqlite3 python3-pip imagemagick"
DOSSIER_MEDIA=/home/yunohost.multimedia

8
scripts/install
View file

@ -96,17 +96,17 @@ ynh_setup_source "$final_path"
# INSTALL DEPENDENCIES
#=================================================
ynh_script_progression --message="Installing package dependencies..." --weight=30
ynh_script_progression --message="Installing package dependencies..." --weight=80
ynh_install_app_dependencies $PKG_DEPENDENCIES
#use latest version of pip as per documentation in https://github.com/pypa/get-pip
#cannot use helper as maintaining the checksum would be a pain in the a***
curl https://bootstrap.pypa.io/get-pip.py | python3
ynh_exec_quiet curl https://bootstrap.pypa.io/get-pip.py | python3
ynh_script_progression --message="Installing pip requirements..." --weight=50
ynh_script_progression --message="Installing pip requirements..." --weight=40
pip3 install --no-cache-dir --target $final_path/vendor -r $final_path/requirements.txt
ynh_script_progression --message="Installing pip additionnal requirements..." --weight=60
ynh_script_progression --message="Installing pip additionnal requirements..." --weight=40
pip3 install --no-cache-dir --upgrade --target $final_path/vendor -r $final_path/optional-requirements.txt
#=================================================

6
scripts/remove
View file

@ -68,7 +68,7 @@ ynh_secure_remove --file="$final_path"
# Remove the data directory if --purge option is used
if [ "${YNH_APP_PURGE:-0}" -eq 1 ]
then
ynh_script_progression --message="Removing app data directory..." --time --weight=1
ynh_script_progression --message="Removing app data directory..." --weight=1
ynh_secure_remove --file="$calibre_dir"
fi
@ -122,4 +122,8 @@ ynh_system_user_delete --username=$app
# MESSAGE TO USER
#=================================================
ynh_script_progression --message="Removal of $app completed" --last
# Remove the data directory if --purge option is used
if [ "${YNH_APP_PURGE:-0}" -eq 0 ]
then
ynh_print_info "The library folder $calibre_dir was not deleted. Delete it manually if required"
fi

2
scripts/upgrade
View file

@ -170,7 +170,7 @@ then
#use latest version of pip as per documentation in https://github.com/pypa/get-pip
#cannot use helper as maintaining the checksum would be a pain in the a***
curl https://bootstrap.pypa.io/get-pip.py | python3
ynh_exec_quiet curl https://bootstrap.pypa.io/get-pip.py | python3
ynh_script_progression --message="Installing pip requirements ..." --weight=30
pip3 install --no-cache-dir --upgrade --target $final_path/vendor -r $final_path/requirements.txt

4
sources/patches/app-admin.html.patch
View file

@ -1,5 +1,5 @@
--- a/cps/templates/admin.html 2022-01-24 19:18:40.000000000 +0100
+++ b/cps/templates/admin.html 2022-01-26 23:47:53.669309039 +0100
--- a/cps/templates/admin.html 2022-03-06 16:10:41.000000000 +0100
+++ b/cps/templates/admin.html 2022-03-08 20:59:38.344889625 +0100
@@ -189,11 +189,6 @@
</tbody>
</table>

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

@ -1,15 +1,15 @@
--- a/cps/config_sql.py 2021-06-06 11:06:52.499532119 +0200
+++ b/cps/config_sql.py 2021-06-06 12:18:29.420244329 +0200
@@ -63,7 +63,7 @@
--- a/cps/config_sql.py 2022-03-06 16:10:41.000000000 +0100
+++ b/cps/config_sql.py 2022-03-08 21:04:33.966228954 +0100
@@ -61,7 +61,7 @@
mail_server_type = Column(SmallInteger, default=0)
mail_gmail_token = Column(JSON, default={})
- config_calibre_dir = Column(String)
+ config_calibre_dir = Column(String, default='__CALIBRE_DIR__')
config_calibre_uuid = Column(String)
config_port = Column(Integer, default=constants.DEFAULT_PORT)
config_external_port = Column(Integer, default=constants.DEFAULT_PORT)
config_certfile = Column(String)
@@ -79,11 +79,11 @@
@@ -78,11 +78,11 @@
config_theme = Column(Integer, default=0)
config_log_level = Column(SmallInteger, default=logger.DEFAULT_LOG_LEVEL)
@ -25,7 +25,7 @@
config_anonbrowse = Column(SmallInteger, default=0)
config_public_reg = Column(SmallInteger, default=0)
config_remote_login = Column(Boolean, default=False)
@@ -107,11 +107,11 @@
@@ -108,11 +108,11 @@
config_goodreads_api_key = Column(String)
config_goodreads_api_secret = Column(String)
config_register_email = Column(Boolean, default=False)
@ -39,7 +39,7 @@
config_ldap_port = Column(SmallInteger, default=389)
config_ldap_authentication = Column(SmallInteger, default=constants.LDAP_AUTH_SIMPLE)
config_ldap_serv_username = Column(String, default='cn=admin,dc=example,dc=org')
@@ -120,11 +120,11 @@
@@ -121,11 +121,11 @@
config_ldap_cacert_path = Column(String, default="")
config_ldap_cert_path = Column(String, default="")
config_ldap_key_path = Column(String, default="")

10
sources/patches/app-constants.py.patch.src
View file

@ -1,6 +1,6 @@
--- a/cps/constants.py 2021-05-22 14:08:46.000000000 +0200
+++ b/cps/constants.py 2021-06-06 11:02:36.060353942 +0200
@@ -25,7 +25,7 @@
--- a/cps/constants.py 2022-03-06 16:10:41.000000000 +0100
+++ b/cps/constants.py 2022-03-08 21:06:19.917000241 +0100
@@ -27,7 +27,7 @@
HOME_CONFIG = os.path.isfile(os.path.join(os.path.dirname(os.path.abspath(__file__)), '.HOMEDIR'))
# In executables updater is not available, so variable is set to False there
@ -8,8 +8,8 @@
+UPDATER_AVAILABLE = False
# Base dir is parent of current file, necessary if called from different folder
if sys.version_info < (3, 0):
@@ -127,12 +127,12 @@
BASE_DIR = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir))
@@ -124,12 +124,12 @@
DEFAULT_MAIL_SERVER = "mail.example.org"
DEFAULT_PASSWORD = "admin123" # nosec

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

@ -1,6 +1,6 @@
--- a/optional-requirements.txt 2022-01-24 19:18:40.000000000 +0100
+++ b/optional-requirements.txt 2022-01-26 23:46:47.077607055 +0100
@@ -1,20 +1,5 @@
--- a/optional-requirements.txt 2022-03-06 16:10:41.000000000 +0100
+++ b/optional-requirements.txt 2022-03-08 21:08:06.964027001 +0100
@@ -1,19 +1,5 @@
# GDrive Integration
-google-api-python-client>=1.7.11,<2.37.0
gevent>20.6.0,<22.0.0
@ -13,7 +13,6 @@
-PyDrive2>=1.3.1,<1.11.0
-PyYAML>=3.12
-rsa>=3.4.2,<4.9.0
-six>=1.10.0,<1.17.0
-
-# Gmail
-google-auth-oauthlib>=0.4.3,<0.5.0
@ -21,7 +20,7 @@
# goodreads
goodreads>=0.3.2,<0.4.0
@@ -24,10 +9,6 @@
@@ -23,10 +9,6 @@
python-ldap>=3.0.0,<3.5.0
Flask-SimpleLDAP>=1.4.0,<1.5.0
@ -30,5 +29,5 @@
-SQLAlchemy-Utils>=0.33.5,<0.39.0
-
# metadata extraction
rarfile>=2.7
rarfile>=3.2
scholarly>=1.2.0,<1.6

10
sources/patches/app-ub.py.patch.src
View file

@ -1,6 +1,6 @@
--- a/cps/ub.py 2021-06-06 10:55:46.704487817 +0200
+++ b/cps/ub.py 2021-06-06 12:32:23.867151407 +0200
@@ -179,7 +179,7 @@
--- 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 @@
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,9 +9,9 @@
sidebar_view = Column(Integer, default=1)
default_language = Column(String(3), default="all")
denied_tags = Column(String, default="")
@@ -678,7 +678,7 @@
@@ -768,7 +768,7 @@
# Generate User admin with admin123 password, and access to everything
def create_admin_user(session):
def create_admin_user(_session):
user = User()
- user.name = "admin"
+ user.name = "__ADMIN__"