diff options
| author | nachoparker <nacho@ownyourbits.com> | 2021-09-05 09:31:08 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2021-09-13 01:55:46 +0300 |
| commit | c10d4bd8fb187afe5de8af491a99449594c0767f (patch) | |
| tree | 4205abcf5a9365a33f4bb83382eb0a7f9aa4c7ce | |
| parent | 3bf746bad0344c5df8d6324d7d03971b6cc5b3f7 (diff) | |
upgrade to NC21.0.4v1.39.0
Signed-off-by: nachoparker <nacho@ownyourbits.com>
88 files changed, 2505 insertions, 148 deletions
@@ -16,7 +16,7 @@ Find the full documentation at [docs.nextcloudpi.com](http://docs.nextcloudpi.co ## Features * Debian/Raspbian 10 Buster - * Nextcloud 20.0.12 + * Nextcloud 21.0.4 * Apache 2.4.25, with HTTP2 enabled * PHP 7.3 * MariaDB 10 diff --git a/Vagrantfile b/Vagrantfile index e1a5134d..7cb94fac 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -37,7 +37,7 @@ Vagrant.configure("2") do |config| # cleanup source etc/library.sh run_app_unsafe post-inst.sh - cd - + cd / rm -r /tmp/nextcloudpi systemctl disable sshd poweroff diff --git a/bin/ncp-diag b/bin/ncp-diag index e7f2223a..856f4431 100644 --- a/bin/ncp-diag +++ b/bin/ncp-diag @@ -57,6 +57,7 @@ echo "HTTPD service|$( pgrep -c apache2 &>/dev/null && echo up || echo down )" echo "PHP service|$( pgrep -c php-fpm &>/dev/null && echo up || echo down )" echo "MariaDB service|$( pgrep -c mysqld &>/dev/null && echo up || echo down )" echo "Redis service|$( pgrep -c redis-server &>/dev/null && echo up || echo down )" +echo "HPB service|$(pgrep -c notify_push &>/dev/null && echo up || echo down )" echo "Postfix service|$( pgrep -fc postfix &>/dev/null && echo up || echo down )" # WAN diff --git a/bin/ncp-update-nc b/bin/ncp-update-nc index 2103dbdd..05fa7190 100755 --- a/bin/ncp-update-nc +++ b/bin/ncp-update-nc @@ -22,6 +22,8 @@ set -eE VER="$1" BIN="${0##*/}" +source /usr/local/etc/library.sh + # pre-checks #################### [[ "$VER" == "" ]] && { echo "Usage ${BIN} <version>"; exit 1; } @@ -61,7 +63,7 @@ fi echo "Current Nextcloud version $CURRENT" echo "Available Nextcloud version $VER" -[[ "$NEED_UPDATE" == "true" ]] || { echo "Nothing to update"; exit 1; } +[[ "$NEED_UPDATE" == "true" ]] || { echo "Nothing to update"; exit; } # make sure that cron.php is not running and there are no pending jobs # https://github.com/nextcloud/server/issues/10949 @@ -159,7 +161,8 @@ rollback() { echo -e "Abort\nClean up..." rm -rf /var/www/nextcloud.tar.bz2 "$BASEDIR"/nextcloud-old echo "Rolling back to backup $BKP..." - local TMPDATA="$( mktemp -d "/var/www/ncp-data.XXXXXX" )" || { echo "Failed to create temp dir" >&2; exit 1; } + local TMPDATA + TMPDATA="$( mktemp -d "/var/www/ncp-data.XXXXXX" )" || { echo "Failed to create temp dir" >&2; exit 1; } [[ "$DATADIR" == "$BASEDIR/nextcloud/data" ]] && mv -T "$DATADIR" "$TMPDATA" ncp-restore "$BKP" || { echo "Rollback failed! Data left at $TMPDATA"; exit 1; } [[ "$DATADIR" == "$BASEDIR/nextcloud/data" ]] && { rm -rf "$DATADIR"; mv -T "$TMPDATA" "$DATADIR"; } @@ -186,6 +189,50 @@ $ncc | grep -q db:add-missing-columns && $ncc db:add-missing-columns -n $ncc | grep -q db:add-missing-primary-keys && $ncc db:add-missing-primary-keys -n $ncc | grep -q db:convert-filecache-bigint && $ncc db:convert-filecache-bigint -n + +# use the correct version for custom apps +NCVER="$(ncc status | grep "version:" | awk '{ print $3 }')" +if is_more_recent_than "21.0.0" "${NCVER}"; then + NCPREV=/var/www/ncp-previewgenerator/ncp-previewgenerator-nc20 +else + # Install notify_push if not installed + if ! is_app_enabled notify_push; then + ncc app:install notify_push + ncc app:enable notify_push + bash /usr/local/etc/ncp-templates/nextcloud.conf.sh > /etc/apache2/sites-available/nextcloud.conf + a2enmod proxy proxy_http proxy_wstunnel + apachectl -k graceful + ## make sure the notify_push daemon is runnnig + + arch="$(uname -m)" + [[ "${arch}" =~ "armv7" ]] && arch="armv7" + cat > /etc/systemd/system/notify_push.service <<EOF +[Unit] +Description = Push daemon for Nextcloud clients +After = mysql.service + +[Service] +Environment = PORT=7867 +ExecStart = /var/www/nextcloud/apps/notify_push/bin/"${arch}"/notify_push --allow-self-signed /var/www/nextcloud/config/config.php +User=www-data + +[Install] +WantedBy = multi-user.target +EOF + start_notify_push + nc_domain="$(ncc config:system:get overwrite.cli.url)" + set-nc-domain "${nc_domain}" || { + echo "notify_push setup failed. You are probably behind a proxy" + echo "Run 'ncc config:system:set trusted_proxies 15 --value=<proxy_IP>' and then 'ncc notify_push:setup https://<domain>/push to enable" + echo "Check https://help.nextcloud.com/tags/ncp for support" + } + + fi + NCPREV=/var/www/ncp-previewgenerator/ncp-previewgenerator-nc21 +fi +rm -rf /var/www/nextcloud/apps/previewgenerator +ln -snf "${NCPREV}" /var/www/nextcloud/apps/previewgenerator + # done #################### mkdir -p "$DATADIR"/ncp-update-backups diff --git a/bin/ncp/CONFIG/nc-httpsonly.sh b/bin/ncp/CONFIG/nc-httpsonly.sh index cb30b2bd..7c86ca94 100644 --- a/bin/ncp/CONFIG/nc-httpsonly.sh +++ b/bin/ncp/CONFIG/nc-httpsonly.sh @@ -11,12 +11,12 @@ configure() { - [[ $ACTIVE == "no" ]] && local OPT=Off || local OPT=On - sed -i "s|RewriteEngine .*|RewriteEngine $OPT|" /etc/apache2/sites-available/000-default.conf - echo "Forcing HTTPS $OPT" - - # delayed in bg so it does not kill the connection, and we get AJAX response - bash -c "sleep 2 && service apache2 reload" &>/dev/null & + [[ -f /.ncp-image ]] && return 0 + [[ $ACTIVE == "no" ]] && local opt=Off proto=https || local opt=On proto=http + sed -i "s|RewriteEngine .*|RewriteEngine $opt|" /etc/apache2/sites-available/000-default.conf + ncc config:system:set overwriteprotocol --value="${proto}" + apachectl -k graceful + echo "Forcing HTTPS $opt" } install() { :; } diff --git a/bin/ncp/CONFIG/nc-init.sh b/bin/ncp/CONFIG/nc-init.sh index 0af0d706..9acfdbb3 100644 --- a/bin/ncp/CONFIG/nc-init.sh +++ b/bin/ncp/CONFIG/nc-init.sh @@ -12,7 +12,7 @@ DBADMIN=ncadmin configure() { - source /usr/local/etc/library.sh # sets PHPVER + source /usr/local/etc/library.sh # sets PHPVER NCVER echo "Setting up a clean Nextcloud instance... wait until message 'NC init done'" @@ -103,14 +103,10 @@ EOF # 4 Byte UTF8 support ncc config:system:set mysql.utf8mb4 --type boolean --value="true" - # Default trusted domain ( only from ncp-config ) - test -f /usr/local/bin/nextcloud-domain.sh && { - test -f /.ncp-image || bash /usr/local/bin/nextcloud-domain.sh - } - ncc config:system:set trusted_domains 5 --value="nextcloudpi.local" + ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nextcloudpi-local]}" --value="nextcloudpi.local" # trusted_domains 6 used by docker - ncc config:system:set trusted_domains 7 --value="nextcloudpi" - ncc config:system:set trusted_domains 8 --value="nextcloudpi.lan" + ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nextcloudpi]}" --value="nextcloudpi" + ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nextcloudpi-lan]}" --value="nextcloudpi.lan" # email ncc config:system:set mail_smtpmode --value="sendmail" @@ -159,8 +155,16 @@ EOF fi # ncp-previewgenerator - cp -r /var/www/ncp-previewgenerator /var/www/nextcloud/apps/previewgenerator - chown www-data:www-data /var/www/nextcloud/apps/previewgenerator + if is_more_recent_than "21.0.0" "$NCVER"; then + local ncprev=/var/www/ncp-previewgenerator/ncp-previewgenerator-nc20 + else + ncc app:install notify_push + ncc app:enable notify_push + test -f /.ncp-image || start_notify_push # don't start during build + local ncprev=/var/www/ncp-previewgenerator/ncp-previewgenerator-nc21 + fi + ln -snf "${ncprev}" /var/www/nextcloud/apps/previewgenerator + chown -R www-data: /var/www/nextcloud/apps/previewgenerator ncc app:enable previewgenerator # previews @@ -174,11 +178,17 @@ EOF # other ncc config:system:set overwriteprotocol --value=https + ncc config:system:set overwrite.cli.url --value="https://nextcloudpi/" + ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nc_domain]}" --value="nextcloudpi" # TODO temporary workaround for https://github.com/nextcloud/server/pull/13358 ncc -n db:convert-filecache-bigint ncc db:add-missing-indices + # Default trusted domain (only from ncp-config) + test -f /usr/local/bin/nextcloud-domain.sh && { + test -f /.ncp-image || bash /usr/local/bin/nextcloud-domain.sh + } echo "NC init done" } diff --git a/bin/ncp/CONFIG/nc-nextcloud.sh b/bin/ncp/CONFIG/nc-nextcloud.sh index 92f450b1..e56c701c 100644 --- a/bin/ncp/CONFIG/nc-nextcloud.sh +++ b/bin/ncp/CONFIG/nc-nextcloud.sh @@ -200,6 +200,26 @@ EOF </VirtualHost> EOF + # for notify_push app in NC21 + a2enmod proxy proxy_http proxy_wstunnel + + arch="$(uname -m)" + [[ "${arch}" =~ "armv7" ]] && arch="armv7" + cat > /etc/systemd/system/notify_push.service <<EOF +[Unit] +Description = Push daemon for Nextcloud clients +After = mysql.service + +[Service] +Environment = PORT=7867 +ExecStart = /var/www/nextcloud/apps/notify_push/bin/"${arch}"/notify_push --allow-self-signed /var/www/nextcloud/config/config.php +User=www-data + +[Install] +WantedBy = multi-user.target +EOF + [[ -f /.docker-image ]] || systemctl enable notify_push + # some added security sed -i 's|^ServerSignature .*|ServerSignature Off|' /etc/apache2/conf-enabled/security.conf sed -i 's|^ServerTokens .*|ServerTokens Prod|' /etc/apache2/conf-enabled/security.conf diff --git a/bin/ncp/CONFIG/nc-passwd.sh b/bin/ncp/CONFIG/nc-passwd.sh index 2aed52fe..f50b55e2 100644 --- a/bin/ncp/CONFIG/nc-passwd.sh +++ b/bin/ncp/CONFIG/nc-passwd.sh @@ -21,13 +21,18 @@ configure() ln -s /data/etc/shadow /etc/shadow } - # Run cron.php once now to get all checks right in CI. - sudo -u www-data php /var/www/nextcloud/cron.php - # activate NCP - a2ensite ncp nextcloud - a2dissite ncp-activation - bash -c "sleep 1.5 && service apache2 reload" &>/dev/null & + if ! is_ncp_activated; then + # Run cron.php once now to get all checks right in CI. + sudo -u www-data php /var/www/nextcloud/cron.php + + a2dissite ncp-activation + a2ensite ncp nextcloud + apachectl -k graceful + + # Trusted Domain (local/public IP), also configures notify_push + bash /usr/local/bin/nextcloud-domain.sh + fi } install() { :; } diff --git a/bin/ncp/CONFIG/nc-prettyURL.sh b/bin/ncp/CONFIG/nc-prettyURL.sh index 14d65bfb..99e0cbbc 100644 --- a/bin/ncp/CONFIG/nc-prettyURL.sh +++ b/bin/ncp/CONFIG/nc-prettyURL.sh @@ -8,9 +8,6 @@ -NCDIR=/var/www/nextcloud -OCC="$NCDIR/occ" - install() { :; } isactive() @@ -20,30 +17,31 @@ isactive() [[ $REWRITEBASE != 1 ]] } -configure() -{ +configure() +{ # make sure overwrite.cli.url end with a '/' - local URL="$(ncc config:system:get overwrite.cli.url)" + local URL + URL="$(ncc config:system:get overwrite.cli.url)" [[ "${URL: -1}" != "/" ]] && ncc config:system:set overwrite.cli.url --value="${URL}/" - [[ $ACTIVE != "yes" ]] && { - sudo -u www-data php "$OCC" config:system:set htaccess.RewriteBase --value="" - sudo -u www-data php "$OCC" maintenance:update:htaccess + if [[ $ACTIVE != "yes" ]]; then + ncc config:system:set htaccess.RewriteBase --value="" + ncc maintenance:update:htaccess [[ $? -ne 0 ]] && { echo "There has been an error." return 1 } echo "Your cloud does no longer have a pretty domain name." - } || { - sudo -u www-data php "$OCC" config:system:set htaccess.RewriteBase --value="/" - sudo -u www-data php "$OCC" maintenance:update:htaccess + else + ncc config:system:set htaccess.RewriteBase --value="/" + ncc maintenance:update:htaccess [[ $? -ne 0 ]] && { echo "There has been an error." return 1 } echo "Your cloud now has a pretty domain name." - } - bash -c "sleep 2 && service apache2 reload" &>/dev/null & + fi + apachectl -k graceful return 0 } diff --git a/bin/ncp/CONFIG/nc-trusted-domains.sh b/bin/ncp/CONFIG/nc-trusted-domains.sh index 8b602712..2f271d93 100644 --- a/bin/ncp/CONFIG/nc-trusted-domains.sh +++ b/bin/ncp/CONFIG/nc-trusted-domains.sh @@ -10,9 +10,9 @@ configure() { - [[ "$DOMAIN1" != "" ]] && ncc config:system:set trusted_domains 20 --value="$DOMAIN1" - [[ "$DOMAIN2" != "" ]] && ncc config:system:set trusted_domains 21 --value="$DOMAIN2" - [[ "$DOMAIN3" != "" ]] && ncc config:system:set trusted_domains 22 --value="$DOMAIN3" + [[ "$DOMAIN1" != "" ]] && ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[trusted_domain_1]}" --value="$DOMAIN1" + [[ "$DOMAIN2" != "" ]] && ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[trusted_domain_2]}" --value="$DOMAIN2" + [[ "$DOMAIN3" != "" ]] && ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[trusted_domain_3]}" --value="$DOMAIN3" } install(){ :; } diff --git a/bin/ncp/NETWORKING/dnsmasq.sh b/bin/ncp/NETWORKING/dnsmasq.sh index 9f38baac..ed765242 100644 --- a/bin/ncp/NETWORKING/dnsmasq.sh +++ b/bin/ncp/NETWORKING/dnsmasq.sh @@ -49,7 +49,7 @@ configure() } local IFACE=$( ip r | grep "default via" | awk '{ print $5 }' | head -1 ) - local IP=$( sudo -u www-data php /var/www/nextcloud/occ config:system:get trusted_domains 6 | grep -oP '\d{1,3}(.\d{1,3}){3}' ) + local IP=$( ncc config:system:get trusted_domains "${TRUSTED_DOMAINS[docker_overwrite]}" | grep -oP '\d{1,3}(.\d{1,3}){3}' ) [[ "$IP" == "" ]] && IP=$( ip a show dev "$IFACE" | grep global | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 ) [[ "$IP" == "" ]] && { echo "could not detect IP"; return 1; } @@ -73,9 +73,8 @@ EOF update-rc.d dnsmasq defaults update-rc.d dnsmasq enable service dnsmasq restart - cd /var/www/nextcloud - sudo -u www-data php occ config:system:set trusted_domains 2 --value=$DOMAIN - sudo -u www-data php occ config:system:set overwrite.cli.url --value=https://"$DOMAIN"/ + ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[dnsmasq]}" --value="$DOMAIN" + set-nc-domain "$DOMAIN" --no-trusted-domain echo "dnsmasq enabled" } diff --git a/bin/ncp/NETWORKING/freeDNS.sh b/bin/ncp/NETWORKING/freeDNS.sh index 31ba44cd..0a66099c 100644 --- a/bin/ncp/NETWORKING/freeDNS.sh +++ b/bin/ncp/NETWORKING/freeDNS.sh @@ -42,9 +42,7 @@ EOF chmod 644 /etc/cron.d/freeDNS service cron restart - cd /var/www/nextcloud - sudo -u www-data php occ config:system:set trusted_domains 3 --value="$DOMAIN" - sudo -u www-data php occ config:system:set overwrite.cli.url --value=https://"$DOMAIN"/ + set-nc-domain "$DOMAIN" echo "FreeDNS client is enabled" } diff --git a/bin/ncp/NETWORKING/letsencrypt.sh b/bin/ncp/NETWORKING/letsencrypt.sh index 2783bcad..06cfe5a4 100644 --- a/bin/ncp/NETWORKING/letsencrypt.sh +++ b/bin/ncp/NETWORKING/letsencrypt.sh @@ -112,14 +112,14 @@ EOF sed -i "s|SSLCertificateKeyFile.*|SSLCertificateKeyFile /etc/letsencrypt/live/$DOMAIN_LOWERCASE/privkey.pem|" $vhostcfg2 # Configure Nextcloud - local domain_index=12 + local domain_index="${TRUSTED_DOMAINS[letsencrypt_1]}" for dom in $DOMAIN $OTHER_DOMAIN; do [[ "$dom" != "" ]] && { ncc config:system:set trusted_domains $domain_index --value=$dom ((domain_index++)) } done - ncc config:system:set overwrite.cli.url --value=https://"$DOMAIN"/ + set-nc-domain "$DOMAIN" # delayed in bg so it does not kill the connection, and we get AJAX response bash -c "sleep 2 && service apache2 reload" &>/dev/null & diff --git a/bin/ncp/NETWORKING/namecheapDNS.sh b/bin/ncp/NETWORKING/namecheapDNS.sh index a8cca390..78abacab 100644 --- a/bin/ncp/NETWORKING/namecheapDNS.sh +++ b/bin/ncp/NETWORKING/namecheapDNS.sh @@ -50,9 +50,7 @@ EOF chmod 644 /etc/cron.d/namecheapDNS service cron restart - cd /var/www/nextcloud - sudo -u www-data php occ config:system:set trusted_domains 3 --value="$FULLDOMAIN" - sudo -u www-data php occ config:system:set overwrite.cli.url --value=https://"$FULLDOMAIN"/ + set-nc-domain "$FULLDOMAIN" echo "Namecheap DNS client is enabled" } diff --git a/bin/ncp/NETWORKING/nc-static-IP.sh b/bin/ncp/NETWORKING/nc-static-IP.sh index 8f408788..ec15e196 100644 --- a/bin/ncp/NETWORKING/nc-static-IP.sh +++ b/bin/ncp/NETWORKING/nc-static-IP.sh @@ -86,8 +86,8 @@ EOF systemctl restart networking } - sudo -u www-data php /var/www/nextcloud/occ config:system:set trusted_domains 1 --value="$IP" - sudo -u www-data php /var/www/nextcloud/occ config:system:set overwrite.cli.url --value=https://"$IP"/ + ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[ip]}" --value="$IP" + ncc config:system:set overwrite.cli.url --value=https://"$IP"/ echo "Static IP set to $IP" } diff --git a/bin/ncp/NETWORKING/no-ip.sh b/bin/ncp/NETWORKING/no-ip.sh index 1072c3c4..a9ccdb5c 100644 --- a/bin/ncp/NETWORKING/no-ip.sh +++ b/bin/ncp/NETWORKING/no-ip.sh @@ -85,9 +85,7 @@ configure() update-rc.d noip2 enable service noip2 restart - cd /var/www/nextcloud - sudo -u www-data php occ config:system:set trusted_domains 3 --value="$DOMAIN" - sudo -u www-data php occ config:system:set overwrite.cli.url --value=https://"$DOMAIN"/ + set-nc-domain "$DOMAIN" echo "noip DDNS enabled" } diff --git a/bin/ncp/UPDATES/nc-autoupdate-nc.sh b/bin/ncp/UPDATES/nc-autoupdate-nc.sh index 10593c0f..0d27a729 100644 --- a/bin/ncp/UPDATES/nc-autoupdate-nc.sh +++ b/bin/ncp/UPDATES/nc-autoupdate-nc.sh @@ -8,8 +8,8 @@ # More at: https://ownyourbits.com # -# just change NCVER and re-activate in update.sh to upgrade users -source /usr/local/etc/library.sh # sets NCVER +# just change NCLATESTVER and re-activate in update.sh to upgrade users +source /usr/local/etc/library.sh # sets NCLATESTVER configure() { @@ -23,8 +23,8 @@ configure() #!/bin/bash source /usr/local/etc/library.sh -echo -e "[ncp-update-nc]" >> /var/log/ncp.log -/usr/local/bin/ncp-update-nc "$NCVER" 2>&1 | tee -a /var/log/ncp.log +echo -e "[ncp-update-nc]" >> /var/log/ncp.log +/usr/local/bin/ncp-update-nc "$NCLATESTVER" 2>&1 | tee -a /var/log/ncp.log if [[ \${PIPESTATUS[0]} -eq 0 ]]; then diff --git a/bin/ncp/UPDATES/nc-update-nextcloud.sh b/bin/ncp/UPDATES/nc-update-nextcloud.sh index 1dcfb05d..66eefad1 100644 --- a/bin/ncp/UPDATES/nc-update-nextcloud.sh +++ b/bin/ncp/UPDATES/nc-update-nextcloud.sh @@ -8,8 +8,8 @@ # More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/ # -source /usr/local/etc/library.sh # sets NCVER -LATEST="$NCVER" +source /usr/local/etc/library.sh # sets NCLATESTVER +LATEST="$NCLATESTVER" configure() { diff --git a/bin/nextcloud-domain.sh b/bin/nextcloud-domain.sh new file mode 100644 index 00000000..6016c96d --- /dev/null +++ b/bin/nextcloud-domain.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +source /usr/local/etc/library.sh + +# wicd service finishes before completing DHCP +while :; do + iface="$( ip r | grep "default via" | awk '{ print $5 }' | head -1 )" + ip="$( ip a show dev "$iface" | grep global | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 )" + + public_ip="$(curl icanhazip.com 2>/dev/null)" + [[ "$public_ip" != "" ]] && ncc config:system:set trusted_domains 11 --value="$public_ip" + + [[ "$ip" != "" ]] && break + sleep 3 +done + +# set "${TRUSTED_DOMAINS[ip]}" +ncc config:system:set trusted_domains 1 --value=${ip} + +nc_domain="$(ncc config:system:get overwrite.cli.url)" +set-nc-domain "${nc_domain}" >> /var/log/ncp.log diff --git a/changelog.md b/changelog.md index 3dbc1707..aa123a52 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,9 @@ -[v1.38.6](https://github.com/nextcloud/nextcloudpi/commit/79a5020) (2021-08-25) raspi: allow oldstable origins +[v1.39.0](https://github.com/nextcloud/nextcloudpi/commit/e4d6e31) (2021-09-05) upgrade to NC21.0.4 -[v1.38.5](https://github.com/nextcloud/nextcloudpi/commit/e23b252) (2021-08-17) nc-init: drop News for 32-bit :( +[v1.38.6](https://github.com/nextcloud/nextcloudpi/commit/3bf746b) (2021-08-25) raspi: allow oldstable origins + +[v1.38.5 ](https://github.com/nextcloud/nextcloudpi/commit/e23b252) (2021-08-17) nc-init: drop News for 32-bit :( [v1.38.4 ](https://github.com/nextcloud/nextcloudpi/commit/bb720be) (2021-08-17) build: make sure we clean /.ncp-image in old builds diff --git a/docker/nextcloud/020nextcloud b/docker/nextcloud/020nextcloud index 8ab9f3dc..4826e035 100755 --- a/docker/nextcloud/020nextcloud +++ b/docker/nextcloud/020nextcloud @@ -11,6 +11,9 @@ set -e killall redis-server echo "stopping Postfix..." postfix stop + echo "stopping HPB..." + killall notify_push + postfix stop echo "stopping logs..." killall tail exit 0 @@ -49,17 +52,21 @@ FLUSH PRIVILEGES; EXIT EOF -# Trusted Domain ( local IP ) -IFACE=$( ip r | grep "default via" | awk '{ print $5 }' | head -1 ) -IP=$( ip a show dev "$IFACE" | grep global | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 ) -ncc config:system:set trusted_domains 1 --value="$IP" +echo "Provisioning" +bash /usr/local/bin/ncp-provisioning.sh + +echo "Starting notify_push daemon" +start_notify_push -# Trusted Domain ( as an argument ) +echo "Configuring Domain" +# Trusted Domain (local/public IP) +bash /usr/local/bin/nextcloud-domain.sh + +# Trusted Domain (as an argument) [[ "$2" != "" ]] && \ - ncc config:system:set trusted_domains 6 --value="$2" + ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[docker_overwrite]}" --value="$2" -echo "Provisioning" -bash /usr/local/bin/ncp-provisioning.sh +echo "Nextcloud version $(nc_version). NextCloudPi version $(cat /usr/local/etc/ncp-version)" # Display NC logs in the docker logs tail -f -n0 /data/nextcloud/data/nextcloud.log & diff --git a/docker/nextcloud/Dockerfile b/docker/nextcloud/Dockerfile index e3918122..bc802187 100644 --- a/docker/nextcloud/Dockerfile +++ b/docker/nextcloud/Dockerfile @@ -21,6 +21,9 @@ set -e; \ # mark as image build touch /.ncp-image; \ +# mark as docker image +touch /.docker-image; \ + # installation ( /var/www/nextcloud -> /data/app which will be in a volume ) apt-get update; \ apt-get install --no-install-recommends -y wget ca-certificates sudo jq; \ diff --git a/docker/nextcloud/ncp-wait-msg.html b/docker/nextcloud/ncp-wait-msg.html deleted file mode 100644 index 37c6f5bd..00000000 --- a/docker/nextcloud/ncp-wait-msg.html +++ /dev/null @@ -1,27 +0,0 @@ -<!DOCTYPE html> -<html class="ng-csp" data-placeholder-focus="false" lang="en"> -<head> - <meta http-equiv="content-type" content="text/html; charset=UTF-8"> - <meta charset="utf-8"> - <title> NextCloudPi Initialization </title> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="referrer" content="never"> - <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"> -<?php session_start(); ?> -</head> -<body id="body-login"> - <div class="wrapper"> - <div class="v-align"> - <header role="banner"> - <div id="header"> - <p style="font-size:130%">Initializing NextCloudPi for the first time</p> - <p style="font-size:130%">Please wait...</p> - </div> - </header> - </div> - </div> - <script type="text/javascript"> - setTimeout( function(){ window.location.reload( true ); }, 2500 ); - </script> -</body> -</html> diff --git a/docker/nextcloudpi/Dockerfile b/docker/nextcloudpi/Dockerfile index 9667c9da..7d7d6864 100644 --- a/docker/nextcloudpi/Dockerfile +++ b/docker/nextcloudpi/Dockerfile @@ -15,7 +15,7 @@ ENV DOCKERBUILD 1 RUN mkdir -p /tmp/ncp-build COPY bin/ /tmp/ncp-build/bin/ COPY etc /tmp/ncp-build/etc/ -COPY ncp.sh update.sh /tmp/ncp-build/ +COPY ncp.sh update.sh post-inst.sh /tmp/ncp-build/ COPY ncp-web /tmp/ncp-build/ncp-web/ COPY ncp-app /tmp/ncp-build/ncp-app/ COPY ncp-previewgenerator /tmp/ncp-build/ncp-previewgenerator/ @@ -50,20 +50,14 @@ sed -i 's|data-ro|data|' /data-ro/nextcloud/config/config.php; \ sed -i 's|/media/USBdrive|/data/backups|' /usr/local/etc/ncp-config.d/nc-backup.cfg; \ sed -i 's|/media/USBdrive|/data/backups|' /usr/local/etc/ncp-config.d/nc-backup-auto.cfg; \ +# cleanup all NCP extras +run_app_unsafe post-inst.sh; \ + # specific cleanup cd /; rm -r /tmp/ncp-build; \ rm /usr/local/etc/ncp-config.d/nc-init.cfg; \ -rm /.ncp-image; \ - -# cleanup all NCP extras -source /usr/local/etc/library.sh; \ -find /usr/local/bin/ncp -name '*.sh' | while read l; do cleanup_script $l; done; \ -# package clean up -apt-get autoremove -y; \ -apt-get clean; \ -find /var/lib/apt/lists -type f | xargs rm; \ -find /var/log -type f -exec rm {} \; ; \ +# package installation clean up rm -rf /usr/share/man/*; \ rm -rf /usr/share/doc/*; \ rm -f /var/log/alternatives.log /var/log/apt/*; \ diff --git a/etc/library.sh b/etc/library.sh index 755a4cb2..b382bad0 100644 --- a/etc/library.sh +++ b/etc/library.sh @@ -11,6 +11,12 @@ export NCPCFG=${NCPCFG:-/usr/local/etc/ncp.cfg} export CFGDIR=/usr/local/etc/ncp-config.d export BINDIR=/usr/local/bin/ncp +export NCDIR=/var/www/nextcloud + +export TRUSTED_DOMAINS=( + [ip]=1 [dnsmasq]=2 [nc_domain]=3 [nextcloudpi-local]=5 [docker_overwrite]=6 + [nextcloudpi]=7 [nextcloudpi-lan]=8 [public_ip]=11 [letsencrypt_1]=12 + [letsencrypt_2]=13 [trusted_domain_1]=20 [trusted_domain_1]=21 [trusted_domain_1]=22) command -v jq &>/dev/null || { apt-get update @@ -18,10 +24,11 @@ command -v jq &>/dev/null || { } [[ -f "$NCPCFG" ]] && { - NCVER=$( jq -r .nextcloud_version < "$NCPCFG") - PHPVER=$( jq -r .php_version < "$NCPCFG") - RELEASE=$(jq -r .release < "$NCPCFG") + NCLATESTVER=$(jq -r .nextcloud_version < "$NCPCFG") + PHPVER=$( jq -r .php_version < "$NCPCFG") + RELEASE=$( jq -r .release < "$NCPCFG") } +command -v ncc &>/dev/null && NCVER="$(ncc status | grep "version:" | awk '{ print $3 }')" function configure_app() { @@ -101,6 +108,45 @@ function configure_app() return $ret } +function set-nc-domain() +{ + local domain="${1?}" + domain="$(sed 's|http.\?://||;s|\(/.*\)||' <<<"${domain}")" + if [[ "${domain}" == "" ]] || is_an_ip "${domain}"; then + echo "warning: No domain found. Defaulting to '$(hostname)'" + domain="$(hostname)" + fi + local proto + proto="$(ncc config:system:get overwriteprotocol)" || true + [[ "${proto}" == "" ]] && proto="https" + local url="${proto}://${domain%*/}" + # trusted_domain no 3 will always contain the overwrite domain + [[ "$2" == "--no-trusted-domain" ]] || ncc config:system:set trusted_domains 3 --value="${domain%*/}" + ncc config:system:set overwrite.cli.url --value="${url}/" + if is_ncp_activated && is_app_enabled notify_push; then + ncc config:system:set trusted_proxies 11 --value="127.0.0.1" + ncc config:system:set trusted_proxies 12 --value="::1" + ncc config:system:set trusted_proxies 13 --value="${domain}" + ncc config:system:set trusted_proxies 14 --value="$(dig +short "${domain}")" + sleep 5 # this seems to be required in the VM for some reason. We get `http2 error: protocol error` after ncp-upgrade-nc + ncc notify_push:setup "${url}/push" + fi +} + +function start_notify_push +{ + pgrep notify_push &>/dev/null && return + if [[ -f /.docker-image ]]; then + local arch + arch="$(uname -m)" + [[ "${arch}" =~ "armv7" ]] && arch="armv7" + sudo -u www-data /var/www/nextcloud/apps/notify_push/bin/"${arch}"/notify_push --allow-self-signed /var/www/nextcloud/config/config.php &>/dev/null & + else + systemctl enable --now notify_push + fi + sleep 5 # apparently we need to make sure we wait until the database is written or something +} + function run_app() { local ncp_app=$1 @@ -304,6 +350,12 @@ function is_more_recent_than() return 0 } +function is_app_enabled() +{ + local app="$1" + ncc app:list | sed '0,/Disabled/!d' | grep -q "${app}" +} + function check_distro() { local cfg="${1:-$NCPCFG}" @@ -312,6 +364,22 @@ function check_distro() return 1 } +function nc_version() +{ + ncc status | grep "version:" | awk '{ print $3 }' +} + +function is_an_ip() +{ + local ip_or_domain="${1}" + grep -oPq '\d{1,3}(.\d{1,3}){3}' <<<"${ip_or_domain}" +} + +function is_ncp_activated() +{ + ! a2query -s ncp-activation -q +} + function clear_password_fields() { local cfg_file="$1" diff --git a/etc/ncp-config.d/nc-nextcloud.cfg b/etc/ncp-config.d/nc-nextcloud.cfg index a36cb7b0..cc242587 100644 --- a/etc/ncp-config.d/nc-nextcloud.cfg +++ b/etc/ncp-config.d/nc-nextcloud.cfg @@ -9,7 +9,7 @@ { "id": "VER", "name": "Version", - "value": "20.0.12" + "value": "21.0.4" }, { "id": "MAXFILESIZE", diff --git a/etc/ncp-templates/nextcloud.conf.sh b/etc/ncp-templates/nextcloud.conf.sh index 1df133eb..196e56c8 100644 --- a/etc/ncp-templates/nextcloud.conf.sh +++ b/etc/ncp-templates/nextcloud.conf.sh @@ -46,15 +46,20 @@ cat <<EOF CustomLog /var/log/apache2/nc-access.log combined ErrorLog /var/log/apache2/nc-error.log SSLEngine on + SSLProxyEngine on SSLCertificateFile ${LETSENCRYPT_CERT_PATH:-/etc/ssl/certs/ssl-cert-snakeoil.pem} SSLCertificateKeyFile ${LETSENCRYPT_KEY_PATH:-/etc/ssl/private/ssl-cert-snakeoil.key} + + # For notify_push app in NC21 + ProxyPass /push/ws ws://127.0.0.1:7867/ws + ProxyPass /push/ http://127.0.0.1:7867/ + ProxyPassReverse /push/ http://127.0.0.1:7867/ EOF if [[ "$1" != "--defaults" ]] && [[ "$METRICS_IS_ENABLED" == yes ]] then cat <<EOF - SSLProxyEngine on <Location /metrics/system> ProxyPass http://localhost:9100/metrics @@ -93,5 +98,5 @@ cat <<EOF </IfModule> EOF -echo "Apache self check:" > /var/log/ncp.log -apache2ctl -t > /var/log/ncp.log 2>&1 +echo "Apache self check:" >> /var/log/ncp.log +apache2ctl -t >> /var/log/ncp.log 2>&1 diff --git a/etc/ncp.cfg b/etc/ncp.cfg index 2beb6f9d..2bef7db1 100644 --- a/etc/ncp.cfg +++ b/etc/ncp.cfg @@ -1,5 +1,5 @@ { - "nextcloud_version": "20.0.12", + "nextcloud_version": "21.0.4", "php_version": "7.3", "release": "buster" } @@ -10,7 +10,7 @@ # more details at https://ownyourbits.com BRANCH="${BRANCH:-master}" -#DBG=x +DBG=x set -e$DBG diff --git a/ncp-previewgenerator/.travis.yml b/ncp-previewgenerator/ncp-previewgenerator-nc20/.travis.yml index 66f01ba7..66f01ba7 100644 --- a/ncp-previewgenerator/.travis.yml +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/.travis.yml diff --git a/ncp-previewgenerator/CHANGELOG.md b/ncp-previewgenerator/ncp-previewgenerator-nc20/CHANGELOG.md index 507faa27..507faa27 100644 --- a/ncp-previewgenerator/CHANGELOG.md +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/CHANGELOG.md diff --git a/ncp-previewgenerator/LICENSE b/ncp-previewgenerator/ncp-previewgenerator-nc20/LICENSE index dbbe3558..dbbe3558 100644 --- a/ncp-previewgenerator/LICENSE +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/LICENSE diff --git a/ncp-previewgenerator/Makefile b/ncp-previewgenerator/ncp-previewgenerator-nc20/Makefile index 4cb7cb0d..4cb7cb0d 100644 --- a/ncp-previewgenerator/Makefile +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/Makefile diff --git a/ncp-previewgenerator/README.md b/ncp-previewgenerator/ncp-previewgenerator-nc20/README.md index 98bb4103..98bb4103 100644 --- a/ncp-previewgenerator/README.md +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/README.md diff --git a/ncp-previewgenerator/appinfo/app.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/appinfo/app.php index 781cab2f..781cab2f 100644 --- a/ncp-previewgenerator/appinfo/app.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/appinfo/app.php diff --git a/ncp-previewgenerator/appinfo/info.xml b/ncp-previewgenerator/ncp-previewgenerator-nc20/appinfo/info.xml index f28e35f2..f28e35f2 100644 --- a/ncp-previewgenerator/appinfo/info.xml +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/appinfo/info.xml diff --git a/ncp-previewgenerator/composer/autoload.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/autoload.php index 9d93afc1..9d93afc1 100644 --- a/ncp-previewgenerator/composer/autoload.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/autoload.php diff --git a/ncp-previewgenerator/composer/composer.json b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer.json index 5805e88b..5805e88b 100644 --- a/ncp-previewgenerator/composer/composer.json +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer.json diff --git a/ncp-previewgenerator/composer/composer/ClassLoader.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer/ClassLoader.php index 95f7e097..95f7e097 100644 --- a/ncp-previewgenerator/composer/composer/ClassLoader.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer/ClassLoader.php diff --git a/ncp-previewgenerator/composer/composer/LICENSE b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer/LICENSE index f27399a0..f27399a0 100644 --- a/ncp-previewgenerator/composer/composer/LICENSE +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer/LICENSE diff --git a/ncp-previewgenerator/composer/composer/autoload_classmap.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer/autoload_classmap.php index 26656a36..26656a36 100644 --- a/ncp-previewgenerator/composer/composer/autoload_classmap.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer/autoload_classmap.php diff --git a/ncp-previewgenerator/composer/composer/autoload_namespaces.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer/autoload_namespaces.php index 71c9e918..71c9e918 100644 --- a/ncp-previewgenerator/composer/composer/autoload_namespaces.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer/autoload_namespaces.php diff --git a/ncp-previewgenerator/composer/composer/autoload_psr4.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer/autoload_psr4.php index 4395b050..4395b050 100644 --- a/ncp-previewgenerator/composer/composer/autoload_psr4.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer/autoload_psr4.php diff --git a/ncp-previewgenerator/composer/composer/autoload_real.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer/autoload_real.php index 61e74c66..61e74c66 100644 --- a/ncp-previewgenerator/composer/composer/autoload_real.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer/autoload_real.php diff --git a/ncp-previewgenerator/composer/composer/autoload_static.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer/autoload_static.php index b2d98620..b2d98620 100644 --- a/ncp-previewgenerator/composer/composer/autoload_static.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer/autoload_static.php diff --git a/ncp-previewgenerator/composer/composer/installed.json b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer/installed.json index fe51488c..fe51488c 100644 --- a/ncp-previewgenerator/composer/composer/installed.json +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/composer/composer/installed.json diff --git a/ncp-previewgenerator/lib/AppInfo/Application.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/AppInfo/Application.php index e61dad84..e61dad84 100644 --- a/ncp-previewgenerator/lib/AppInfo/Application.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/AppInfo/Application.php diff --git a/ncp-previewgenerator/lib/Command/DeleteOld.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/Command/DeleteOld.php index d0ace747..d0ace747 100644 --- a/ncp-previewgenerator/lib/Command/DeleteOld.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/Command/DeleteOld.php diff --git a/ncp-previewgenerator/lib/Command/Generate.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/Command/Generate.php index 7aafad98..7aafad98 100644 --- a/ncp-previewgenerator/lib/Command/Generate.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/Command/Generate.php diff --git a/ncp-previewgenerator/lib/Command/PreGenerate.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/Command/PreGenerate.php index 5f34fca9..5f34fca9 100644 --- a/ncp-previewgenerator/lib/Command/PreGenerate.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/Command/PreGenerate.php diff --git a/ncp-previewgenerator/lib/Command/TimestampFormatter.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/Command/TimestampFormatter.php index b7169392..b7169392 100644 --- a/ncp-previewgenerator/lib/Command/TimestampFormatter.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/Command/TimestampFormatter.php diff --git a/ncp-previewgenerator/lib/Migration/Version020000Date20180823071939.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/Migration/Version020000Date20180823071939.php index 7cebcd45..7cebcd45 100644 --- a/ncp-previewgenerator/lib/Migration/Version020000Date20180823071939.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/Migration/Version020000Date20180823071939.php diff --git a/ncp-previewgenerator/lib/Migration/Version020200Date20190608205303.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/Migration/Version020200Date20190608205303.php index dd6ad7f5..dd6ad7f5 100644 --- a/ncp-previewgenerator/lib/Migration/Version020200Date20190608205303.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/Migration/Version020200Date20190608205303.php diff --git a/ncp-previewgenerator/lib/SizeHelper.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/SizeHelper.php index c49b253b..c49b253b 100644 --- a/ncp-previewgenerator/lib/SizeHelper.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/SizeHelper.php diff --git a/ncp-previewgenerator/lib/Watcher.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/Watcher.php index 5344ff7b..5344ff7b 100644 --- a/ncp-previewgenerator/lib/Watcher.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/lib/Watcher.php diff --git a/ncp-previewgenerator/tests/WatcherTest.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/tests/WatcherTest.php index a89bbc05..a89bbc05 100644 --- a/ncp-previewgenerator/tests/WatcherTest.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/tests/WatcherTest.php diff --git a/ncp-previewgenerator/tests/bootstrap.php b/ncp-previewgenerator/ncp-previewgenerator-nc20/tests/bootstrap.php index a2699765..a2699765 100644 --- a/ncp-previewgenerator/tests/bootstrap.php +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/tests/bootstrap.php diff --git a/ncp-previewgenerator/tests/phpunit.xml b/ncp-previewgenerator/ncp-previewgenerator-nc20/tests/phpunit.xml index ca916756..ca916756 100644 --- a/ncp-previewgenerator/tests/phpunit.xml +++ b/ncp-previewgenerator/ncp-previewgenerator-nc20/tests/phpunit.xml diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/.github/workflows/lint.yml b/ncp-previewgenerator/ncp-previewgenerator-nc21/.github/workflows/lint.yml new file mode 100644 index 00000000..97ea55a7 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/.github/workflows/lint.yml @@ -0,0 +1,54 @@ +name: Lint + +on: + pull_request: + push: + branches: + - master + - stable* + +jobs: + php: + runs-on: ubuntu-latest + + strategy: + matrix: + php-versions: ['7.3', '7.4', '8.0'] + + name: php${{ matrix.php-versions }} + steps: + - uses: actions/checkout@v2 + + - name: Set up php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@v1 + with: + php-version: ${{ matrix.php-versions }} + coverage: none + + - name: Lint + run: composer run lint + + php-cs-fixer: + runs-on: ubuntu-latest + + strategy: + matrix: + php-versions: ['7.4'] + + name: cs php${{ matrix.php-versions }} + steps: + - name: Checkout + uses: actions/checkout@master + + - name: Set up php + uses: shivammathur/setup-php@master + with: + php-version: ${{ matrix.php-versions }} + coverage: none + + - name: Install dependencies + run: composer i + + - name: Run coding standards check + run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 ) + diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/.nextcloudignore b/ncp-previewgenerator/ncp-previewgenerator-nc21/.nextcloudignore new file mode 100644 index 00000000..d0704339 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/.nextcloudignore @@ -0,0 +1,19 @@ +.babelrc.js +.drone.yml +.eslintrc.js +.git +.github +.gitignore +.nextcloudignore +.scrutinizer.yml +.travis.yml +.tx +composer.json +composer.lock +krankerl.toml +node_modules +package.json +package-lock.json +screenshots +src +vendor diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/.php_cs.dist b/ncp-previewgenerator/ncp-previewgenerator-nc21/.php_cs.dist new file mode 100644 index 00000000..8a0cb43c --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/.php_cs.dist @@ -0,0 +1,17 @@ +<?php + +declare(strict_types=1); + +require_once './vendor/autoload.php'; + +use Nextcloud\CodingStandard\Config; + +$config = new Config(); +$config + ->getFinder() + ->notPath('build') + ->notPath('l10n') + ->notPath('src') + ->notPath('vendor') + ->in(__DIR__); +return $config; diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/CHANGELOG.md b/ncp-previewgenerator/ncp-previewgenerator-nc21/CHANGELOG.md new file mode 100644 index 00000000..438ffca6 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/CHANGELOG.md @@ -0,0 +1,111 @@ +## 3.1.1 - 2021-01-27 +### Changed +- Use new batch preview method + +### Fixed +- Init filesystem for the users +- Handle unavailable storages more graceful + +## 3.1.0 -2020-12-21 +### Added +- Nextcloud 21 support + +## 3.0.0 - 2020-08-31 +### Added +- Nextcloud 20 support +- IBootstap support +- Listen to new events hence only initialize the FS if needed + +### Removed +- Nextcloud <20 support + +## 2.3.0 - 2020-04-03 +### Added +- Nextcloud 19 support + +## 2.2.0 - 2019-12-05 +### Added +- Nextcloud 18 support + +## 2.1.0 - 2019-03-05 +### Added +- Nextcloud 16 support + +## 2.0.0 - 2018-11-08 + +- PHP 7.x required +- Nextcloud 14 only +- Moved to migrations for DB handling +- Added path option to generate command (thanks to @adduxa) +- Nextcloud 15 compatible + +## 1.0.9 - 2017-12-29 + +### Fixes + +### Added +- Show timestamp in occ commands [#88](https://github.com/rullzer/previewgenerator/pull/88) +- Add Composer Classmap for file (NC13) [#90](https://github.com/rullzer/previewgenerator/pull/90) +- Respect .nomedia [#92](https://github.com/rullzer/previewgenerator/pull/92) +- Use PID to check for already running process [#93](https://github.com/rullzer/previewgenerator/pull/93) + +## 1.0.8 - 2017-12-21 + +### Fixes +- Do not add file if it already is in the table [#86](https://github.com/rullzer/previewgenerator/pull/86) + +### Added +- Allow to specify sizes to be generated [#87](https://github.com/rullzer/previewgenerator/pull/86) + +## 1.0.7 - 2017-09-26 + +### Fixes +- Updated/Fixed README + - [#55](https://github.com/rullzer/previewgenerator/pull/55) @Eeems + - [#58](https://github.com/rullzer/previewgenerator/pull/58) @MichaIng + - [#67](https://github.com/rullzer/previewgenerator/pull/67) @sndrr +- Avoid folder processing on pre-generate [#73](https://github.com/rullzer/previewgenerator/pull/73) @Seik + +### Added +- Make NC13 Compatible [#63](https://github.com/rullzer/previewgenerator/pull/63) + +## 1.0.6 - 2017-05-05 + +### Fixed +- Better preview error handling [#51](https://github.com/rullzer/previewgenerator/pull/51) @icewind1991 +- Travis test runs [#53](https://github.com/rullzer/previewgenerator/pull/53) + +### Added +- README.md [#52](https://github.com/rullzer/previewgenerator/pull/52) +- CHANGELOG.md [#52](https://github.com/rullzer/previewgenerator/pull/52) + +## 1.0.5 - 2017-03-17 + +### Added +- Generate more preview sizes +- Add --force command to break lock + +## 1.0.4 - 2017-03-14 + +### Fixed +- Lock timeout was 30 hours instead of minutes + +## 1.0.3 - 2017-03-14 + +### Added +- Do not use app with encryption +- Check for already running command + +## 1.0.2 - 2017-03-08 + +### Added +- More verbose output of commands +- Hack around preview generation errors by not trying the file again in the next run + +## 1.0.1 - 2016-12-08 + +### Fixed +- Pimp info.xml + +## 1.0.0 – 2016-12-07 +Initial release diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/LICENSE b/ncp-previewgenerator/ncp-previewgenerator-nc21/LICENSE new file mode 100644 index 00000000..dbbe3558 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/README.md b/ncp-previewgenerator/ncp-previewgenerator-nc21/README.md new file mode 100644 index 00000000..98bb4103 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/README.md @@ -0,0 +1,96 @@ +# Preview Generator + +Nextcloud app that allows admins to pre-generate previews. The app listens to +edit events and stores this information. Once a cron job is triggered it will +start preview generation. This means that you can better utilize your +system by pre-generating previews when your system is normally idle and thus +putting less load on your machine when the requests are actually served. + +The app does not replace on demand preview generation so if a preview is +requested before it is pre-generated it will still be shown. + +## How to install + +* Install directly from within your Nextcloud from the [app store](https://apps.nextcloud.com/apps/previewgenerator) +* Clone this repository in you Nextcloud app folder + +## How to use the app + +1. Install the app +2. Enable the app +3. Run `./occ preview:generate-all` once after installation. +4. Add a (system) cron job for ` ./occ preview:pre-generate` + * I run it every 10 minutes + +## Known issues + +* The app does not work with encryption enabled + +## How does the app work + +1. Listen to events that a file has been written or modified and store it in the database +2. On cron run request previews for the files that have been written or modified + +If a preview already exists at step 2 then requesting it is really cheap. If not +it will be generated. Depending on the sizes of the files and the hardware you +are running on the time this takes can vary. + +## Commands + +### preview:delete_old + +This removes the previews from the old preview location that was used before +Nextcloud 11. That has some issues. Note that the gallery shipped with Nextcloud +11 did not yet use this location. So you might want to run it again with Nextcloud 12. + +### preview:generate-all [user-id] + +Loop over all files and try to generate previews for them. If `user-id` is supplied +just loop over the files for that user. + +### preview:pre-generate + +Do the actual pregeneration. This means only for new or modified files (since +the app was enabled or the last pregeneration was done). + +## FAQ + +### Why can't I use webcron? + +Preview generation can be a very long running job. Thus we need a system that +does not time out. + +### It sometimes crashed + +Yes this happens. Most of it is due to corrupted files not being handled that gracefully +in the Nextcloud server. Improvements in this area are coming with Nextcloud 12 + +### I get "Command already running" + +Yes this happens when the `pre-generate` command crashes. No worries the lock +will be released after 30 minutes of inactivity from the app. So go grab a cookie. + +### I don't want to generate all the preview sizes + +This is possible since version 1.0.8. Just set the correct values via the command line + +``` +./occ config:app:set --value="32 64 1024" previewgenerator squareSizes +./occ config:app:set --value="64 128 1024" previewgenerator widthSizes +./occ config:app:set --value="64 256 1024" previewgenerator heightSizes +``` + +This will only generate: + * square previews of: 32x32, 64x64 and 1024x1024 + * aspect ratio previews with a width of: 64, 128 and 1024 + * aspect ratio previews with a height of: 64, 256 and 1024 + +Note: + * preview sizes are always a power of 2. + * The smallest size is 32 + * The max size is determined by your preview settings in config.php + + ### I get "PHP Fatal error: Allowed memory size of X bytes exhausted" + You need to increase the memory allowance of PHP, by default it is 128 MB. You do that by changing the memory_limit in the php.ini file. + + If you use the docker container you need to create the php.ini file in /usr/local/etc/php first. diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml b/ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml new file mode 100644 index 00000000..db280895 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml @@ -0,0 +1,35 @@ +<?xml version="1.0"?> +<info xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd"> + <id>previewgenerator</id> + <name>Preview Generator</name> + <summary>A preview pre-generation app</summary> + <description><![CDATA[The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served. + +The app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown. +The first time you install this app, before using a cron job, you properly want to generate all previews via: +**./occ preview:generate-all -vvv** + +**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.]]> + </description> + <licence>AGPL</licence> + <author>Roeland Jago Douma</author> + <version>3.1.1</version> + <namespace>PreviewGenerator</namespace> + <category>multimedia</category> + <website>https://github.com/rullzer/previewgenerator</website> + <bugs>https://github.com/rullzer/previewgenerator/issues</bugs> + <repository type="git">https://github.com/rullzer/previewgenerator.git</repository> + <types> + <filesystem/> + </types> + <dependencies> + <php min-version="7.2"/> + <nextcloud min-version="20" max-version="21" /> + </dependencies> + + <commands> + <command>OCA\PreviewGenerator\Command\Generate</command> + <command>OCA\PreviewGenerator\Command\DeleteOld</command> + <command>OCA\PreviewGenerator\Command\PreGenerate</command> + </commands> +</info> diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/composer.json b/ncp-previewgenerator/ncp-previewgenerator-nc21/composer.json new file mode 100644 index 00000000..815a61b2 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/composer.json @@ -0,0 +1,18 @@ +{ + "name": "rullzer/previewgenerator", + "config": { + "optimize-autoloader": true, + "classmap-authoritative": true, + "platform": { + "php": "7.3" + } + }, + "scripts": { + "cs:fix": "php-cs-fixer fix", + "cs:check": "php-cs-fixer fix --dry-run --diff", + "lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l" + }, + "require-dev": { + "nextcloud/coding-standard": "^0.3.0" + } +} diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/krankerl.toml b/ncp-previewgenerator/ncp-previewgenerator-nc21/krankerl.toml new file mode 100644 index 00000000..0fb064b6 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/krankerl.toml @@ -0,0 +1,3 @@ +[package] +before_cmds = [ +] diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/AppInfo/Application.php b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/AppInfo/Application.php new file mode 100644 index 00000000..dc43dcaf --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/AppInfo/Application.php @@ -0,0 +1,47 @@ +<?php + +declare(strict_types=1); +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +namespace OCA\PreviewGenerator\AppInfo; + +use OCA\PreviewGenerator\Listeners\PostWriteListener; +use OCP\AppFramework\App; +use OCP\AppFramework\Bootstrap\IBootContext; +use OCP\AppFramework\Bootstrap\IBootstrap; +use OCP\AppFramework\Bootstrap\IRegistrationContext; +use OCP\Files\Events\Node\NodeWrittenEvent; + +class Application extends App implements IBootstrap { + public const APPNAME='previewgenerator'; + + public function __construct() { + parent::__construct(self::APPNAME); + } + + public function register(IRegistrationContext $context): void { + $context->registerEventListener(NodeWrittenEvent::class, PostWriteListener::class); + } + + public function boot(IBootContext $context): void { + } +} diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Command/DeleteOld.php b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Command/DeleteOld.php new file mode 100644 index 00000000..a9b4d197 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Command/DeleteOld.php @@ -0,0 +1,96 @@ +<?php + +declare(strict_types=1); +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +namespace OCA\PreviewGenerator\Command; + +use OCP\Files\Folder; +use OCP\Files\IRootFolder; +use OCP\Files\NotFoundException; +use OCP\IUser; +use OCP\IUserManager; +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\OutputInterface; + +class DeleteOld extends Command { + + /** @var IUserManager */ + protected $userManager; + + /** @var IRootFolder */ + protected $rootFolder; + + public function __construct(IRootFolder $rootFolder, + IUserManager $userManager) { + parent::__construct(); + + $this->userManager = $userManager; + $this->rootFolder = $rootFolder; + } + + protected function configure() { + $this + ->setName('preview:delete_old') + ->setDescription('Delete old preview folder (pre NC11)') + ->addArgument( + 'user_id', + InputArgument::OPTIONAL, + 'Delete old preview folder for the given user' + ); + } + + protected function execute(InputInterface $input, OutputInterface $output): int { + $userId = $input->getArgument('user_id'); + + if ($userId === null) { + $this->userManager->callForSeenUsers(function (IUser $user) { + $this->deletePreviews($user); + }); + } else { + $user = $this->userManager->get($userId); + if ($user !== null) { + $this->deletePreviews($user); + } + } + + return 0; + } + + private function deletePreviews(IUser $user) { + \OC_Util::tearDownFS(); + \OC_Util::setupFS($user->getUID()); + + $userFolder = $this->rootFolder->getUserFolder($user->getUID()); + $userRoot = $userFolder->getParent(); + + try { + /** @var Folder $thumbnails */ + $thumbnails = $userRoot->get('thumbnails'); + $thumbnails->delete(); + } catch (NotFoundException $e) { + //Ignore + } + } +} diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Command/Generate.php b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Command/Generate.php new file mode 100644 index 00000000..669139b2 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Command/Generate.php @@ -0,0 +1,256 @@ +<?php +declare(strict_types=1); +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCA\PreviewGenerator\Command; + +use OCA\PreviewGenerator\SizeHelper; +use OCP\Encryption\IManager; +use OCP\Files\File; +use OCP\Files\Folder; +use OCP\Files\IRootFolder; +use OCP\Files\NotFoundException; +use OCP\Files\StorageNotAvailableException; +use OCP\IConfig; +use OCP\IDBConnection; +use OCP\IPreview; +use OCP\IUser; +use OCP\IUserManager; +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; +use Symfony\Component\Console\Output\OutputInterface; + +class Generate extends Command { + + /** @var IUserManager */ + protected $userManager; + + /** @var IRootFolder */ + protected $rootFolder; + + /** @var IPreview */ + protected $previewGenerator; + + /** @var IConfig */ + protected $config; + + /** @var IDBConnection */ + protected $connection; + + /** @var OutputInterface */ + protected $output; + + /** @var int[][] */ + protected $sizes; + + /** @var IManager */ + protected $encryptionManager; + + public function __construct(IRootFolder $rootFolder, + IUserManager $userManager, + IPreview $previewGenerator, + IConfig $config, + IDBConnection $connection, + IManager $encryptionManager) { + parent::__construct(); + + $this->userManager = $userManager; + $this->rootFolder = $rootFolder; + $this->previewGenerator = $previewGenerator; + $this->config = $config; + $this->connection = $connection; + $this->encryptionManager = $encryptionManager; + } + + protected function configure() { + $this + ->setName('preview:generate-all') + ->setDescription('Generate previews') + ->addArgument( + 'user_id', + InputArgument::OPTIONAL, + 'Generate previews for the given user' + )->addOption( + 'path', + 'p', + InputOption::VALUE_OPTIONAL, + 'limit scan to this path, eg. --path="/alice/files/Photos", the user_id is determined by the path and the user_id parameter is ignored' + ); + } + + protected function execute(InputInterface $input, OutputInterface $output): int { + if ($this->encryptionManager->isEnabled()) { + $output->writeln('Encryption is enabled. Aborted.'); + return 1; + } + + // Set timestamp output + $formatter = new TimestampFormatter($this->config, $output->getFormatter()); + $output->setFormatter($formatter); + $this->output = $output; + + $this->sizes = SizeHelper::calculateSizes($this->config); + + $inputPath = $input->getOption('path'); + if ($inputPath) { + $inputPath = '/' . trim($inputPath, '/'); + [, $userId,] = explode('/', $inputPath, 3); + $user = $this->userManager->get($userId); + if ($user !== null) { + $this->generatePathPreviews($user, $inputPath); + } + } else { + $userId = $input->getArgument('user_id'); + if ($userId === null) { + $this->userManager->callForSeenUsers(function (IUser $user) { + $this->generateUserPreviews($user); + }); + } else { + $user = $this->userManager->get($userId); + if ($user !== null) { + $this->generateUserPreviews($user); + } + } + } + + return 0; + } + + private function generatePathPreviews(IUser $user, string $path) { + \OC_Util::tearDownFS(); + \OC_Util::setupFS($user->getUID()); + $userFolder = $this->rootFolder->getUserFolder($user->getUID()); + try { + $relativePath = $userFolder->getRelativePath($path); + } catch (NotFoundException $e) { + $this->output->writeln('Path not found'); + return; + } + $pathFolder = $userFolder->get($relativePath); + $this->parseFolder($pathFolder, $user); + } + + private function generateUserPreviews(IUser $user) { + \OC_Util::tearDownFS(); + \OC_Util::setupFS($user->getUID()); + + $userFolder = $this->rootFolder->getUserFolder($user->getUID()); + $this->parseFolder($userFolder, $user); + } + + private function parseFolder(Folder $folder, IUser $user) { + try { + // Respect the '.nomedia' file. If present don't traverse the folder + if ($folder->nodeExists('.nomedia')) { + $this->output->writeln('Skipping folder ' . $folder->getPath()); + return; + } + + // random sleep between 0 and 50ms to avoid collision between 2 processes + usleep(rand(0,50000)); + + $this->output->writeln('Scanning folder ' . $folder->getPath()); + + $nodes = $folder->getDirectoryListing(); + + foreach ($nodes as $node) { + if ($node instanceof Folder) { + $this->parseFolder($node, $user); + } else if ($node instanceof File) { + $is_locked = false; + $qb = $this->connection->getQueryBuilder(); + $row = $qb->select('*') + ->from('preview_generation') + ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($node->getId()))) + ->setMaxResults(1) + ->execute() + ->fetch(); + if ($row !== false) { + if ($row['locked'] == 1) { + // already being processed + $is_locked = true; + } else { + $qb->update('preview_generation') + ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($node->getId()))) + ->set('locked', $qb->createNamedParameter(true)) + ->execute(); + } + } else { + $qb->insert('preview_generation') + ->values([ + 'uid' => $qb->createNamedParameter($user->getUID()), + 'file_id' => $qb->createNamedParameter($node->getId()), + 'locked' => $qb->createNamedParameter(true), + ]) + ->execute(); + } + + if ($is_locked === false) { + try { + $this->parseFile($node); + } finally { + $qb->delete('preview_generation') + ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($node->getId()))) + ->execute(); + } + } + } + } + } catch (StorageNotAvailableException $e) { + $this->output->writeln(sprintf('<error>Storage for folder folder %s is not available: %s</error>', + $folder->getPath(), + $e->getHint() + )); + } + } + + private function parseFile(File $file) { + if ($this->previewGenerator->isMimeSupported($file->getMimeType())) { + if ($this->output->getVerbosity() > OutputInterface::VERBOSITY_VERBOSE) { + $this->output->writeln('Generating previews for ' . $file->getPath()); + } + + try { + $specifications = array_merge( + array_map(function ($squareSize) { + return ['width' => $squareSize, 'height' => $squareSize, 'crop' => true]; + }, $this->sizes['square']), + array_map(function ($heightSize) { + return ['width' => -1, 'height' => $heightSize, 'crop' => false]; + }, $this->sizes['height']), + array_map(function ($widthSize) { + return ['width' => $widthSize, 'height' => -1, 'crop' => false]; + }, $this->sizes['width']) + ); + $this->previewGenerator->generatePreviews($file, $specifications); + } catch (NotFoundException $e) { + // Maybe log that previews could not be generated? + } catch (\InvalidArgumentException $e) { + $error = $e->getMessage(); + $this->output->writeln("<error>${error}</error>"); + } + } + } +} diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Command/PreGenerate.php b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Command/PreGenerate.php new file mode 100644 index 00000000..f51efdb5 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Command/PreGenerate.php @@ -0,0 +1,219 @@ +<?php +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +namespace OCA\PreviewGenerator\Command; + +use OCA\PreviewGenerator\SizeHelper; +use OCP\AppFramework\Utility\ITimeFactory; +use OCP\Encryption\IManager; +use OCP\Files\File; +use OCP\Files\IRootFolder; +use OCP\Files\NotFoundException; +use OCP\IConfig; +use OCP\IDBConnection; +use OCP\IPreview; +use OCP\IUserManager; +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\OutputInterface; + +class PreGenerate extends Command { + + /** @var string */ + protected $appName; + + /** @var IUserManager */ + protected $userManager; + + /** @var IRootFolder */ + protected $rootFolder; + + /** @var IPreview */ + protected $previewGenerator; + + /** @var IConfig */ + protected $config; + + /** @var IDBConnection */ + protected $connection; + + /** @var OutputInterface */ + protected $output; + + /** @var int[][] */ + protected $sizes; + + /** @var IManager */ + protected $encryptionManager; + + /** @var ITimeFactory */ + protected $time; + + /** + * @param string $appName + * @param IRootFolder $rootFolder + * @param IUserManager $userManager + * @param IPreview $previewGenerator + * @param IConfig $config + * @param IDBConnection $connection + * @param IManager $encryptionManager + * @param ITimeFactory $time + */ + public function __construct($appName, + IRootFolder $rootFolder, + IUserManager $userManager, + IPreview $previewGenerator, + IConfig $config, + IDBConnection $connection, + IManager $encryptionManager, + ITimeFactory $time) { + parent::__construct(); + + $this->appName = $appName; + $this->userManager = $userManager; + $this->rootFolder = $rootFolder; + $this->previewGenerator = $previewGenerator; + $this->config = $config; + $this->connection = $connection; + $this->encryptionManager = $encryptionManager; + $this->time = $time; + } + + protected function configure() { + $this + ->setName('preview:pre-generate') + ->setDescription('Pre generate previews'); + } + + /** + * @param InputInterface $input + * @param OutputInterface $output + * @return int + */ + protected function execute(InputInterface $input, OutputInterface $output) { + if ($this->encryptionManager->isEnabled()) { + $output->writeln('Encryption is enabled. Aborted.'); + return 1; + } + + // Set timestamp output + $formatter = new TimestampFormatter($this->config, $output->getFormatter()); + $output->setFormatter($formatter); + $this->output = $output; + + $this->sizes = SizeHelper::calculateSizes($this->config); + $this->startProcessing(); + + return 0; + } + + private function startProcessing() { + // random sleep between 0 and 50ms to avoid collision between 2 processes + usleep(rand(0,50000)); + + while (true) { + $qb = $this->connection->getQueryBuilder(); + $row = $qb->select('*') + ->from('preview_generation') + ->where($qb->expr()->eq('locked', $qb->createNamedParameter(false))) + ->setMaxResults(1) + ->execute() + ->fetch(); + + if ($row === false) { + break; + } + + $qb->update('preview_generation') + ->where($qb->expr()->eq('id', $qb->createNamedParameter($row['id']))) + ->set('locked', $qb->createNamedParameter(true)) + ->execute(); + try { + $this->processRow($row); + } finally { + $qb->delete('preview_generation') + ->where($qb->expr()->eq('id', $qb->createNamedParameter($row['id']))) + ->execute(); + } + } + } + + private function processRow($row) { + //Get user + $user = $this->userManager->get($row['uid']); + + if ($user === null) { + return; + } + + \OC_Util::tearDownFS(); + \OC_Util::setupFS($row['uid']); + + try { + $userFolder = $this->rootFolder->getUserFolder($user->getUID()); + $userRoot = $userFolder->getParent(); + } catch (NotFoundException $e) { + return; + } + + //Get node + $nodes = $userRoot->getById($row['file_id']); + + if ($nodes === []) { + return; + } + + $node = $nodes[0]; + if ($node instanceof File) { + $this->processFile($node); + } + } + + private function processFile(File $file) { + if ($this->previewGenerator->isMimeSupported($file->getMimeType())) { + if ($this->output->getVerbosity() > OutputInterface::VERBOSITY_VERBOSE) { + $this->output->writeln('Generating previews for ' . $file->getPath()); + } + + try { + $specifications = array_merge( + array_map(function ($squareSize) { + return ['width' => $squareSize, 'height' => $squareSize, 'crop' => true]; + }, $this->sizes['square']), + array_map(function ($heightSize) { + return ['width' => -1, 'height' => $heightSize, 'crop' => false]; + }, $this->sizes['height']), + array_map(function ($widthSize) { + return ['width' => $widthSize, 'height' => -1, 'crop' => false]; + }, $this->sizes['width']) + ); + $this->previewGenerator->generatePreviews($file, $specifications); + } catch (NotFoundException $e) { + // Maybe log that previews could not be generated? + } catch (\InvalidArgumentException $e) { + $error = $e->getMessage(); + $this->output->writeln("<error>${error}</error>"); + } + } + } + +} diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Command/TimestampFormatter.php b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Command/TimestampFormatter.php new file mode 100644 index 00000000..eb0d971f --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Command/TimestampFormatter.php @@ -0,0 +1,120 @@ +<?php + +declare(strict_types=1); +/** + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling <coding@schilljs.com> + * + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +namespace OCA\PreviewGenerator\Command; + +use OCP\IConfig; +use Symfony\Component\Console\Formatter\OutputFormatterInterface; +use Symfony\Component\Console\Formatter\OutputFormatterStyleInterface; + +/** + * TODO: This was taken from the server. At some point we should have it in OCP + * and then just use that + * + * Class TimestampFormatter + * + * @package OCA\PreviewGenerator\Command + */ +class TimestampFormatter implements OutputFormatterInterface { + /** @var IConfig */ + protected $config; + + /** @var OutputFormatterInterface */ + protected $formatter; + + /** + * @param IConfig $config + * @param OutputFormatterInterface $formatter + */ + public function __construct(IConfig $config, OutputFormatterInterface $formatter) { + $this->config = $config; + $this->formatter = $formatter; + } + + /** + * Sets the decorated flag. + * + * @param bool $decorated Whether to decorate the messages or not + */ + public function setDecorated($decorated) { + $this->formatter->setDecorated($decorated); + } + + /** + * Gets the decorated flag. + * + * @return bool true if the output will decorate messages, false otherwise + */ + public function isDecorated(): bool { + return $this->formatter->isDecorated(); + } + + /** + * Sets a new style. + * + * @param string $name The style name + * @param OutputFormatterStyleInterface $style The style instance + */ + public function setStyle($name, OutputFormatterStyleInterface $style) { + $this->formatter->setStyle($name, $style); + } + + /** + * Checks if output formatter has style with specified name. + * + * @param string $name + * @return bool + */ + public function hasStyle($name): bool { + return $this->formatter->hasStyle($name); + } + + /** + * Gets style options from style with specified name. + * + * @param string $name + * @return OutputFormatterStyleInterface + * @throws \InvalidArgumentException When style isn't defined + */ + public function getStyle($name): OutputFormatterStyleInterface { + return $this->formatter->getStyle($name); + } + + /** + * Formats a message according to the given styles. + * + * @param string $message The message to style + * @return string The styled message, prepended with a timestamp using the + * log timezone and dateformat, e.g. "2015-06-23T17:24:37+02:00" + */ + public function format($message): string { + $timeZone = $this->config->getSystemValue('logtimezone', 'UTC'); + $timeZone = $timeZone !== null ? new \DateTimeZone($timeZone) : null; + + $time = new \DateTime('now', $timeZone); + $timestampInfo = $time->format($this->config->getSystemValue('logdateformat', \DateTime::ATOM)); + + return $timestampInfo . ' ' . $this->formatter->format($message); + } +} diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Listeners/PostWriteListener.php b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Listeners/PostWriteListener.php new file mode 100644 index 00000000..60576e63 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Listeners/PostWriteListener.php @@ -0,0 +1,85 @@ +<?php + +declare(strict_types=1); +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +namespace OCA\PreviewGenerator\Listeners; + +use OCP\EventDispatcher\Event; +use OCP\EventDispatcher\IEventListener; +use OCP\Files\Events\Node\NodeWrittenEvent; +use OCP\Files\Folder; +use OCP\IDBConnection; +use OCP\IUserManager; + +class PostWriteListener implements IEventListener { + + /** @var IDBConnection */ + private $connection; + + /** @var IUserManager */ + private $userManager; + + public function __construct(IDBConnection $connection, + IUserManager $userManager) { + $this->connection = $connection; + $this->userManager = $userManager; + } + + public function handle(Event $event): void { + if (!($event instanceof NodeWrittenEvent)) { + return; + } + + $node = $event->getNode(); + $absPath = ltrim($node->getPath(), '/'); + $owner = explode('/', $absPath)[0]; + + if ($node instanceof Folder || !$this->userManager->userExists($owner)) { + return; + } + + $qb = $this->connection->getQueryBuilder(); + $qb->select('id') + ->from('preview_generation') + ->where( + $qb->expr()->andX( + $qb->expr()->eq('uid', $qb->createNamedParameter($owner)), + $qb->expr()->eq('file_id', $qb->createNamedParameter($node->getId())) + ) + )->setMaxResults(1); + $cursor = $qb->execute(); + $inTable = $cursor->fetch() !== false; + $cursor->closeCursor(); + + // Don't insert if there is already such an entry + if ($inTable) { + return; + } + + $qb = $this->connection->getQueryBuilder(); + $qb->insert('preview_generation') + ->setValue('uid', $qb->createNamedParameter($owner)) + ->setValue('file_id', $qb->createNamedParameter($node->getId())); + $qb->execute(); + } +} diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Migration/Version020000Date20180823071939.php b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Migration/Version020000Date20180823071939.php new file mode 100644 index 00000000..951d53a3 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Migration/Version020000Date20180823071939.php @@ -0,0 +1,63 @@ +<?php + +declare(strict_types=1); +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCA\PreviewGenerator\Migration; + +use OCP\DB\ISchemaWrapper; +use OCP\Migration\SimpleMigrationStep; +use OCP\Migration\IOutput; + +class Version020000Date20180823071939 extends SimpleMigrationStep { + + /** + * @param IOutput $output + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param array $options + * @return null|ISchemaWrapper + */ + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { + /** @var ISchemaWrapper $schema */ + $schema = $schemaClosure(); + + if (!$schema->hasTable('preview_generation')) { + $table = $schema->createTable('preview_generation'); + $table->addColumn('id', 'integer', [ + 'autoincrement' => true, + 'notnull' => true, + 'length' => 4, + ]); + $table->addColumn('uid', 'string', [ + 'notnull' => true, + 'length' => 256, + ]); + $table->addColumn('file_id', 'integer', [ + 'notnull' => true, + 'length' => 4, + ]); + $table->setPrimaryKey(['id']); + } + return $schema; + } +} diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Migration/Version020200Date20190608205303.php b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Migration/Version020200Date20190608205303.php new file mode 100644 index 00000000..e539d530 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/Migration/Version020200Date20190608205303.php @@ -0,0 +1,53 @@ +<?php +declare(strict_types=1); +/** + * @copyright Copyleft (c) 2019, Ignacio Nunez <nacho@ownyourbits.com> + * + * @author Ignacio Nunez <nacho@ownyourbits.com> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCA\PreviewGenerator\Migration; + +use OCP\DB\ISchemaWrapper; +use OCP\Migration\SimpleMigrationStep; +use OCP\Migration\IOutput; +use OCP\DB\Types; + +class Version020200Date20190608205303 extends SimpleMigrationStep { + + /** + * @param IOutput $output + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param array $options + * @return null|ISchemaWrapper + */ + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { + /** @var ISchemaWrapper $schema */ + $schema = $schemaClosure(); + $table = $schema->getTable('preview_generation'); + + if (!$table->hasColumn('locked')) { + $table->addColumn('locked', Types::BOOLEAN, [ + 'notnull' => true, + 'default' => 0, + ]); + } + return $schema; + } +} diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/SizeHelper.php b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/SizeHelper.php new file mode 100644 index 00000000..62c68383 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/lib/SizeHelper.php @@ -0,0 +1,101 @@ +<?php + +declare(strict_types=1); +/** + * @copyright Copyright (c) 2017, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCA\PreviewGenerator; + +use OCP\IConfig; + +class SizeHelper { + public static function calculateSizes(IConfig $config): array { + /* + * First calculate the systems max sizes + */ + + $sizes = [ + 'square' => [], + 'height' => [], + 'width' => [], + ]; + + $maxW = (int)$config->getSystemValue('preview_max_x', 4096); + $maxH = (int)$config->getSystemValue('preview_max_y', 4096); + + $s = 32; + while ($s <= $maxW || $s <= $maxH) { + $sizes['square'][] = $s; + $s *= 2; + } + + $w = 32; + while ($w <= $maxW) { + $sizes['width'][] = $w; + $w *= 2; + } + + $h = 32; + while ($h <= $maxH) { + $sizes['height'][] = $h; + $h *= 2; + } + + + /* + * Now calculate the user provided max sizes + * Note that only powers of 2 matter but if users supply different + * stuff it is their own fault and we just ignore it + */ + $getCustomSizes = function (IConfig $config, $key) { + $TXT = $config->getAppValue('previewgenerator', $key, ''); + $values = []; + if ($TXT !== '') { + foreach (explode(' ', $TXT) as $value) { + if (ctype_digit($value)) { + $values[] = (int)$value; + } + } + } + + return $values; + }; + + $squares = $getCustomSizes($config, 'squareSizes'); + $widths = $getCustomSizes($config, 'widthSizes'); + $heights = $getCustomSizes($config, 'heightSizes'); + + if ($squares !== []) { + $sizes['square'] = array_intersect($sizes['square'], $squares); + } + + if ($widths !== []) { + $sizes['width'] = array_intersect($sizes['width'], $widths); + } + + if ($heights !== []) { + $sizes['height'] = array_intersect($sizes['height'], $heights); + } + + return $sizes; + } +} diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/tests/WatcherTest.php b/ncp-previewgenerator/ncp-previewgenerator-nc21/tests/WatcherTest.php new file mode 100644 index 00000000..a89bbc05 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/tests/WatcherTest.php @@ -0,0 +1,98 @@ +<?php +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +namespace OCA\PreviewGenerator\Tests; + +use OCA\PreviewGenerator\Watcher; +use OCP\Files\Node; +use OCP\IDBConnection; +use OCP\IUserManager; +use Test\TestCase; + +/** + * Class WatcherTest + * + * @package OCA\PreviewGenerator\Tests + * @group DB + */ +class WatcherTest extends TestCase { + + /** @var IDBConnection */ + private $connection; + + /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + private $userManager; + + /** @var Watcher */ + private $watcher; + + public function setUp() { + parent::setUp(); + + $this->connection = \OC::$server->getDatabaseConnection(); + $this->userManager = $this->createMock(IUserManager::class); + $this->watcher = new Watcher($this->connection, $this->userManager); + + $qb = $this->connection->getQueryBuilder(); + $qb->delete('preview_generation'); + } + + public function testPostWriteCantFindUser() { + $node = $this->createMock(Node::class); + $node->method('getPath') + ->willReturn('/foo/bar/baz'); + + $this->userManager->expects($this->once()) + ->method('userExists') + ->with('foo') + ->willReturn(false); + + $this->watcher->postWrite($node); + } + + public function testPostWrite() { + $node = $this->createMock(Node::class); + $node->method('getPath') + ->willReturn('/foo/bar/baz'); + $node->method('getId') + ->willReturn(42); + + $this->userManager->expects($this->once()) + ->method('userExists') + ->with('foo') + ->willReturn(true); + + $this->watcher->postWrite($node); + + $qb = $this->connection->getQueryBuilder(); + $qb->select('*') + ->from('preview_generation'); + $cursor = $qb->execute(); + $rows = $cursor->fetchAll(); + $cursor->closeCursor(); + + $this->assertCount(1, $rows); + $row = $rows[0]; + $this->assertSame('foo', $row['uid']); + $this->assertSame('42', $row['file_id']); + } +} diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/tests/bootstrap.php b/ncp-previewgenerator/ncp-previewgenerator-nc21/tests/bootstrap.php new file mode 100644 index 00000000..a2699765 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/tests/bootstrap.php @@ -0,0 +1,30 @@ +<?php +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +define('PHPUNIT_RUN', 1); + +require_once __DIR__.'/../../../lib/base.php'; + +\OC_App::loadApp('previewgenerator'); + +OC_Hook::clear(); diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/tests/phpunit.xml b/ncp-previewgenerator/ncp-previewgenerator-nc21/tests/phpunit.xml new file mode 100644 index 00000000..ca916756 --- /dev/null +++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/tests/phpunit.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" ?> +<phpunit bootstrap="bootstrap.php" + verbose="true" + timeoutForSmallTests="900" + timeoutForMediumTests="900" + timeoutForLargeTests="900" +> + <testsuite name='Preview generator tests'> + <directory suffix='Test.php'>.</directory> + </testsuite> + <!-- filters for code coverage --> + <filter> + <whitelist> + <directory suffix=".php">../</directory> + <exclude> + <directory suffix=".php">../tests</directory> + </exclude> + </whitelist> + </filter> + <logging> + <!-- and this is where your report will be written --> + <log type="coverage-clover" target="./clover.xml"/> + </logging> +</phpunit> @@ -188,22 +188,6 @@ RestartSec=5s WantedBy=multi-user.target EOF - cat > /usr/local/bin/nextcloud-domain.sh <<'EOF' -#!/bin/bash -# wicd service finishes before completing DHCP -while :; do - iface="$( ip r | grep "default via" | awk '{ print $5 }' | head -1 )" - ip="$( ip a show dev "$iface" | grep global | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 )" - - public_ip="$(curl icanhazip.com 2>/dev/null)" - [[ "$public_ip" != "" ]] && ncc config:system:set trusted_domains 11 --value="$public_ip" - - [[ "$ip" != "" ]] && break - sleep 3 -done -ncc config:system:set trusted_domains 1 --value=$ip -EOF - [[ "$DOCKERBUILD" != 1 ]] && systemctl enable nextcloud-domain # NEXTCLOUDPI UPDATES @@ -259,7 +243,7 @@ EOF [[ -f /.docker-image ]] || { $APTINSTALL avahi-daemon sed -i '/^127.0.1.1/d' /etc/hosts - sed -i '$a127.0.1.1 nextcloudpi' /etc/hosts + sed -i "\$a127.0.1.1 nextcloudpi $(hostname)" /etc/hosts } echo nextcloudpi > /etc/hostname diff --git a/post-inst.sh b/post-inst.sh index 4ede0120..2c07c604 100644 --- a/post-inst.sh +++ b/post-inst.sh @@ -15,6 +15,7 @@ configure() kill $( cat /run/redis/redis-server.pid ) || true [[ -f /run/crond.pid ]] && kill $( cat /run/crond.pid ) pkill -f php-fpm || true + pkill -f notify_push || true # cleanup all NCP extras source /usr/local/etc/library.sh diff --git a/tests/activation_tests.py b/tests/activation_tests.py index 3b8e5fec..99311af2 100755 --- a/tests/activation_tests.py +++ b/tests/activation_tests.py @@ -127,8 +127,10 @@ def test_activation(IP, nc_port, admin_port): test.check(False) except: test.check(True) - try: driver.close() - except: pass + try: + driver.close() + except Exception as e: + print(f"Could not close driver: {e}") # ncp-web test.new("ncp-web") diff --git a/tests/system_tests.py b/tests/system_tests.py index 4a2b2648..9c3a5ce8 100755 --- a/tests/system_tests.py +++ b/tests/system_tests.py @@ -18,6 +18,7 @@ import sys import getopt import os import signal +from urllib.request import urlopen from subprocess import run, PIPE processes_must_be_running = [ @@ -152,6 +153,21 @@ def check_files_dont_exist(files): return ret +def check_notify_push(): + "check that notify_push is installed and set up" + result = run(pre_cmd + ['ncc', 'notify_push:self-test'], stdout=PIPE, stderr=PIPE) + + print("[push ] " + tc.brown + "notify_push self-test" + tc.normal, end=' ') + if result.returncode == 0: + print(tc.green + "ok" + tc.normal) + return True + else: + print(tc.red + "error" + tc.normal) + print(result.stderr) + print(result.stdout) + return False + + def signal_handler(sig, frame): sys.exit(0) @@ -231,8 +247,9 @@ if __name__ == "__main__": install_result = check_binaries_installed(binaries_must_be_installed) files1_result = check_files_exist(files_must_exist) files2_result = check_files_dont_exist(files_must_not_exist) + notify_push_result = check_notify_push() - if running_result and install_result and files1_result and files2_result: + if running_result and install_result and files1_result and files2_result and notify_push_result: sys.exit(0) else: sys.exit(1) diff --git a/updates/1.18.0.sh b/updates/1.18.0.sh index a4f185fb..cba15a18 100644 --- a/updates/1.18.0.sh +++ b/updates/1.18.0.sh @@ -4,7 +4,7 @@ set -e ## BACKWARD FIXES ( for older images ) -source /usr/local/etc/library.sh # sets NCVER PHPVER RELEASE +source /usr/local/etc/library.sh # sets NCLATESTVER PHPVER RELEASE # all images diff --git a/updates/1.20.0.sh b/updates/1.20.0.sh index 5324364d..516e48bc 100644 --- a/updates/1.20.0.sh +++ b/updates/1.20.0.sh @@ -4,7 +4,7 @@ set -e ## BACKWARD FIXES ( for older images ) -source /usr/local/etc/library.sh # sets NCVER PHPVER RELEASE +source /usr/local/etc/library.sh # sets NCLATESTVER PHPVER RELEASE # all images diff --git a/updates/1.25.0.sh b/updates/1.25.0.sh index 3b042d16..286cebd4 100644 --- a/updates/1.25.0.sh +++ b/updates/1.25.0.sh @@ -4,7 +4,7 @@ set -e ## BACKWARD FIXES ( for older images ) -source /usr/local/etc/library.sh # sets NCVER PHPVER RELEASE +source /usr/local/etc/library.sh # sets NCLATESTVER PHPVER RELEASE # all images diff --git a/updates/1.30.0.sh b/updates/1.30.0.sh index b958c3ba..14d901c0 100644 --- a/updates/1.30.0.sh +++ b/updates/1.30.0.sh @@ -4,7 +4,7 @@ set -e ## BACKWARD FIXES ( for older images ) -source /usr/local/etc/library.sh # sets NCVER PHPVER RELEASE +source /usr/local/etc/library.sh # sets NCLATESTVER PHPVER RELEASE # all images diff --git a/updates/1.39.0.sh b/updates/1.39.0.sh index 689a0d41..7028d92a 100644 --- a/updates/1.39.0.sh +++ b/updates/1.39.0.sh @@ -4,7 +4,7 @@ set -e ## BACKWARD FIXES ( for older images ) -source /usr/local/etc/library.sh # sets NCVER PHPVER RELEASE +source /usr/local/etc/library.sh # sets NCLATESTVER PHPVER RELEASE # all images |