github
/
filebrowser
mirror of https://github.com/filebrowser/filebrowser
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: internal server error if --disable-preview-resize flag is set (closes #1510)

pull/1515/head
Oleg Lobanov 2021-08-23 10:03:11 +02:00
parent f0bc9167b1
commit 4c3099a086
No known key found for this signature in database
GPG Key ID: 7CC64E41212621B0
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
http/preview.go
View File

@ -68,10 +68,21 @@ func previewHandler(imgSvc ImgService, fileCache FileCache, enableThumbnails, re
}) })
} }
func handleImagePreview(w http.ResponseWriter, r *http.Request, imgSvc ImgService, fileCache FileCache, func handleImagePreview(
file *files.FileInfo, previewSize PreviewSize, enableThumbnails, resizePreview bool) (int, error) { w http.ResponseWriter,
format, err := imgSvc.FormatFromExtension(file.Extension) r *http.Request,
imgSvc ImgService,
fileCache FileCache,
file *files.FileInfo,
previewSize PreviewSize,
enableThumbnails, resizePreview bool,
) (int, error) {
if (previewSize == PreviewSizeBig && !resizePreview) ||
(previewSize == PreviewSizeThumb && !enableThumbnails) {
return rawFileHandler(w, r, file)
}
format, err := imgSvc.FormatFromExtension(file.Extension)
// Unsupported extensions directly return the raw data // Unsupported extensions directly return the raw data
if err == img.ErrUnsupportedFormat || format == img.FormatGif { if err == img.ErrUnsupportedFormat || format == img.FormatGif {
return rawFileHandler(w, r, file) return rawFileHandler(w, r, file)
@ -86,7 +97,7 @@ func handleImagePreview(w http.ResponseWriter, r *http.Request, imgSvc ImgServic
return errToStatus(err), err return errToStatus(err), err
} }
if !ok { if !ok {
resizedImage, err = createPreview(imgSvc, fileCache, file, previewSize, enableThumbnails, resizePreview) resizedImage, err = createPreview(imgSvc, fileCache, file, previewSize)
if err != nil { if err != nil {
return errToStatus(err), err return errToStatus(err), err
} }
@ -99,7 +110,7 @@ func handleImagePreview(w http.ResponseWriter, r *http.Request, imgSvc ImgServic
} }
func createPreview(imgSvc ImgService, fileCache FileCache, func createPreview(imgSvc ImgService, fileCache FileCache,
file *files.FileInfo, previewSize PreviewSize, enableThumbnails, resizePreview bool) ([]byte, error) { file *files.FileInfo, previewSize PreviewSize) ([]byte, error) {
fd, err := file.Fs.Open(file.Path) fd, err := file.Fs.Open(file.Path)
if err != nil { if err != nil {
return nil, err return nil, err
@ -113,11 +124,11 @@ func createPreview(imgSvc ImgService, fileCache FileCache,
) )
switch { switch {
case previewSize == PreviewSizeBig && resizePreview: case previewSize == PreviewSizeBig:
width = 1080 width = 1080
height = 1080 height = 1080
options = append(options, img.WithMode(img.ResizeModeFit), img.WithQuality(img.QualityMedium)) options = append(options, img.WithMode(img.ResizeModeFit), img.WithQuality(img.QualityMedium))
case previewSize == PreviewSizeThumb && enableThumbnails: case previewSize == PreviewSizeThumb:
width = 128 width = 128
height = 128 height = 128
options = append(options, img.WithMode(img.ResizeModeFill), img.WithQuality(img.QualityLow), img.WithFormat(img.FormatJpeg)) options = append(options, img.WithMode(img.ResizeModeFill), img.WithQuality(img.QualityLow), img.WithFormat(img.FormatJpeg))