From aa78e3ab1fcae6f618e811ba4e315a7a209f9df2 Mon Sep 17 00:00:00 2001
From: Oleg Lobanov <oleg@lobanov.me>
Date: Thu, 23 Jul 2020 12:38:03 +0200
Subject: [PATCH] feat: add param to disable img resizing

---
 cmd/root.go                                   |  8 +++++
 frontend/src/components/files/ListingItem.vue |  7 +++--
 frontend/src/utils/constants.js               |  4 ++-
 http/http.go                                  |  3 +-
 http/preview.go                               | 29 +++++++++----------
 http/static.go                                |  1 +
 settings/settings.go                          | 18 +++++++-----
 7 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/cmd/root.go b/cmd/root.go
index d65d7bf1..2cfb3373 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -59,6 +59,8 @@ func addServerFlags(flags *pflag.FlagSet) {
 	flags.String("socket", "", "socket to listen to (cannot be used with address, port, cert nor key flags)")
 	flags.StringP("baseurl", "b", "", "base url")
 	flags.Int("img-processors", 4, "image processors count")
+	flags.Bool("disable-thumbnails", false, "disable image thumbnails")
+	flags.Bool("disable-preview-resize", false, "disable resize of image previews")
 }
 
 var rootCmd = &cobra.Command{
@@ -216,6 +218,12 @@ func getRunParams(flags *pflag.FlagSet, st *storage.Storage) *settings.Server {
 		server.Socket = ""
 	}
 
+	_, disableThumbnails := getParamB(flags, "disable-thumbnails")
+	server.EnableThumbnails = !disableThumbnails
+
+	_, disablePreviewResize := getParamB(flags, "disable-preview-resize")
+	server.ResizePreview = !disablePreviewResize
+
 	return server
 }
 
diff --git a/frontend/src/components/files/ListingItem.vue b/frontend/src/components/files/ListingItem.vue
index 3103a94a..f7a5f85b 100644
--- a/frontend/src/components/files/ListingItem.vue
+++ b/frontend/src/components/files/ListingItem.vue
@@ -13,7 +13,7 @@
   :aria-label="name"
   :aria-selected="isSelected">
     <div>
-      <img v-if="type==='image'" v-lazy="thumbnailUrl">
+      <img v-if="type==='image' && isThumbsEnabled" v-lazy="thumbnailUrl">
       <i v-else class="material-icons">{{ icon }}</i>
     </div>
 
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { baseURL } from '@/utils/constants'
+import { baseURL, enableThumbs } from '@/utils/constants'
 import { mapMutations, mapGetters, mapState } from 'vuex'
 import filesize from 'filesize'
 import moment from 'moment'
@@ -76,6 +76,9 @@ export default {
     thumbnailUrl () {
       const path = this.url.replace(/^\/files\//, '')
       return `${baseURL}/api/preview/thumb/${path}?auth=${this.jwt}&inline=true`
+    },
+    isThumbsEnabled () {
+      return enableThumbs
     }
   },
   methods: {
diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js
index ad23cc98..49a06dc6 100644
--- a/frontend/src/utils/constants.js
+++ b/frontend/src/utils/constants.js
@@ -11,6 +11,7 @@ const noAuth = window.FileBrowser.NoAuth
 const authMethod = window.FileBrowser.AuthMethod
 const loginPage = window.FileBrowser.LoginPage
 const theme = window.FileBrowser.Theme
+const enableThumbs = window.FileBrowser.EnableThumbs
 
 export {
   name,
@@ -24,5 +25,6 @@ export {
   noAuth,
   authMethod,
   loginPage,
-  theme
+  theme,
+  enableThumbs
 }
diff --git a/http/http.go b/http/http.go
index adf0758f..e3548cfe 100644
--- a/http/http.go
+++ b/http/http.go
@@ -59,7 +59,8 @@ func NewHandler(imgSvc ImgService, store *storage.Storage, server *settings.Serv
 	api.Handle("/settings", monkey(settingsPutHandler, "")).Methods("PUT")
 
 	api.PathPrefix("/raw").Handler(monkey(rawHandler, "/api/raw")).Methods("GET")
-	api.PathPrefix("/preview/{size}/{path:.*}").Handler(monkey(previewHandler(imgSvc), "/api/preview")).Methods("GET")
+	api.PathPrefix("/preview/{size}/{path:.*}").
+		Handler(monkey(previewHandler(imgSvc, server.EnableThumbnails, server.ResizePreview), "/api/preview")).Methods("GET")
 	api.PathPrefix("/command").Handler(monkey(commandsHandler, "/api/command")).Methods("GET")
 	api.PathPrefix("/search").Handler(monkey(searchHandler, "/api/search")).Methods("GET")
 
diff --git a/http/preview.go b/http/preview.go
index 8385b626..c06ae436 100644
--- a/http/preview.go
+++ b/http/preview.go
@@ -24,7 +24,7 @@ type ImgService interface {
 	Resize(ctx context.Context, file afero.File, width, height int, out io.Writer, options ...img.Option) error
 }
 
-func previewHandler(imgSvc ImgService) handleFunc {
+func previewHandler(imgSvc ImgService, enableThumbnails, resizePreview bool) handleFunc {
 	return withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
 		if !d.user.Perm.Download {
 			return http.StatusAccepted, nil
@@ -50,14 +50,15 @@ func previewHandler(imgSvc ImgService) handleFunc {
 
 		switch file.Type {
 		case "image":
-			return handleImagePreview(imgSvc, w, r, file, size)
+			return handleImagePreview(imgSvc, w, r, file, size, enableThumbnails, resizePreview)
 		default:
 			return http.StatusNotImplemented, fmt.Errorf("can't create preview for %s type", file.Type)
 		}
 	})
 }
 
-func handleImagePreview(imgSvc ImgService, w http.ResponseWriter, r *http.Request, file *files.FileInfo, size string) (int, error) {
+func handleImagePreview(imgSvc ImgService, w http.ResponseWriter, r *http.Request,
+	file *files.FileInfo, size string, enableThumbnails, resizePreview bool) (int, error) {
 	format, err := imgSvc.FormatFromExtension(file.Extension)
 	if err != nil {
 		// Unsupported extensions directly return the raw data
@@ -73,30 +74,26 @@ func handleImagePreview(imgSvc ImgService, w http.ResponseWriter, r *http.Reques
 	}
 	defer fd.Close()
 
-	if format == img.FormatGif && size == sizeBig {
-		if _, err := rawFileHandler(w, r, file); err != nil {
-			return errToStatus(err), err
-		}
-		return 0, nil
-	}
-
 	var (
 		width   int
 		height  int
 		options []img.Option
 	)
 
-	switch size {
-	case sizeBig:
+	switch {
+	case size == sizeBig && resizePreview && format != img.FormatGif:
 		width = 1080
 		height = 1080
-		options = append(options, img.WithHighPriority())
-	case sizeThumb:
+		options = append(options, img.WithMode(img.ResizeModeFit), img.WithQuality(img.QualityMedium))
+	case size == sizeThumb && enableThumbnails:
 		width = 128
 		height = 128
-		options = append(options, img.WithMode(img.ResizeModeFill), img.WithQuality(img.QualityLow))
+		options = append(options, img.WithMode(img.ResizeModeFill), img.WithQuality(img.QualityLow), img.WithFormat(img.FormatJpeg))
 	default:
-		return http.StatusBadRequest, fmt.Errorf("unsupported preview size %s", size)
+		if _, err := rawFileHandler(w, r, file); err != nil {
+			return errToStatus(err), err
+		}
+		return 0, nil
 	}
 
 	if err := imgSvc.Resize(r.Context(), fd, width, height, w, options...); err != nil {
diff --git a/http/static.go b/http/static.go
index d97559b6..117095c9 100644
--- a/http/static.go
+++ b/http/static.go
@@ -39,6 +39,7 @@ func handleWithStaticData(w http.ResponseWriter, _ *http.Request, d *data, box *
 		"CSS":             false,
 		"ReCaptcha":       false,
 		"Theme":           d.settings.Branding.Theme,
+		"EnableThumbs":    d.server.EnableThumbnails,
 	}
 
 	if d.settings.Branding.Files != "" {
diff --git a/settings/settings.go b/settings/settings.go
index 104d9f30..c6dbb0f9 100644
--- a/settings/settings.go
+++ b/settings/settings.go
@@ -30,14 +30,16 @@ func (s *Settings) GetRules() []rules.Rule {
 
 // Server specific settings.
 type Server struct {
-	Root    string `json:"root"`
-	BaseURL string `json:"baseURL"`
-	Socket  string `json:"socket"`
-	TLSKey  string `json:"tlsKey"`
-	TLSCert string `json:"tlsCert"`
-	Port    string `json:"port"`
-	Address string `json:"address"`
-	Log     string `json:"log"`
+	Root             string `json:"root"`
+	BaseURL          string `json:"baseURL"`
+	Socket           string `json:"socket"`
+	TLSKey           string `json:"tlsKey"`
+	TLSCert          string `json:"tlsCert"`
+	Port             string `json:"port"`
+	Address          string `json:"address"`
+	Log              string `json:"log"`
+	EnableThumbnails bool   `json:"enableThumbnails"`
+	ResizePreview    bool   `json:"resizePreview"`
 }
 
 // Clean cleans any variables that might need cleaning.