From 04475e5c3c8520181e6a808d0eadbd8910abc241 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Fri, 14 Oct 2022 12:07:08 +0200 Subject: [PATCH] Backend: Fix accidental change in config options and update deps Signed-off-by: Michael Mayer --- go.mod | 2 +- go.sum | 2 ++ internal/api/upload.go | 2 +- internal/config/options.go | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fa21c7595..441e9dc59 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( github.com/urfave/cli v1.22.10 go4.org v0.0.0-20201209231011-d4a079459e60 // indirect golang.org/x/crypto v0.0.0-20221012134737-56aed061732a - golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 + golang.org/x/net v0.0.0-20221014081412-f15817d10f9b gonum.org/v1/gonum v0.12.0 gopkg.in/photoprism/go-tz.v2 v2.1.1 gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index 656602a1c..ca832f730 100644 --- a/go.sum +++ b/go.sum @@ -677,6 +677,8 @@ golang.org/x/net v0.0.0-20221004154528-8021a29435af h1:wv66FM3rLZGPdxpYL+ApnDe2H golang.org/x/net v0.0.0-20221004154528-8021a29435af/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY= golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU= +golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= diff --git a/internal/api/upload.go b/internal/api/upload.go index 2cb64a1ee..cced5f960 100644 --- a/internal/api/upload.go +++ b/internal/api/upload.go @@ -51,7 +51,7 @@ func Upload(router *gin.RouterGroup) { var uploads []string - uploadDir := path.Join(conf.ImportPath(), "upload", s.RefID+token) + uploadDir := path.Join(conf.ImportPath(), UploadPath, s.RefID+token) if err = os.MkdirAll(uploadDir, os.ModePerm); err != nil { log.Errorf("upload: failed creating folder %s", clean.Log(filepath.Base(uploadDir))) diff --git a/internal/config/options.go b/internal/config/options.go index d469a4503..7f42ec8a5 100644 --- a/internal/config/options.go +++ b/internal/config/options.go @@ -56,7 +56,7 @@ type Options struct { WakeupInterval time.Duration `yaml:"WakeupInterval" json:"WakeupInterval" flag:"wakeup-interval"` AutoIndex int `yaml:"AutoIndex" json:"AutoIndex" flag:"auto-index"` AutoImport int `yaml:"AutoImport" json:"AutoImport" flag:"auto-import"` - DisableWebDAV bool `yaml:"WebDAV" json:"WebDAV" flag:"disable-webdav"` + DisableWebDAV bool `yaml:"DisableWebDAV" json:"DisableWebDAV" flag:"disable-webdav"` DisableBackups bool `yaml:"DisableBackups" json:"DisableBackups" flag:"disable-backups"` DisableSettings bool `yaml:"DisableSettings" json:"-" flag:"disable-settings"` DisablePlaces bool `yaml:"DisablePlaces" json:"DisablePlaces" flag:"disable-places"`