From 7b8b91e9de22ed4b628f6dc765d830204f29a750 Mon Sep 17 00:00:00 2001 From: liwei Date: Wed, 24 Jun 2020 09:46:24 +0800 Subject: [PATCH] fix: handle unsupported thumbnail --- http/preview.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/http/preview.go b/http/preview.go index 87ccf3d7..f63a985f 100644 --- a/http/preview.go +++ b/http/preview.go @@ -3,7 +3,6 @@ package http import ( "fmt" "image" - "io" "net/http" "net/url" @@ -50,13 +49,18 @@ var previewHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *da switch file.Type { case "image": - return handleImagePreview(w, file, size) + return handleImagePreview(w, r, file, size) default: return http.StatusNotImplemented, fmt.Errorf("can't create preview for %s type", file.Type) } }) -func handleImagePreview(w io.Writer, file *files.FileInfo, size string) (int, error) { +func handleImagePreview(w http.ResponseWriter, r *http.Request, file *files.FileInfo, size string) (int, error) { + // Unsupported extensions directly return the raw data + if file.Extension == ".ico" || file.Extension == ".svg" { + return rawFileHandler(w, r, file) + } + var imgProcessor imageProcessor switch size { case sizeBig: