Set supported NC version to 33.0.2

Author: theCalcaholic

bin/ncp/CONFIG/nc-init.sh

@@ -184,6 +184,13 @@ EOF
   fi
 
   # previews
+
+  ncc app:install previewgenerator
+  ncc app:enable previewgenerator
+  ncc config:app:set --value="64 256" previewgenerator squareSizes
+  ncc config:app:set --value="256 4096" previewgenerator fillWidthHeightSizes
+  ncc config:app:set --value="64 256 1024" previewgenerator widthSizes
+  ncc config:app:set --value="64 256 1024" previewgenerator heightSizes
   ncc config:system:set preview_max_x --value 2048
   ncc config:system:set preview_max_y --value 2048
   ncc config:system:set jpeg_quality --value 60

bin/ncp/CONFIG/nc-previews-auto.sh

@@ -8,48 +8,33 @@
 
 isactive()
 {
-  [[ -f "/etc/cron.d/nc-previews-auto" ]]
+  [[ -f "/etc/cron.hourly/ncp-previewgenerator" ]]
 }
 
 configure()
 {
+  # Disable during build
+  ! [[ -f /.ncp-image ]] || return 0
+
   [[ "$ACTIVE" != "yes" ]] && {
-    rm -f /etc/cron.d/nc-previews-auto
-    service cron restart
+    rm -f "/etc/cron.hourly/ncp-previewgenerator"
     echo "Automatic preview generation disabled"
     return 0
   }
 
-  grep -qP "^\d+$" <<<"$RUNTIME" || { echo "Invalid RUNTIME value $RUNTIME"; return 1; }
-  RUNTIME=$((RUNTIME*60))
-
-  echo "0  2  *  *  *  root  /usr/local/bin/nc-previews" >  /etc/cron.d/nc-previews-auto
-  chmod 644 /etc/cron.d/nc-previews-auto
+  ncc app:getpath previewgenerator > /dev/null || ncc app:install previewgenerator
+  is_app_enabled previewgenerator || ncc app:enable previewgenerator
+  ncc config:app:set --value="64 256" previewgenerator squareSizes
+  ncc config:app:set --value="256 4096" previewgenerator fillWidthHeightSizes
+  ncc config:app:set --value="64 256 1024" previewgenerator widthSizes
+  ncc config:app:set --value="64 256 1024" previewgenerator heightSizes
+  ncc config:app:set --value=false --type=boolean previewgenerator job_disabled
+  ncc config:app:set --value=3000 --type=integer previewgenerator job_max_execution_time
+  ncc config:app:set --value=0 --type=integer previewgenerator job_max_previews
 
-  cat > /usr/local/bin/nc-previews <<EOF
-#!/bin/bash
-echo -e "\n[ nc-previews-auto ]" >> /var/log/ncp.log
-(
-    for i in \$(seq 1 \$(nproc)); do
-      ionice -c3 nice -n20 /usr/local/bin/ncc preview:pre-generate -n -vvv &
-    done
-    wait
-) 2>&1 >>/var/log/ncp.log &
-
-PID=\$!
-[[ "$RUNTIME" != 0 ]] && {
-  for i in \$(seq 1 1 $RUNTIME); do
-    sleep 1
-    kill -0 "\$PID" &>/dev/null || break
-  done
-  pkill -f preview:pre-generate
-  pkill -f preview:generate-all
-}
-wait "\$PID"
-EOF
-chmod +x /usr/local/bin/nc-previews
 
-  service cron restart
+  install_template cron.hourly/ncp-previewgenerator /etc/cron.hourly/ncp-previewgenerator
+  chmod +x /etc/cron.hourly/ncp-previewgenerator
   echo "Automatic preview generation enabled"
   return 0
 }

bin/ncp/TOOLS/nc-previews.sh

@@ -11,22 +11,30 @@
 
 configure()
 {
+  # Disable during build
+  ! [[ -f /.ncp-image ]] || return 0
+
   pgrep -af preview:pre-generate &>/dev/null || pgrep -af preview:generate-all &>/dev/null && {
     echo "nc-previews is already running"
     return 1
   }
 
-  ncc app:getpath previewgenerator > /dev/null || ncc app:install previewgenerator
-  is_app_enabled previewgenerator || ncc app:enable previewgenerator
+  if ! [[ -f /.ncp-image ]]
+  then
+    ncc app:getpath previewgenerator > /dev/null || ncc app:install previewgenerator
+    is_app_enabled previewgenerator || ncc app:enable previewgenerator
+    ncc config:app:set --value="64 256" previewgenerator squareSizes
+    ncc config:app:set --value="256 4096" previewgenerator fillWidthHeightSizes
+    ncc config:app:set --value="64 256 1024" previewgenerator widthSizes
+    ncc config:app:set --value="64 256 1024" previewgenerator heightSizes
+    if is_app_enabled memories
+    then
+      ncc config:app:set --value="256 4096" previewgenerator coverWidthHeightSizes
+    else
+      ncc config:app:set --value="" previewgenerator coverWidthHeightSizes
+    fi
+  fi
 
-  ncc config:app:set --value="64 256" previewgenerator squareSizes
-  ncc config:app:set --value="256 4096" previewgenerator fillWidthHeightSizes
-  ! is_app_enabled memories || ncc config:app:set --value="256 4096" previewgenerator coverWidthHeightSizes
-  ncc config:app:set --value="64 256 1024" previewgenerator widthSizes
-  ncc config:app:set --value="64 256 1024" previewgenerator heightSizes
-  ncc config:app:set --value=false --type=boolean previewgenerator job_disabled
-  ncc config:app:set --value=3000 --type=integer previewgenerator job_max_execution_time
-  ncc config:app:set --value=0 --type=integer previewgenerator job_max_previews
 
   [[ "$CLEAN" == "yes" ]] && {
     if [[ "$(nc_version)" -lt 31 ]]
@@ -51,11 +59,6 @@ configure()
   done
   wait
 
-  if [[ "$BACKGROUN_JOB" == "yes" ]]
-  then
-    install_template cron.hourly/ncp-previewgenerator /etc/cron.hourly/ncp-previewgenerator
-    chmod +x /etc/cron.hourly/ncp-previewgenerator
-  fi
 }
 
 install() { :; }

etc/cron.hourly/ncp-previewgenerator

@@ -2,10 +2,15 @@
 
 cat <<'EOF'
 #!/usr/bin/env bash
-source /usr/local/etc/library.sh
 set -eu
+source /usr/local/etc/library.sh
 
-! is_app_enabled memories || ncc config:app:set --value="256 4096" previewgenerator coverWidthHeightSizes
+if is_app_enabled memories
+then
+  ncc config:app:set --value="256 4096" previewgenerator coverWidthHeightSizes
+else
+  ncc config:app:set --value="" previewgenerator coverWidthHeightSizes
+fi
 
 for _ in $(seq 1 $(nproc)); do
   ncc preview:generate-all -n -q &

etc/ncp-config.d/nc-nextcloud.cfg

@@ -9,7 +9,7 @@
     {
       "id": "VER",
       "name": "Version",
-      "value": "33.0.0"
+      "value": "33.0.2"
     },
     {
       "id": "MAXFILESIZE",

etc/ncp-config.d/nc-previews.cfg

@@ -23,12 +23,6 @@
       "name": "Path",
       "value": "",
       "suggest": "/ncp/files/Documents"
-    },
-    {
-      "id": "BACKGROUND_JOB",
-      "name": "enable background generation (cron job)",
-      "value": "no",
-      "type": "bool"
     }
   ]
 }

etc/ncp.cfg

@@ -1,5 +1,5 @@
 {
-	"nextcloud_version": "33.0.1",
+	"nextcloud_version": "33.0.2",
 	"php_version": "8.3",
 	"release": "bookworm"
 }

update.sh

@@ -154,11 +154,6 @@ rm -rf /var/www/ncp-app
 mkdir -p /var/www/ncp-app
 cp -r ncp-app/{appinfo,css,img,js,lib,templates} /var/www/ncp-app/
 
-# install ncp-previewgenerator
-rm -rf /var/www/ncp-previewgenerator
-cp -r ncp-previewgenerator /var/www/
-chown -R www-data:         /var/www/ncp-previewgenerator
-
 # copy NC app to nextcloud directory and enable it
 rm -rf /var/www/nextcloud/apps/nextcloudpi
 cp -r /var/www/ncp-app /var/www/nextcloud/apps/nextcloudpi

updates/1.57.0.sh

@@ -13,5 +13,11 @@ echo "Removing custom version of previewgenerator app ..."
 ncc app:remove previewgenerator || :;
 rm -f /var/www/nextcloud/apps/previewgenerator
 rm -rf /var/www/ncp-previewgenerator
-
-echo "INFO: You can now setup the latest version of the previewgenerator app including background generation of previews from the NCP admin UI."
+if [[ -f "/etc/cron.d/nc-previews-auto" ]]
+then
+  rm /etc/cron.d/nc-previews-auto
+  (
+    source /usr/local/bin/ncp/CONFIG/nc-previews-auto.sh
+    configure
+  )
+fi