Support thumbnail image view #980
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| package http | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "image" | ||
| "net/http" | ||
|
|
||
| "github.com/disintegration/imaging" | ||
| "github.com/gorilla/mux" | ||
|
|
||
| "github.com/filebrowser/filebrowser/v2/files" | ||
| ) | ||
|
|
||
| const ( | ||
| sizeThumb = "thumb" | ||
| sizeBig = "big" | ||
| ) | ||
|
|
||
| type imageProcessor func(src image.Image) (image.Image, error) | ||
|
|
||
| var previewHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) { | ||
| if !d.user.Perm.Download { | ||
| return http.StatusAccepted, nil | ||
| } | ||
| vars := mux.Vars(r) | ||
| size := vars["size"] | ||
| if size != sizeBig && size != sizeThumb { | ||
o1egl marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return http.StatusNotImplemented, nil | ||
| } | ||
|
|
||
| file, err := files.NewFileInfo(files.FileOptions{ | ||
| Fs: d.user.Fs, | ||
| Path: "/" + vars["path"], | ||
| Modify: d.user.Perm.Modify, | ||
| Expand: true, | ||
| Checker: d, | ||
| }) | ||
| if err != nil { | ||
| return errToStatus(err), err | ||
| } | ||
|
|
||
| setContentDisposition(w, r, file) | ||
|
|
||
| switch file.Type { | ||
| case "image": | ||
| return handleImagePreview(w, r, file, size) | ||
| default: | ||
| return http.StatusNotImplemented, fmt.Errorf("can't create preview for %s type", file.Type) | ||
| } | ||
| }) | ||
|
|
||
| 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: | ||
| imgProcessor = func(img image.Image) (image.Image, error) { | ||
| return imaging.Fit(img, 1080, 1080, imaging.Lanczos), nil | ||
| } | ||
| case sizeThumb: | ||
| imgProcessor = func(img image.Image) (image.Image, error) { | ||
| return imaging.Thumbnail(img, 128, 128, imaging.Box), nil | ||
| } | ||
| default: | ||
| return http.StatusBadRequest, fmt.Errorf("unsupported preview size %s", size) | ||
| } | ||
|
|
||
| fd, err := file.Fs.Open(file.Path) | ||
| if err != nil { | ||
| return errToStatus(err), err | ||
| } | ||
| defer fd.Close() | ||
| format, err := imaging.FormatFromExtension(file.Extension) | ||
| if err != nil { | ||
| return http.StatusNotImplemented, err | ||
| } | ||
| img, err := imaging.Decode(fd, imaging.AutoOrientation(true)) | ||
| if err != nil { | ||
| return errToStatus(err), err | ||
| } | ||
| img, err = imgProcessor(img) | ||
| if err != nil { | ||
| return errToStatus(err), err | ||
| } | ||
| if imaging.Encode(w, img, format) != nil { | ||
| return errToStatus(err), err | ||
| } | ||
| return 0, nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.