fix(nextcloud): Imaginary widescreen image preview fix (#3401)

* fix(Nextcloud) : Fix widescreen image in imaginary * Update charts/stable/nextcloud/templates/_hpb.tpl * add all extra preview providers * disabled by default * Make sure we always have a correct numbered array * add GUI Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Co-authored-by: Stavros kois <s.kois@outlook.com>
2022-08-09 06:15:55 -04:00
parent 171b18a429
commit b02507d8a1
3 changed files with 209 additions and 1 deletions
@@ -66,6 +66,156 @@ questions:
            required: true
            $ref:
              - "definitions/nodeIP"
+  - variable: imaginary
+    group: "Container Configuration"
+    label: "Preview Generation Configuration"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: preview_max_x
+          label: "Preview Max X"
+          description: "The maximum width, in pixels, of a preview."
+          schema:
+            type: int
+            required: true
+            default: 2048
+        - variable: preview_max_y
+          label: "Preview Max Y"
+          description: "The maximum height, in pixels, of a preview."
+          schema:
+            type: int
+            required: true
+            default: 2048
+        - variable: preview_max_memory
+          label: "Preview Max Memory"
+          description: "Max memory in MB for generating image previews."
+          schema:
+            type: int
+            required: true
+            default: 512
+        - variable: preview_max_filesize_image
+          label: "Preview Max Filesize Image"
+          description: "Max file size in MB for generating image previews."
+          schema:
+            type: int
+            required: true
+            default: 150
+        - variable: preview_png
+          label: "Generate previews for PNG"
+          schema:
+            type: boolean
+            default: true
+        - variable: preview_jpeg
+          label: "Generate previews for JPEG "
+          schema:
+            type: boolean
+            default: true
+        - variable: preview_gif
+          label: "Generate previews for GIF"
+          schema:
+            type: boolean
+            default: true
+        - variable: preview_bmp
+          label: "Generate previews for BMP"
+          schema:
+            type: boolean
+            default: true
+        - variable: preview_xbitmap
+          label: "Generate previews for XBitmap"
+          schema:
+            type: boolean
+            default: true
+        - variable: preview_mp3
+          label: "Generate previews for MP3"
+          schema:
+            type: boolean
+            default: true
+        - variable: preview_markdown
+          label: "Generate previews for MarkDown"
+          schema:
+            type: boolean
+            default: true
+        - variable: preview_opendoc
+          label: "Generate previews for OpenDocument"
+          schema:
+            type: boolean
+            default: true
+        - variable: preview_txt
+          label: "Generate previews for TXT"
+          schema:
+            type: boolean
+            default: true
+        - variable: preview_krita
+          label: "Generate previews for Krita"
+          schema:
+            type: boolean
+            default: true
+        - variable: preview_illustrator
+          label: "Generate previews for Illustrator"
+          schema:
+            type: boolean
+            default: false
+        - variable: preview_heic
+          label: "Generate previews for HEIC"
+          schema:
+            type: boolean
+            default: false
+        - variable: preview_movie
+          label: "Generate previews for Movie"
+          schema:
+            type: boolean
+            default: false
+        - variable: preview_msoffice2003
+          label: "Generate previews for MSOffice2003"
+          schema:
+            type: boolean
+            default: false
+        - variable: preview_msoffice2007
+          label: "Generate previews for MSOffice2007"
+          schema:
+            type: boolean
+            default: false
+        - variable: preview_msofficedoc
+          label: "Generate previews for MSOfficeDoc"
+          schema:
+            type: boolean
+            default: false
+        - variable: preview_pdf
+          label: "Generate previews for PDF"
+          schema:
+            type: boolean
+            default: false
+        - variable: preview_photoshop
+          label: "Generate previews for Photoshop"
+          schema:
+            type: boolean
+            default: false
+        - variable: preview_postscript
+          label: "Generate previews for Postscript"
+          schema:
+            type: boolean
+            default: false
+        - variable: preview_staroffice
+          label: "Generate previews for StarOffice"
+          schema:
+            type: boolean
+            default: false
+        - variable: preview_svg
+          label: "Generate previews for SVG"
+          schema:
+            type: boolean
+            default: false
+        - variable: preview_tiff
+          label: "Generate previews for TIFF"
+          schema:
+            type: boolean
+            default: false
+        - variable: preview_font
+          label: "Generate previews for Font"
+          schema:
+            type: boolean
+            default: false
 # Include{containerConfig}
 # Include{serviceRoot}
        - variable: main
@@ -73,8 +73,39 @@ command:

    {{- if .Values.imaginary.enabled }}
    echo  "Imaginary High Performance Previews enabled, enabling it on Nextcloud..."
-    php /var/www/html/occ config:system:set enabledPreviewProviders 6 --value='OC\Preview\Imaginary'
    php /var/www/html/occ config:system:set preview_imaginary_url --value='http://127.0.0.1:9090'
+    php /var/www/html/occ config:system:set preview_max_x --value='{{ .Values.imaginary.preview_max_x }}'
+    php /var/www/html/occ config:system:set preview_max_y --value='{{ .Values.imaginary.preview_max_y }}'
+    php /var/www/html/occ config:system:set preview_max_memory --value='{{ .Values.imaginary.preview_max_memory }}'
+    php /var/www/html/occ config:system:set preview_max_filesize_image --value='{{ .Values.imaginary.preview_max_filesize_image }}'
+    # Remove all preview providers and re-add only selected
+    php /var/www/html/occ config:system:delete enabledPreviewProviders
+    # Add imaginary always
+    {{ $c := 0 }} # Initialize counter
+    php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\Imaginary'{{ $c = add1 $c }}
+    {{ if .Values.imaginary.preview_png }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\PNG'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_jpeg }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\JPEG'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_gif }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\GIF'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_bmp }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\BMP'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_xbitmap }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\XBitmap'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_mp3 }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\MP3'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_markdown }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\MarkDown'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_opendoc }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\OpenDocument'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_txt }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\TXT'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_krita }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\Krita'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_illustrator }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\Illustrator'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_heic }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\HEIC'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_movie }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\Movie'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_msoffice2003 }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\MSOffice2003'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_msoffice2007 }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\MSOffice2007'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_msofficedoc }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\MSOfficeDoc'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_pdf }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\PDF'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_photoshop }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\Photoshop'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_postscript }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\Postscript'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_staroffice }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\StarOffice'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_svg }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\SVG'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_tiff }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\TIFF'{{ $c = add1 $c }}{{ end }}
+    {{ if .Values.imaginary.preview_font }}php /var/www/html/occ config:system:set enabledPreviewProviders {{ $c }} --value='OC\Preview\Font'{{ $c = add1 $c }}{{ end }}
    {{- end }}

    until $(curl --output /dev/null --silent --head --fail -H "Host: test.fakedomain.dns" http://127.0.0.1:7867/push/test/cookie); do
@@ -399,6 +399,33 @@ hpb:

 imaginary:
  enabled: true
+  preview_max_x: 2048
+  preview_max_y: 2048
+  preview_max_memory: 512
+  preview_max_filesize_image: 150
+  preview_png: true
+  preview_jpeg: true
+  preview_gif: true
+  preview_bmp: true
+  preview_xbitmap: true
+  preview_mp3: true
+  preview_markdown: true
+  preview_opendoc: true
+  preview_txt: true
+  preview_krita: true
+  preview_illustrator: false
+  preview_heic: false
+  preview_movie: false
+  preview_msoffice2003: false
+  preview_msoffice2007: false
+  preview_msofficedoc: false
+  preview_pdf: false
+  preview_photoshop: false
+  preview_postscript: false
+  preview_staroffice: false
+  preview_svg: false
+  preview_tiff: false
+  preview_font: false

 collabora:
  enabled: false