From 06073ed6d6d8e9d4a389ceff922e36a683e0e4f0 Mon Sep 17 00:00:00 2001 From: nachoparker Date: Wed, 13 Mar 2019 00:24:57 -0600 Subject: [PATCH] add nc-previews-auto --- bin/ncp/CONFIG/nc-previews-auto.sh | 67 +++++++++++++++++++++++++++ changelog.md | 12 ++++- etc/ncp-config.d/nc-previews-auto.cfg | 22 +++++++++ 3 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 bin/ncp/CONFIG/nc-previews-auto.sh create mode 100644 etc/ncp-config.d/nc-previews-auto.cfg diff --git a/bin/ncp/CONFIG/nc-previews-auto.sh b/bin/ncp/CONFIG/nc-previews-auto.sh new file mode 100644 index 000000000..c4d64427a --- /dev/null +++ b/bin/ncp/CONFIG/nc-previews-auto.sh @@ -0,0 +1,67 @@ +#!/bin/bash + +# Periodically generate previews for the gallery +# +# Copyleft 2019 by Timo Stiefel and Ignacio Nunez Hernanz +# GPL licensed (see end of file) * Use at your own risk! +# + +isactive() +{ + [[ -f "/etc/cron.d/nc-previews-auto" ]] +} + +configure() +{ + [[ "$ACTIVE" != "yes" ]] && { + rm -f /etc/cron.d/nc-previews-auto + service cron restart + echo "Automatic preview generation disabled" + return 0 + } + + grep -qP "^\d+$" <<<"$RUNTIME" || { echo "Invalid RUNTIME value $RUNTIME"; return 1; } + RUNTIME=$((RUNTIME*60)) + + echo "0 2 * * * root /usr/local/bin/nc-previews" > /etc/cron.d/ncp-previews-auto + chmod 644 /etc/cron.d/ncp-previews-auto + + cat > /usr/local/bin/nc-previews <> /var/log/ncp.log +ionice -c3 nice -n20 ncc preview:pre-generate -n -vvv 2>&1 >>/var/log/ncp.log & +PID=\$! +[[ "$RUNTIME" != 0 ]] && { + for i in \$(seq 1 1 $RUNTIME); do + sleep 1 + kill -0 "\$PID" &>/dev/null || break + done + pkill -f preview:pre-generate +} +wait "\$PID" +EOF +chmod +x /usr/local/bin/nc-previews + + service cron restart + echo "Automatic preview generation enabled" + return 0 +} + +install() { :; } + +# License +# +# This script is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This script is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this script; if not, write to the +# Free Software Foundation, Inc., 59 Temple Place, Suite 330, +# Boston, MA 02111-1307 USA diff --git a/changelog.md b/changelog.md index 900500042..43c6b7500 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,15 @@ -[v1.9.5](https://github.com/nextcloud/nextcloudpi/commit/bf794ec) (2019-03-09) nc-init: previews settings +[v1.10.0](https://github.com/nextcloud/nextcloudpi/commit/b00c5f1) (2019-03-13) add nc-previews-auto -[v1.9.4](https://github.com/nextcloud/nextcloudpi/commit/c40c430) (2019-03-09) unattended upgrades: update labels +[v1.9.8 ](https://github.com/nextcloud/nextcloudpi/commit/d7bbe25) (2019-03-13) nc-scan: improvements + +[v1.9.7 ](https://github.com/nextcloud/nextcloudpi/commit/e03b095) (2019-03-13) nc-previews: improvements + +[v1.9.6 ](https://github.com/nextcloud/nextcloudpi/commit/ccb6fc1) (2019-03-13) nc-scan-auto: improvements + +[v1.9.5 ](https://github.com/nextcloud/nextcloudpi/commit/89cc042) (2019-03-09) nc-init: previews settings + +[v1.9.4 ](https://github.com/nextcloud/nextcloudpi/commit/0c95243) (2019-03-09) unattended upgrades: update labels [v1.9.3 ](https://github.com/nextcloud/nextcloudpi/commit/f5ba0b1) (2019-03-09) wizard: fix headers diff --git a/etc/ncp-config.d/nc-previews-auto.cfg b/etc/ncp-config.d/nc-previews-auto.cfg new file mode 100644 index 000000000..32d75239a --- /dev/null +++ b/etc/ncp-config.d/nc-previews-auto.cfg @@ -0,0 +1,22 @@ +{ + "id": "nc-previews-auto", + "name": "Nc-previews-auto", + "title": "nc-previews-auto", + "description": "Periodically generate previews for the gallery", + "info": "This will make browsing the gallery much more smooth.\nFor big collections, this can take a LONG time depending on your hardware.\nYou can specify a nightly duration in minutes, or 0", + "infotitle": "", + "params": [ + { + "id": "ACTIVE", + "name": "Active", + "value": "no", + "type": "bool" + }, + { + "id": "RUNTIME", + "name": "Run time", + "value": "0", + "suggest": "0" + } + ] +}