diff --git a/.circleci/config.yml b/.circleci/config.yml
index 32ecb8af..08eeac58 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,9 +21,17 @@ jobs:
root: .
paths:
- '*'
+ test:
+ docker:
+ - image: circleci/golang:1.14.6
+ steps:
+ - checkout
+ - run:
+ name: "Test"
+ command: go test ./...
build-go:
docker:
- - image: circleci/golang:1.14.3
+ - image: circleci/golang:1.14.6
steps:
- attach_workspace:
at: '~/project'
@@ -57,6 +65,10 @@ workflows:
filters:
tags:
only: /.*/
+ - test:
+ filters:
+ tags:
+ only: /.*/
- build-node:
filters:
tags:
@@ -68,6 +80,7 @@ workflows:
requires:
- build-node
- lint
+ - test
- release:
context: deploy
requires:
diff --git a/cmd/root.go b/cmd/root.go
index 8f23e95c..83ef240e 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -14,13 +14,16 @@ import (
"syscall"
homedir "github.com/mitchellh/go-homedir"
+ "github.com/spf13/afero"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
v "github.com/spf13/viper"
lumberjack "gopkg.in/natefinch/lumberjack.v2"
"github.com/filebrowser/filebrowser/v2/auth"
+ "github.com/filebrowser/filebrowser/v2/diskcache"
fbhttp "github.com/filebrowser/filebrowser/v2/http"
+ "github.com/filebrowser/filebrowser/v2/img"
"github.com/filebrowser/filebrowser/v2/settings"
"github.com/filebrowser/filebrowser/v2/storage"
"github.com/filebrowser/filebrowser/v2/users"
@@ -56,6 +59,10 @@ 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.String("cache-dir", "", "file cache directory (disabled if empty)")
+ 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{
@@ -103,6 +110,24 @@ 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)
+
+ var fileCache diskcache.Interface = diskcache.NewNoOp()
+ cacheDir, err := cmd.Flags().GetString("cache-dir")
+ checkErr(err)
+ if cacheDir != "" {
+ if err := os.MkdirAll(cacheDir, 0700); err != nil { //nolint:govet
+ log.Fatalf("can't make directory %s: %s", cacheDir, err)
+ }
+ fileCache = diskcache.New(afero.NewOsFs(), cacheDir)
+ }
+
server := getRunParams(cmd.Flags(), d.store)
setupLog(server.Log)
@@ -132,7 +157,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, fileCache, d.store, server)
checkErr(err)
defer listener.Close()
@@ -205,6 +230,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/diskcache/cache.go b/diskcache/cache.go
new file mode 100644
index 00000000..2a2eff3d
--- /dev/null
+++ b/diskcache/cache.go
@@ -0,0 +1,11 @@
+package diskcache
+
+import (
+ "context"
+)
+
+type Interface interface {
+ Store(ctx context.Context, key string, value []byte) error
+ Load(ctx context.Context, key string) (value []byte, exist bool, err error)
+ Delete(ctx context.Context, key string) error
+}
diff --git a/diskcache/file_cache.go b/diskcache/file_cache.go
new file mode 100644
index 00000000..419f155f
--- /dev/null
+++ b/diskcache/file_cache.go
@@ -0,0 +1,110 @@
+package diskcache
+
+import (
+ "context"
+ "crypto/sha1" //nolint:gosec
+ "encoding/hex"
+ "errors"
+ "fmt"
+ "io/ioutil"
+ "os"
+ "path/filepath"
+ "sync"
+
+ "github.com/spf13/afero"
+)
+
+type FileCache struct {
+ fs afero.Fs
+
+ // granular locks
+ scopedLocks struct {
+ sync.Mutex
+ sync.Once
+ locks map[string]sync.Locker
+ }
+}
+
+func New(fs afero.Fs, root string) *FileCache {
+ return &FileCache{
+ fs: afero.NewBasePathFs(fs, root),
+ }
+}
+
+func (f *FileCache) Store(ctx context.Context, key string, value []byte) error {
+ mu := f.getScopedLocks(key)
+ mu.Lock()
+ defer mu.Unlock()
+
+ fileName := f.getFileName(key)
+ if err := f.fs.MkdirAll(filepath.Dir(fileName), 0700); err != nil {
+ return err
+ }
+
+ if err := afero.WriteFile(f.fs, fileName, value, 0700); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (f *FileCache) Load(ctx context.Context, key string) (value []byte, exist bool, err error) {
+ r, ok, err := f.open(key)
+ if err != nil || !ok {
+ return nil, ok, err
+ }
+ defer r.Close()
+
+ value, err = ioutil.ReadAll(r)
+ if err != nil {
+ return nil, false, err
+ }
+ return value, true, nil
+}
+
+func (f *FileCache) Delete(ctx context.Context, key string) error {
+ mu := f.getScopedLocks(key)
+ mu.Lock()
+ defer mu.Unlock()
+
+ fileName := f.getFileName(key)
+ if err := f.fs.Remove(fileName); err != nil && err != os.ErrNotExist {
+ return err
+ }
+ return nil
+}
+
+func (f *FileCache) open(key string) (afero.File, bool, error) {
+ fileName := f.getFileName(key)
+ file, err := f.fs.Open(fileName)
+ if err != nil {
+ if errors.Is(err, os.ErrNotExist) {
+ return nil, false, nil
+ }
+ return nil, false, err
+ }
+
+ return file, true, nil
+}
+
+// getScopedLocks pull lock from the map if found or create a new one
+func (f *FileCache) getScopedLocks(key string) (lock sync.Locker) {
+ f.scopedLocks.Do(func() { f.scopedLocks.locks = map[string]sync.Locker{} })
+
+ f.scopedLocks.Lock()
+ lock, ok := f.scopedLocks.locks[key]
+ if !ok {
+ lock = &sync.Mutex{}
+ f.scopedLocks.locks[key] = lock
+ }
+ f.scopedLocks.Unlock()
+
+ return lock
+}
+
+func (f *FileCache) getFileName(key string) string {
+ hasher := sha1.New() //nolint:gosec
+ _, _ = hasher.Write([]byte(key))
+ hash := hex.EncodeToString(hasher.Sum(nil))
+ return fmt.Sprintf("%s/%s/%s", hash[:1], hash[1:3], hash)
+}
diff --git a/diskcache/file_cache_test.go b/diskcache/file_cache_test.go
new file mode 100644
index 00000000..fdb3d119
--- /dev/null
+++ b/diskcache/file_cache_test.go
@@ -0,0 +1,55 @@
+package diskcache
+
+import (
+ "context"
+ "path/filepath"
+ "testing"
+
+ "github.com/spf13/afero"
+ "github.com/stretchr/testify/require"
+)
+
+func TestFileCache(t *testing.T) {
+ ctx := context.Background()
+ const (
+ key = "key"
+ value = "some text"
+ newValue = "new text"
+ cacheRoot = "/cache"
+ cachedFilePath = "a/62/a62f2225bf70bfaccbc7f1ef2a397836717377de"
+ )
+
+ fs := afero.NewMemMapFs()
+ cache := New(fs, "/cache")
+
+ // store new key
+ err := cache.Store(ctx, key, []byte(value))
+ require.NoError(t, err)
+ checkValue(t, ctx, fs, filepath.Join(cacheRoot, cachedFilePath), cache, key, value)
+
+ // update existing key
+ err = cache.Store(ctx, key, []byte(newValue))
+ require.NoError(t, err)
+ checkValue(t, ctx, fs, filepath.Join(cacheRoot, cachedFilePath), cache, key, newValue)
+
+ // delete key
+ err = cache.Delete(ctx, key)
+ require.NoError(t, err)
+ exists, err := afero.Exists(fs, filepath.Join(cacheRoot, cachedFilePath))
+ require.NoError(t, err)
+ require.False(t, exists)
+}
+
+func checkValue(t *testing.T, ctx context.Context, fs afero.Fs, fileFullPath string, cache *FileCache, key, wantValue string) { //nolint:golint
+ t.Helper()
+ // check actual file content
+ b, err := afero.ReadFile(fs, fileFullPath)
+ require.NoError(t, err)
+ require.Equal(t, wantValue, string(b))
+
+ // check cache content
+ b, ok, err := cache.Load(ctx, key)
+ require.NoError(t, err)
+ require.True(t, ok)
+ require.Equal(t, wantValue, string(b))
+}
diff --git a/diskcache/noop_cache.go b/diskcache/noop_cache.go
new file mode 100644
index 00000000..65d57c21
--- /dev/null
+++ b/diskcache/noop_cache.go
@@ -0,0 +1,24 @@
+package diskcache
+
+import (
+ "context"
+)
+
+type NoOp struct {
+}
+
+func NewNoOp() *NoOp {
+ return &NoOp{}
+}
+
+func (n *NoOp) Store(ctx context.Context, key string, value []byte) error {
+ return nil
+}
+
+func (n *NoOp) Load(ctx context.Context, key string) (value []byte, exist bool, err error) {
+ return nil, false, nil
+}
+
+func (n *NoOp) Delete(ctx context.Context, key string) error {
+ return nil
+}
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..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 }}