From c28952fc9cd076b935420faa0f077619a22b88f6 Mon Sep 17 00:00:00 2001 From: Simon L Date: Wed, 8 Feb 2023 00:32:48 +0100 Subject: [PATCH] imaginary - rework some things Signed-off-by: Simon L --- Containers/nextcloud/entrypoint.sh | 15 +++++++-------- php/templates/containers.twig | 4 ++-- readme.md | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Containers/nextcloud/entrypoint.sh b/Containers/nextcloud/entrypoint.sh index 65abe55b..5520c2a1 100644 --- a/Containers/nextcloud/entrypoint.sh +++ b/Containers/nextcloud/entrypoint.sh @@ -560,15 +560,14 @@ if version_greater "$installed_version" "24.0.0.0"; then if [ "$IMAGINARY_ENABLED" = 'yes' ]; then php /var/www/html/occ config:system:set enabledPreviewProviders 0 --value="OC\\Preview\\Imaginary" php /var/www/html/occ config:system:set preview_imaginary_url --value="http://$IMAGINARY_HOST:9000" - php /var/www/html/occ config:system:set enabledPreviewProviders 20 --value="OC\\Preview\\HEIC" - php /var/www/html/occ config:system:set enabledPreviewProviders 21 --value="OC\\Preview\\TIFF" - php /var/www/html/occ config:system:set enabledPreviewProviders 22 --value="OC\\Preview\\WebP" else - php /var/www/html/occ config:system:delete enabledPreviewProviders 0 - php /var/www/html/occ config:system:delete preview_imaginary_url - php /var/www/html/occ config:system:delete enabledPreviewProviders 20 - php /var/www/html/occ config:system:delete enabledPreviewProviders 21 - php /var/www/html/occ config:system:delete enabledPreviewProviders 22 + if [ -n "$(php /var/www/html/occ config:system:get preview_imaginary_url)" ]; then + php /var/www/html/occ config:system:delete enabledPreviewProviders 0 + php /var/www/html/occ config:system:delete preview_imaginary_url + php /var/www/html/occ config:system:delete enabledPreviewProviders 20 + php /var/www/html/occ config:system:delete enabledPreviewProviders 21 + php /var/www/html/occ config:system:delete enabledPreviewProviders 22 + fi fi fi diff --git a/php/templates/containers.twig b/php/templates/containers.twig index 0a5c052e..2c5ba600 100644 --- a/php/templates/containers.twig +++ b/php/templates/containers.twig @@ -503,9 +503,9 @@
{% endif %} {% if is_imaginary_enabled == true %} -
+
{% else %} -
+
{% endif %} {% if is_talk_enabled == true %}

diff --git a/readme.md b/readme.md index 733adedb..debcc289 100644 --- a/readme.md +++ b/readme.md @@ -7,7 +7,7 @@ Included are: - High performance backend for Nextcloud Files - High performance backend for Nextcloud Talk - Backup solution (based on [BorgBackup](https://github.com/borgbackup/borg#what-is-borgbackup)) -- Imaginary (for previews of heic, tiff and webp) +- Imaginary (for previews of heic, heif, illustrator, pdf, svg, tiff and webp) - ClamAV (Antivirus backend for Nextcloud) - Fulltextsearch