diff --git a/README.md b/README.md index 81bafa5..6e11a54 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d Alternatively, you may use [COPS](https://github.com/YunoHost-Apps/cops_ynh) which also allows access to your Calibre Library, but in read-only mode. -**Shipped version:** To be 1.0, let's say 0.9 :) +**Shipped version:** The shipped version 0.6.0, but as the numbering changed in the calibre-web app, it is numbered as 0.96.0 in yunohost Library will be placed in `/home/yunohost.multimedia/share/eBook` folder except if both : diff --git a/check_process b/check_process index 6da2504..531867d 100644 --- a/check_process +++ b/check_process @@ -17,6 +17,7 @@ setup_public=1 upgrade=1 from_commit=3b9c5041e4fa73cb965368379f2b83d076c65341 upgrade=1 from_commit=03bafd5219544c5d317eaf54182e4122ba63a4ad + upgrade_1 from_commit=9e5fa45df7cd840d8a26d25f953857a13d6bc5de backup_restore=1 multi_instance=1 incorrect_path=1 diff --git a/conf/app.src b/conf/app.src index d238056..a7a76d1 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,3 +1,3 @@ -SOURCE_URL=https://github.com/janeczku/calibre-web/archive/9e5fa45df7cd840d8a26d25f953857a13d6bc5de.zip -SOURCE_SUM=be288d5caa3ccdd612b66927b0849899107941f600a58dd2e0a3dc04feb594a2 -SOURCE_FORMAT=zip +SOURCE_URL=https://github.com/janeczku/calibre-web/archive/d81cb2927abcba3c4d198ecce9dca78550f676e1.zip +SOURCE_SUM=e9c8a9a63ceb509f8482d73ed6d044eca8e96961c485fd395e73e93b8ea09a68 +SOURCE_FORMAT=zip \ No newline at end of file diff --git a/hooks/post_user_create b/hooks/post_user_create index 23a6b1a..e3a7820 100644 --- a/hooks/post_user_create +++ b/hooks/post_user_create @@ -16,7 +16,7 @@ final_path=$(ynh_app_setting_get $app final_path) public_library=$(ynh_app_setting_get "$app" public_library) #User are duplicated in the database only if library is public -if [ public_library -eq 1 ]; then +if [ $public_library -eq 1 ]; then ###################################### #1 get admin user and id from database ###################################### diff --git a/manifest.json b/manifest.json index 783924c..f68076e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Calibre-web for Yunohost", "fr": "Calibre-web pour Yunohost" }, - "version": "0.92~ynh3", + "version": "0.96.0~ynh3", "url": "https://github.com/janeczku/calibre-web", "license": "free", "maintainer": { diff --git a/scripts/install b/scripts/install index 2600de5..7aebc70 100755 --- a/scripts/install +++ b/scripts/install @@ -118,7 +118,7 @@ ynh_add_systemd_config #================================================= # CREATE FILES AND DIRECTORIES #================================================= - +ynh_print_info "Creating files and directory" #Logic is as follow : if app is set to be publicly accessible, we will assume that the library should be set in "Share" multimedia directory # If app is set to be private but access is requested for all user, we will assume the same # If app is set to be private but access is limited to the admin user, we will set it inside his own multimedia directory. diff --git a/sources/patches/app-web.patch b/sources/patches/app-web.patch index 340fbb9..c1e03e0 100644 --- a/sources/patches/app-web.patch +++ b/sources/patches/app-web.patch @@ -1,38 +1,16 @@ ---- a/cps/web.py 2019-01-16 17:50:51.000000000 +0100 -+++ b/cps/web.py 2019-01-19 10:55:51.728967203 +0100 -@@ -58,6 +58,11 @@ +--- a/cps/web.py 2019-01-27 08:32:26.000000000 +0100 ++++ b/cps/web.py 2019-02-02 12:38:12.364323004 +0100 +@@ -78,6 +78,9 @@ import server from reverseproxy import ReverseProxied - + from updater import updater_thread +#Yunohost LDAP integration - 1 +vlogout = 0 +#END Yunohost LDAP integration -1 -+ -+ + try: from googleapiclient.errors import HttpError - except ImportError: -@@ -1072,7 +1077,7 @@ - json_dumps = json.dumps([dict(name=r.name.replace('|',',')) for r in entries]) - return json_dumps - -- -+ - @app.route("/get_tags_json", methods=['GET', 'POST']) - @login_required_if_no_ano - def get_tags_json(): -@@ -1192,8 +1197,8 @@ - r = requests.get(repository_url + '/git/commits/' + commit['object']['sha']) - r.raise_for_status() - update_data = r.json() -- except requests.exceptions.HTTPError as e: -- status['error'] = _(u'HTTP Error') + ' ' + str(e) -+ except requests.exceptions.HTTPError as ex: -+ status['error'] = _(u'HTTP Error') + ' ' + str(ex) - except requests.exceptions.ConnectionError: - status['error'] = _(u'Connection error') - except requests.exceptions.Timeout: -@@ -2360,10 +2365,36 @@ +@@ -2256,10 +2259,36 @@ return redirect(url_for('basic_configuration')) if current_user is not None and current_user.is_authenticated: return redirect(url_for('index')) @@ -70,7 +48,7 @@ login_user(user, remember=True) flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.nickname), category="success") return redirect_back(url_for("index")) -@@ -2384,6 +2415,10 @@ +@@ -2280,6 +2309,10 @@ @login_required def logout(): if current_user is not None and current_user.is_authenticated: @@ -81,7 +59,7 @@ logout_user() return redirect(url_for('login')) -@@ -3088,6 +3123,23 @@ +@@ -2987,6 +3020,23 @@ if "config_ebookconverter" in to_save: content.config_ebookconverter = int(to_save["config_ebookconverter"])