@@ -99,7 +97,8 @@ export default {
components: { Item },
data: function () {
return {
- showLimit: 50
+ showLimit: 50,
+ dragCounter: 0
}
},
computed: {
@@ -171,6 +170,8 @@ export default {
window.addEventListener('resize', this.resizeEvent)
window.addEventListener('scroll', this.scrollEvent)
document.addEventListener('dragover', this.preventDefault)
+ document.addEventListener('dragenter', this.dragEnter)
+ document.addEventListener('dragleave', this.dragLeave)
document.addEventListener('drop', this.drop)
},
beforeDestroy () {
@@ -179,6 +180,8 @@ export default {
window.removeEventListener('resize', this.resizeEvent)
window.removeEventListener('scroll', this.scrollEvent)
document.removeEventListener('dragover', this.preventDefault)
+ document.removeEventListener('dragenter', this.dragEnter)
+ document.removeEventListener('dragleave', this.dragLeave)
document.removeEventListener('drop', this.drop)
},
methods: {
@@ -326,6 +329,8 @@ export default {
}
},
dragEnter () {
+ this.dragCounter++
+
// When the user starts dragging an item, put every
// file on the listing with 50% opacity.
let items = document.getElementsByClassName('item')
@@ -334,11 +339,16 @@ export default {
file.style.opacity = 0.5
})
},
- dragEnd () {
- this.resetOpacity()
+ dragLeave () {
+ this.dragCounter--
+
+ if (this.dragCounter == 0) {
+ this.resetOpacity()
+ }
},
drop: async function (event) {
event.preventDefault()
+ this.dragCounter = 0
this.resetOpacity()
let dt = event.dataTransfer
From f228fa55408824618e9f0879da67c86d22b0d324 Mon Sep 17 00:00:00 2001
From: Ramires Viana <59319979+ramiresviana@users.noreply.github.com>
Date: Tue, 21 Jul 2020 17:41:52 +0000
Subject: [PATCH 0039/1158] fix: conflict handling on upload button
---
frontend/src/components/files/Listing.vue | 3 ++-
frontend/src/components/prompts/Upload.vue | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/frontend/src/components/files/Listing.vue b/frontend/src/components/files/Listing.vue
index 1d2bf9e8..96e93670 100644
--- a/frontend/src/components/files/Listing.vue
+++ b/frontend/src/components/files/Listing.vue
@@ -418,12 +418,13 @@ export default {
confirm: (event) => {
event.preventDefault()
this.$store.commit('closeHovers')
- this.handleFiles(files, path, true)
+ upload.handleFiles(files, path, true)
}
})
return
}
+
upload.handleFiles(files, path)
},
resetOpacity () {
diff --git a/frontend/src/components/prompts/Upload.vue b/frontend/src/components/prompts/Upload.vue
index 3202ef2c..d2d67a76 100644
--- a/frontend/src/components/prompts/Upload.vue
+++ b/frontend/src/components/prompts/Upload.vue
@@ -27,9 +27,11 @@ export default {
name: 'upload',
methods: {
uploadFile: function () {
+ document.getElementById('upload-input').value = ''
document.getElementById('upload-input').click()
},
uploadFolder: function () {
+ document.getElementById('upload-folder-input').value = ''
document.getElementById('upload-folder-input').click()
}
}
From 94ef59602fb50fc21b1164feda90a3b9aeb5e972 Mon Sep 17 00:00:00 2001
From: Oleg Lobanov
Date: Thu, 23 Jul 2020 02:41:19 +0200
Subject: [PATCH 0040/1158] feat: limit image resize workers
---
cmd/root.go | 13 ++-
go.mod | 1 +
go.sum | 2 +
http/http.go | 4 +-
http/preview.go | 115 +++++++++++---------
img/service.go | 172 +++++++++++++++++++++++++++++
img/service_enum.go | 259 ++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 510 insertions(+), 56 deletions(-)
create mode 100644 img/service.go
create mode 100644 img/service_enum.go
diff --git a/cmd/root.go b/cmd/root.go
index 8f23e95c..d65d7bf1 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -13,6 +13,8 @@ import (
"strings"
"syscall"
+ "github.com/filebrowser/filebrowser/v2/img"
+
homedir "github.com/mitchellh/go-homedir"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
@@ -56,6 +58,7 @@ func addServerFlags(flags *pflag.FlagSet) {
flags.StringP("root", "r", ".", "root to prepend to relative paths")
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")
}
var rootCmd = &cobra.Command{
@@ -103,6 +106,14 @@ user created with the credentials from options "username" and "password".`,
quickSetup(cmd.Flags(), d)
}
+ // build img service
+ workersCount, err := cmd.Flags().GetInt("img-processors")
+ checkErr(err)
+ if workersCount < 1 {
+ log.Fatal("Image resize workers count could not be < 1")
+ }
+ imgSvc := img.New(workersCount)
+
server := getRunParams(cmd.Flags(), d.store)
setupLog(server.Log)
@@ -132,7 +143,7 @@ user created with the credentials from options "username" and "password".`,
signal.Notify(sigc, os.Interrupt, syscall.SIGTERM)
go cleanupHandler(listener, sigc)
- handler, err := fbhttp.NewHandler(d.store, server)
+ handler, err := fbhttp.NewHandler(imgSvc, d.store, server)
checkErr(err)
defer listener.Close()
diff --git a/go.mod b/go.mod
index 4664fe03..04242dab 100644
--- a/go.mod
+++ b/go.mod
@@ -14,6 +14,7 @@ require (
github.com/gorilla/mux v1.7.3
github.com/gorilla/websocket v1.4.1
github.com/maruel/natural v0.0.0-20180416170133-dbcb3e2e8cf1
+ github.com/marusama/semaphore/v2 v2.4.1
github.com/mholt/archiver v3.1.1+incompatible
github.com/mitchellh/go-homedir v1.1.0
github.com/nwaples/rardecode v1.0.0 // indirect
diff --git a/go.sum b/go.sum
index a9813849..36a4e5b6 100644
--- a/go.sum
+++ b/go.sum
@@ -127,6 +127,8 @@ github.com/marten-seemann/qtls v0.2.3 h1:0yWJ43C62LsZt08vuQJDK1uC1czUc3FJeCLPoNA
github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk=
github.com/maruel/natural v0.0.0-20180416170133-dbcb3e2e8cf1 h1:PEhRT94KBTY4E0KdCYmhvDGWjSFBxc68j2M6PMRix8U=
github.com/maruel/natural v0.0.0-20180416170133-dbcb3e2e8cf1/go.mod h1:wI697HNhDFM/vBruYM3ckbszQ2+DOIeH9qdBKMdf288=
+github.com/marusama/semaphore/v2 v2.4.1 h1:Y29DhhFMvreVgoqF9EtaSJAF9t2E7Sk7i5VW81sqB8I=
+github.com/marusama/semaphore/v2 v2.4.1/go.mod h1:z9nMiNUekt/LTpTUQdpp+4sJeYqUGpwMHfW0Z8V8fnQ=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/mholt/archiver v3.1.1+incompatible h1:1dCVxuqs0dJseYEhi5pl7MYPH9zDa1wBi7mF09cbNkU=
github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU=
diff --git a/http/http.go b/http/http.go
index c4b99918..adf0758f 100644
--- a/http/http.go
+++ b/http/http.go
@@ -14,7 +14,7 @@ type modifyRequest struct {
Which []string `json:"which"` // Answer to: which fields?
}
-func NewHandler(store *storage.Storage, server *settings.Server) (http.Handler, error) {
+func NewHandler(imgSvc ImgService, store *storage.Storage, server *settings.Server) (http.Handler, error) {
server.Clean()
r := mux.NewRouter()
@@ -59,7 +59,7 @@ func NewHandler(store *storage.Storage, server *settings.Server) (http.Handler,
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, "/api/preview")).Methods("GET")
+ api.PathPrefix("/preview/{size}/{path:.*}").Handler(monkey(previewHandler(imgSvc), "/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 c219dbb2..8385b626 100644
--- a/http/preview.go
+++ b/http/preview.go
@@ -1,14 +1,17 @@
package http
import (
+ "context"
+ "errors"
"fmt"
- "image"
+ "io"
"net/http"
- "github.com/disintegration/imaging"
"github.com/gorilla/mux"
+ "github.com/spf13/afero"
"github.com/filebrowser/filebrowser/v2/files"
+ "github.com/filebrowser/filebrowser/v2/img"
)
const (
@@ -16,44 +19,49 @@ const (
sizeBig = "big"
)
-type imageProcessor func(src image.Image) (image.Image, error)
+type ImgService interface {
+ FormatFromExtension(ext string) (img.Format, error)
+ Resize(ctx context.Context, file afero.File, width, height int, out io.Writer, options ...img.Option) 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 {
- return http.StatusNotImplemented, nil
- }
+func previewHandler(imgSvc ImgService) handleFunc {
+ return 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 {
+ 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,
+ 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(imgSvc, w, r, file, size)
+ default:
+ return http.StatusNotImplemented, fmt.Errorf("can't create preview for %s type", file.Type)
+ }
})
- 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) {
- format, err := imaging.FormatFromExtension(file.Extension)
+func handleImagePreview(imgSvc ImgService, w http.ResponseWriter, r *http.Request, file *files.FileInfo, size string) (int, error) {
+ format, err := imgSvc.FormatFromExtension(file.Extension)
if err != nil {
// Unsupported extensions directly return the raw data
- if err == imaging.ErrUnsupportedFormat {
+ if err == img.ErrUnsupportedFormat {
return rawFileHandler(w, r, file)
}
return errToStatus(err), err
@@ -65,37 +73,38 @@ func handleImagePreview(w http.ResponseWriter, r *http.Request, file *files.File
}
defer fd.Close()
- if format == imaging.GIF && size == sizeBig {
- if _, err := rawFileHandler(w, r, file); err != nil { //nolint: govet
+ if format == img.FormatGif && size == sizeBig {
+ if _, err := rawFileHandler(w, r, file); err != nil {
return errToStatus(err), err
}
return 0, nil
}
- var imgProcessor imageProcessor
+ var (
+ width int
+ height int
+ options []img.Option
+ )
+
switch size {
case sizeBig:
- imgProcessor = func(img image.Image) (image.Image, error) {
- return imaging.Fit(img, 1080, 1080, imaging.Lanczos), nil
- }
+ width = 1080
+ height = 1080
+ options = append(options, img.WithHighPriority())
case sizeThumb:
- imgProcessor = func(img image.Image) (image.Image, error) {
- return imaging.Thumbnail(img, 128, 128, imaging.Box), nil
- }
+ width = 128
+ height = 128
+ options = append(options, img.WithMode(img.ResizeModeFill), img.WithQuality(img.QualityLow))
default:
return http.StatusBadRequest, fmt.Errorf("unsupported preview size %s", size)
}
- 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
+ if err := imgSvc.Resize(r.Context(), fd, width, height, w, options...); err != nil {
+ switch {
+ case errors.Is(err, context.DeadlineExceeded), errors.Is(err, context.Canceled):
+ default:
+ return 0, err
+ }
}
return 0, nil
}
diff --git a/img/service.go b/img/service.go
new file mode 100644
index 00000000..dc400a2e
--- /dev/null
+++ b/img/service.go
@@ -0,0 +1,172 @@
+//go:generate go-enum --sql --marshal --file $GOFILE
+package img
+
+import (
+ "context"
+ "errors"
+ "io"
+ "path/filepath"
+
+ "github.com/disintegration/imaging"
+ "github.com/marusama/semaphore/v2"
+ "github.com/spf13/afero"
+)
+
+// ErrUnsupportedFormat means the given image format is not supported.
+var ErrUnsupportedFormat = errors.New("unsupported image format")
+
+// Service
+type Service struct {
+ lowPrioritySem semaphore.Semaphore
+ highPrioritySem semaphore.Semaphore
+}
+
+func New(workers int) *Service {
+ return &Service{
+ lowPrioritySem: semaphore.New(workers),
+ highPrioritySem: semaphore.New(workers),
+ }
+}
+
+// Format is an image file format.
+/*
+ENUM(
+jpeg
+png
+gif
+tiff
+bmp
+)
+*/
+type Format int
+
+func (x Format) toImaging() imaging.Format {
+ switch x {
+ case FormatJpeg:
+ return imaging.JPEG
+ case FormatPng:
+ return imaging.PNG
+ case FormatGif:
+ return imaging.GIF
+ case FormatTiff:
+ return imaging.TIFF
+ case FormatBmp:
+ return imaging.BMP
+ default:
+ return imaging.JPEG
+ }
+}
+
+/*
+ENUM(
+high
+medium
+low
+)
+*/
+type Quality int
+
+func (x Quality) resampleFilter() imaging.ResampleFilter {
+ switch x {
+ case QualityHigh:
+ return imaging.Lanczos
+ case QualityMedium:
+ return imaging.Box
+ case QualityLow:
+ return imaging.NearestNeighbor
+ default:
+ return imaging.Linear
+ }
+}
+
+/*
+ENUM(
+fit
+fill
+)
+*/
+type ResizeMode int
+
+func (s *Service) FormatFromExtension(ext string) (Format, error) {
+ format, err := imaging.FormatFromExtension(ext)
+ if err != nil {
+ return -1, ErrUnsupportedFormat
+ }
+ switch format {
+ case imaging.JPEG:
+ return FormatJpeg, nil
+ case imaging.PNG:
+ return FormatPng, nil
+ case imaging.GIF:
+ return FormatGif, nil
+ case imaging.TIFF:
+ return FormatTiff, nil
+ case imaging.BMP:
+ return FormatBmp, nil
+ }
+ return -1, ErrUnsupportedFormat
+}
+
+type resizeConfig struct {
+ prioritized bool
+ resizeMode ResizeMode
+ quality Quality
+}
+
+type Option func(*resizeConfig)
+
+func WithMode(mode ResizeMode) Option {
+ return func(config *resizeConfig) {
+ config.resizeMode = mode
+ }
+}
+
+func WithQuality(quality Quality) Option {
+ return func(config *resizeConfig) {
+ config.quality = quality
+ }
+}
+
+func WithHighPriority() Option {
+ return func(config *resizeConfig) {
+ config.prioritized = true
+ }
+}
+
+func (s *Service) Resize(ctx context.Context, file afero.File, width, height int, out io.Writer, options ...Option) error {
+ config := resizeConfig{
+ resizeMode: ResizeModeFit,
+ quality: QualityMedium,
+ }
+ for _, option := range options {
+ option(&config)
+ }
+
+ sem := s.lowPrioritySem
+ if config.prioritized {
+ sem = s.highPrioritySem
+ }
+
+ if err := sem.Acquire(ctx, 1); err != nil {
+ return err
+ }
+ defer sem.Release(1)
+
+ format, err := s.FormatFromExtension(filepath.Ext(file.Name()))
+ if err != nil {
+ return ErrUnsupportedFormat
+ }
+ img, err := imaging.Decode(file, imaging.AutoOrientation(true))
+ if err != nil {
+ return err
+ }
+
+ switch config.resizeMode {
+ case ResizeModeFill:
+ img = imaging.Fill(img, width, height, imaging.Center, config.quality.resampleFilter())
+ default:
+ img = imaging.Fit(img, width, height, config.quality.resampleFilter())
+ }
+
+ return imaging.Encode(out, img, format.toImaging())
+}
diff --git a/img/service_enum.go b/img/service_enum.go
new file mode 100644
index 00000000..33826438
--- /dev/null
+++ b/img/service_enum.go
@@ -0,0 +1,259 @@
+// Code generated by go-enum
+// DO NOT EDIT!
+
+package img
+
+import (
+ "database/sql/driver"
+ "fmt"
+)
+
+const (
+ // FormatJpeg is a Format of type Jpeg
+ FormatJpeg Format = iota
+ // FormatPng is a Format of type Png
+ FormatPng
+ // FormatGif is a Format of type Gif
+ FormatGif
+ // FormatTiff is a Format of type Tiff
+ FormatTiff
+ // FormatBmp is a Format of type Bmp
+ FormatBmp
+)
+
+const _FormatName = "jpegpnggiftiffbmp"
+
+var _FormatMap = map[Format]string{
+ 0: _FormatName[0:4],
+ 1: _FormatName[4:7],
+ 2: _FormatName[7:10],
+ 3: _FormatName[10:14],
+ 4: _FormatName[14:17],
+}
+
+// String implements the Stringer interface.
+func (x Format) String() string {
+ if str, ok := _FormatMap[x]; ok {
+ return str
+ }
+ return fmt.Sprintf("Format(%d)", x)
+}
+
+var _FormatValue = map[string]Format{
+ _FormatName[0:4]: 0,
+ _FormatName[4:7]: 1,
+ _FormatName[7:10]: 2,
+ _FormatName[10:14]: 3,
+ _FormatName[14:17]: 4,
+}
+
+// ParseFormat attempts to convert a string to a Format
+func ParseFormat(name string) (Format, error) {
+ if x, ok := _FormatValue[name]; ok {
+ return x, nil
+ }
+ return Format(0), fmt.Errorf("%s is not a valid Format", name)
+}
+
+// MarshalText implements the text marshaller method
+func (x Format) MarshalText() ([]byte, error) {
+ return []byte(x.String()), nil
+}
+
+// UnmarshalText implements the text unmarshaller method
+func (x *Format) UnmarshalText(text []byte) error {
+ name := string(text)
+ tmp, err := ParseFormat(name)
+ if err != nil {
+ return err
+ }
+ *x = tmp
+ return nil
+}
+
+// Scan implements the Scanner interface.
+func (x *Format) Scan(value interface{}) error {
+ var name string
+
+ switch v := value.(type) {
+ case string:
+ name = v
+ case []byte:
+ name = string(v)
+ case nil:
+ *x = Format(0)
+ return nil
+ }
+
+ tmp, err := ParseFormat(name)
+ if err != nil {
+ return err
+ }
+ *x = tmp
+ return nil
+}
+
+// Value implements the driver Valuer interface.
+func (x Format) Value() (driver.Value, error) {
+ return x.String(), nil
+}
+
+const (
+ // QualityHigh is a Quality of type High
+ QualityHigh Quality = iota
+ // QualityMedium is a Quality of type Medium
+ QualityMedium
+ // QualityLow is a Quality of type Low
+ QualityLow
+)
+
+const _QualityName = "highmediumlow"
+
+var _QualityMap = map[Quality]string{
+ 0: _QualityName[0:4],
+ 1: _QualityName[4:10],
+ 2: _QualityName[10:13],
+}
+
+// String implements the Stringer interface.
+func (x Quality) String() string {
+ if str, ok := _QualityMap[x]; ok {
+ return str
+ }
+ return fmt.Sprintf("Quality(%d)", x)
+}
+
+var _QualityValue = map[string]Quality{
+ _QualityName[0:4]: 0,
+ _QualityName[4:10]: 1,
+ _QualityName[10:13]: 2,
+}
+
+// ParseQuality attempts to convert a string to a Quality
+func ParseQuality(name string) (Quality, error) {
+ if x, ok := _QualityValue[name]; ok {
+ return x, nil
+ }
+ return Quality(0), fmt.Errorf("%s is not a valid Quality", name)
+}
+
+// MarshalText implements the text marshaller method
+func (x Quality) MarshalText() ([]byte, error) {
+ return []byte(x.String()), nil
+}
+
+// UnmarshalText implements the text unmarshaller method
+func (x *Quality) UnmarshalText(text []byte) error {
+ name := string(text)
+ tmp, err := ParseQuality(name)
+ if err != nil {
+ return err
+ }
+ *x = tmp
+ return nil
+}
+
+// Scan implements the Scanner interface.
+func (x *Quality) Scan(value interface{}) error {
+ var name string
+
+ switch v := value.(type) {
+ case string:
+ name = v
+ case []byte:
+ name = string(v)
+ case nil:
+ *x = Quality(0)
+ return nil
+ }
+
+ tmp, err := ParseQuality(name)
+ if err != nil {
+ return err
+ }
+ *x = tmp
+ return nil
+}
+
+// Value implements the driver Valuer interface.
+func (x Quality) Value() (driver.Value, error) {
+ return x.String(), nil
+}
+
+const (
+ // ResizeModeFit is a ResizeMode of type Fit
+ ResizeModeFit ResizeMode = iota
+ // ResizeModeFill is a ResizeMode of type Fill
+ ResizeModeFill
+)
+
+const _ResizeModeName = "fitfill"
+
+var _ResizeModeMap = map[ResizeMode]string{
+ 0: _ResizeModeName[0:3],
+ 1: _ResizeModeName[3:7],
+}
+
+// String implements the Stringer interface.
+func (x ResizeMode) String() string {
+ if str, ok := _ResizeModeMap[x]; ok {
+ return str
+ }
+ return fmt.Sprintf("ResizeMode(%d)", x)
+}
+
+var _ResizeModeValue = map[string]ResizeMode{
+ _ResizeModeName[0:3]: 0,
+ _ResizeModeName[3:7]: 1,
+}
+
+// ParseResizeMode attempts to convert a string to a ResizeMode
+func ParseResizeMode(name string) (ResizeMode, error) {
+ if x, ok := _ResizeModeValue[name]; ok {
+ return x, nil
+ }
+ return ResizeMode(0), fmt.Errorf("%s is not a valid ResizeMode", name)
+}
+
+// MarshalText implements the text marshaller method
+func (x ResizeMode) MarshalText() ([]byte, error) {
+ return []byte(x.String()), nil
+}
+
+// UnmarshalText implements the text unmarshaller method
+func (x *ResizeMode) UnmarshalText(text []byte) error {
+ name := string(text)
+ tmp, err := ParseResizeMode(name)
+ if err != nil {
+ return err
+ }
+ *x = tmp
+ return nil
+}
+
+// Scan implements the Scanner interface.
+func (x *ResizeMode) Scan(value interface{}) error {
+ var name string
+
+ switch v := value.(type) {
+ case string:
+ name = v
+ case []byte:
+ name = string(v)
+ case nil:
+ *x = ResizeMode(0)
+ return nil
+ }
+
+ tmp, err := ParseResizeMode(name)
+ if err != nil {
+ return err
+ }
+ *x = tmp
+ return nil
+}
+
+// Value implements the driver Valuer interface.
+func (x ResizeMode) Value() (driver.Value, error) {
+ return x.String(), nil
+}
From bc001650944ae963b12b5b2538a68de7cd0d8f82 Mon Sep 17 00:00:00 2001
From: Oleg Lobanov
Date: Thu, 23 Jul 2020 12:01:18 +0200
Subject: [PATCH 0041/1158] feat: add lazy load of image thumbnails
---
frontend/package-lock.json | 5 +++++
frontend/package.json | 1 +
frontend/src/components/files/ListingItem.vue | 4 ++--
frontend/src/utils/vue.js | 3 +++
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index eb5f4b61..1c67b00b 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -13030,6 +13030,11 @@
"resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.15.3.tgz",
"integrity": "sha512-PVNgo6yhOmacZVFjSapZ314oewwLyXHjJwAqjnaPN1GJAJd/dvsrShGzSiJuCX4Hc36G4epJvNXUwO8y7wEKew=="
},
+ "vue-lazyload": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.3.3.tgz",
+ "integrity": "sha512-uHnq0FTEeNmqnbBC2aRKlmtd9LofMZ6Q3mWvgfLa+i9vhxU8fDK+nGs9c1iVT85axSua/AUnMttIq3xPaU9G3A=="
+ },
"vue-loader": {
"version": "15.8.3",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.8.3.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index e99c0643..0aea1e0d 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -21,6 +21,7 @@
"qrcode.vue": "^1.7.0",
"vue": "^2.6.10",
"vue-i18n": "^8.15.3",
+ "vue-lazyload": "^1.3.3",
"vue-router": "^3.1.3",
"vuex": "^3.1.2",
"vuex-router-sync": "^5.0.0"
diff --git a/frontend/src/components/files/ListingItem.vue b/frontend/src/components/files/ListingItem.vue
index 9b0c5c6c..3103a94a 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">
Date: Thu, 23 Jul 2020 12:38:03 +0200
Subject: [PATCH 0042/1158] 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">
+
- ![]()
+ ![]()
{{ icon }}
@@ -213,4 +213,4 @@ export default {
}
}
}
-
+
\ No newline at end of file
diff --git a/frontend/src/utils/vue.js b/frontend/src/utils/vue.js
index b96d5816..6cfe52b9 100644
--- a/frontend/src/utils/vue.js
+++ b/frontend/src/utils/vue.js
@@ -1,8 +1,11 @@
import Vue from 'vue'
import Noty from 'noty'
+import VueLazyload from 'vue-lazyload'
import i18n from '@/i18n'
import { disableExternal } from '@/utils/constants'
+Vue.use(VueLazyload)
+
Vue.config.productionTip = true
const notyDefault = {
From aa78e3ab1fcae6f618e811ba4e315a7a209f9df2 Mon Sep 17 00:00:00 2001
From: Oleg Lobanov
- ![]()
+ ![]()
{{ icon }}
@@ -31,7 +31,7 @@
diff --git a/frontend/src/components/files/ExtendedImage.vue b/frontend/src/components/files/ExtendedImage.vue
index aeb27981..4cfe247e 100644
--- a/frontend/src/components/files/ExtendedImage.vue
+++ b/frontend/src/components/files/ExtendedImage.vue
@@ -77,6 +77,13 @@ export default {
window.removeEventListener('resize', this.onResize)
document.removeEventListener('mouseup', this.onMouseUp)
},
+ watch: {
+ src: function () {
+ this.scale = 1
+ this.setZoom()
+ this.setCenter()
+ }
+ },
methods: {
onLoad() {
let img = this.$refs.imgex
diff --git a/frontend/src/components/files/Preview.vue b/frontend/src/components/files/Preview.vue
index 519e259a..7a2ded1b 100644
--- a/frontend/src/components/files/Preview.vue
+++ b/frontend/src/components/files/Preview.vue
@@ -9,6 +9,7 @@
{{ this.name }}
{{ $t('settings.rules') }}
@@ -40,6 +40,7 @@ import Languages from './Languages' import Rules from './Rules' import Permissions from './Permissions' import Commands from './Commands' +import { enableExec } from '@/utils/constants' export default { name: 'user', @@ -53,7 +54,8 @@ export default { computed: { passwordPlaceholder () { return this.isNew ? '' : this.$t('settings.avoidChanges') - } + }, + isExecEnabled: () => enableExec }, watch: { 'user.perm.admin': function () { diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js index e4689dae..d4a8fd79 100644 --- a/frontend/src/utils/constants.js +++ b/frontend/src/utils/constants.js @@ -13,6 +13,7 @@ const loginPage = window.FileBrowser.LoginPage const theme = window.FileBrowser.Theme const enableThumbs = window.FileBrowser.EnableThumbs const resizePreview = window.FileBrowser.ResizePreview +const enableExec = window.FileBrowser.EnableExec export { name, @@ -28,5 +29,6 @@ export { loginPage, theme, enableThumbs, - resizePreview + resizePreview, + enableExec } diff --git a/frontend/src/views/Layout.vue b/frontend/src/views/Layout.vue index c5e6c2ef..85991d48 100644 --- a/frontend/src/views/Layout.vue +++ b/frontend/src/views/Layout.vue @@ -7,7 +7,7 @@{{ $t('settings.globalRules') }}
{{ $t('settings.executeOnShell') }}
-{{ $t('settings.executeOnShellDescription') }}
- +
+
{{ $t('settings.executeOnShell') }}
+{{ $t('settings.executeOnShellDescription') }}
+ +