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

0.6.16+fix linter warning

Browse source 
Testing
This commit is contained in:
Krakinou 2022-02-08 21:13:21 +01:00 • committed by GitHub
commit a1e9a86a33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 57 additions and 94 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.14
**Shipped version:** 0.6.16

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.14
**Version incluse :** 0.6.16

10
check_process
View file

@ -1,12 +1,12 @@
;; Complete Test
# First Run of complete test
; Manifest
domain="domain.tld" (DOMAIN)
path="/calibre" (PATH)
domain="domain.tld"
path="/calibre"
calibre_path="/home/yunohost.app/calibreweb"
admin="john" (USER)
admin="john"
language="en"
is_public=0 (PUBLIC|public=1|private=0)
is_public=0
upload=1
password="a very long password"
; Checks
@ -17,7 +17,7 @@
setup_public=1
upgrade=1
#Last version
upgrade=1 from_commit=df304aadd7767a3e38bfc6d4da45ce8a94ebc749
upgrade=1 from_commit=79c6c4ad03f62d2ed4f4180ac6b7dac1c117a62a
#v0.6.6
# upgrade=1 from_commit=11f5b96df7d8850beff47f9904745fa53a6f7ed9
backup_restore=1

4
conf/app.src
View file

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

17
conf/nginx.conf
View file

@ -1,8 +1,5 @@
location __PATH__ {
# Force usage of https
if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent;
}
#Client max body size to allow upload of ebook.
#big number as audiobook may be quite big
client_max_body_size 500M;
@ -13,12 +10,12 @@ location __PATH__ {
proxy_buffer_size 256k;
proxy_pass http://localhost:__PORT__;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Scheme $scheme;
proxy_set_header X-Script-Name __PATH__;
# proxy_set_header X-Remote-User $remote_user;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Scheme $scheme;
proxy_set_header X-Script-Name __PATH__;
# proxy_set_header X-Remote-User $remote_user;
# Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc;

12
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.14~ynh1",
"version": "0.96.16~ynh1",
"url": "https://github.com/janeczku/calibre-web",
"upstream": {
"version": "0.6.14",
"version": "0.6.16",
"license": "GPL-3.0-only",
"admindoc": "https://github.com/janeczku/calibre-web/wiki",
"code": "https://github.com/janeczku/calibre-web"
@ -20,7 +20,7 @@
"email": "misterl56@hotmail.com"
},
"requirements": {
"yunohost": ">= 4.2.0"
"yunohost": ">= 4.3.0"
},
"multi_instance": true,
"services": [
@ -30,8 +30,7 @@
"install" : [
{
"name": "domain",
"type": "domain",
"example": "example.com"
"type": "domain"
},
{
"name": "path",
@ -41,8 +40,7 @@
},
{
"name": "admin",
"type": "user",
"example": "johndoe"
"type": "user"
},
{
"name": "is_public",

2
scripts/change_url
View file

@ -100,7 +100,7 @@ then
path_url="$new_path"
#Cannot use empty string for X-script-name, causes an issue in the python prg
if [ $path_url = "/" ] ; then
ynh_replace_string " proxy_set_header X-Script-Name" "# proxy_set_header X-Script-Name" ../conf/nginx.conf
ynh_replace_string " proxy_set_header X-Script-Name" "# proxy_set_header X-Script-Name" ../conf/nginx.conf
fi
# Create a dedicated nginx config
ynh_add_nginx_config

7
scripts/install
View file

@ -55,10 +55,8 @@ ynh_script_progression --message="Validating installation parameters..." --weigh
final_path=/var/www/$app
test ! -e "$final_path" || ynh_die "This path already contains a folder"
# Check web path availability
ynh_webpath_available $domain $path_url
# Register (book) web path
ynh_webpath_register $app $domain $path_url
ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
#=================================================
# STORE SETTINGS FROM MANIFEST
@ -68,7 +66,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=5
ynh_app_setting_set $app domain $domain
ynh_app_setting_set $app path $path_url
ynh_app_setting_set $app admin $admin
ynh_app_setting_set $app is_public $is_public
#=================================================
# STANDARD MODIFICATIONS
@ -120,7 +117,7 @@ ynh_script_progression --message="Setting up system configuration..." --weight=5
if [ $path_url = "/" ] ; then
ynh_replace_string " proxy_set_header X-Script-Name" "# proxy_set_header X-Script-Name" ../conf/nginx.conf
ynh_replace_string " proxy_set_header X-Script-Name" "# proxy_set_header X-Script-Name" ../conf/nginx.conf
fi
# Create a dedicated nginx config

18
scripts/restore
View file

@ -26,7 +26,6 @@ domain=$(ynh_app_setting_get $app domain)
path_url=$(ynh_app_setting_get $app path)
final_path=$(ynh_app_setting_get $app final_path)
calibre_dir=$(ynh_app_setting_get $app calibre_dir)
is_public=$(ynh_app_setting_get $app is_public)
port=$(ynh_app_setting_get $app port)
#Source common.sh required to be after var initialization as some variables are updated in it that are then used in the script
@ -37,10 +36,8 @@ source ../settings/scripts/_common.sh
# CHECK IF THE APP CAN BE RESTORED
#=================================================
ynh_script_progression --message="Validating restoration parameters..." --weight=1
ynh_webpath_available $domain $path_url \
|| ynh_die "Path not available: ${domain}${path_url}"
test ! -d $final_path \
|| ynh_die "There is already a directory: $final_path "
test ! -d $final_path || ynh_die "There is already a directory: $final_path "
#=================================================
# STANDARD RESTORATION STEPS
@ -166,17 +163,6 @@ ynh_replace_string --match_string="<policy domain="coder" rights="none" pattern=
# Remove the option backup_core_only if it's in the settings.yml file
ynh_app_setting_delete $app backup_core_only
#=================================================
# SETUP SSOWAT
#=================================================
# Make app public if necessary
if [ $is_public -eq 1 ]
then
# unprotected_uris allows SSO credentials to be passed anyway.
ynh_permission_update --permission "main" --add visitors
fi
#=================================================
# GENERIC FINALIZATION
#=================================================

31
scripts/upgrade
View file

@ -22,7 +22,6 @@ 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)
is_public=$(ynh_app_setting_get $app is_public)
final_path=$(ynh_app_setting_get $app final_path)
language=$(ynh_app_setting_get $app language)
@ -120,6 +119,14 @@ if sqlite3 $final_path/app.db "SELECT config_ldap_group_object_filter FROM setti
eval sqlite3 $final_path/app.db "\"UPDATE settings SET config_ldap_group_object_filter='(&(objectClass=posixGroup)(cn=%s.main))' WHERE ID=1\""
fi
# Cleaning legacy permissions
if ynh_legacy_permissions_exists; then
ynh_legacy_permissions_delete_all
ynh_app_setting_delete --app=$app --key=is_public
fi
#=================================================
# STANDARD UPGRADE STEPS
#=================================================
@ -147,7 +154,7 @@ fi
ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=5
if [ $path_url = "/" ] ; then
ynh_replace_string " proxy_set_header X-Script-Name" "# proxy_set_header X-Script-Name" ../conf/nginx.conf
ynh_replace_string " proxy_set_header X-Script-Name" "# proxy_set_header X-Script-Name" ../conf/nginx.conf
fi
# Create a dedicated nginx config
ynh_add_nginx_config
@ -232,26 +239,6 @@ chown -R $app: $final_path
yunohost service add $app --description="Browse eBook in the web" --log="/var/log/$app/$app.log"
#=================================================
# SETUP SSOWAT
#=================================================
# Make app public if necessary
if [ $is_public -eq 1 ]
then
# unprotected_uris allows SSO credentials to be passed anyway
#ynh_app_setting_set $app unprotected_uris "/"
ynh_permission_update --permission "main" --add visitors
fi
#=================================================
# PACKAGE_CHECK
#=================================================
#This line of code is just used to caused an error in upgrade to be tested by package_check
if [ -e /tmp/upgrade_error ]; then
ynh_die
fi
#=================================================
# RELOAD NGINX
#=================================================

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

@ -1,11 +1,10 @@
--- a/cps/templates/admin.html 2021-10-31 11:31:53.000000000 +0100
+++ b/cps/templates/admin.html 2021-11-05 19:22:28.554122091 +0100
@@ -185,12 +185,6 @@
--- 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
@@ -189,11 +189,6 @@
</tbody>
</table>
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
- {% if feature_support['updater'] %}
- <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
- <div class="hidden" id="update_error"> <span>{{update_error}}</span></div>
- <div class="btn btn-primary" id="check_for_update">{{_('Check for Update')}}</div>
- <div class="btn btn-primary hidden" id="perform_update" data-toggle="modal" data-target="#StatusDialog">{{_('Perform Update')}}</div>

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

@ -1,35 +1,34 @@
--- a/optional-requirements.txt 2021-10-31 11:31:53.000000000 +0100
+++ b/optional-requirements.txt 2021-11-05 19:27:25.664091168 +0100
@@ -1,21 +1,3 @@
-# GDrive Integration
-gevent>20.6.0,<22.0.0
--- 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 @@
# GDrive Integration
-google-api-python-client>=1.7.11,<2.37.0
gevent>20.6.0,<22.0.0
-greenlet>=0.4.17,<1.2.0
-httplib2>=0.9.2,<0.20.0
-httplib2>=0.9.2,<0.21.0
-oauth2client>=4.0.0,<4.1.4
-uritemplate>=3.0.0,<3.1.0
-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.9.0
-PyDrive2>=1.3.1,<1.11.0
-PyYAML>=3.12
-rsa>=3.4.2,<4.8.0
-rsa>=3.4.2,<4.9.0
-six>=1.10.0,<1.17.0
-
-# Gdrive and Gmail integration
-google-api-python-client>=1.7.11,<2.1.0
-
-# Gmail
-google-auth-oauthlib>=0.4.3,<0.5.0
-google-api-python-client>=1.7.11,<2.37.0
# goodreads
goodreads>=0.3.2,<0.4.0
@@ -25,10 +7,6 @@
python-ldap>=3.0.0,<3.4.0
@@ -24,10 +9,6 @@
python-ldap>=3.0.0,<3.5.0
Flask-SimpleLDAP>=1.4.0,<1.5.0
-#oauth
-Flask-Dance>=2.0.0,<5.1.0
-SQLAlchemy-Utils>=0.33.5,<0.38.0
-# oauth
-Flask-Dance>=2.0.0,<5.2.0
-SQLAlchemy-Utils>=0.33.5,<0.39.0
-
# extracting metadata
# metadata extraction
rarfile>=2.7
scholarly>=1.2.0, <1.3
scholarly>=1.2.0,<1.6