From c903619cafe6149e32d0a55723d17404ab391704 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Sat, 5 Jan 2019 16:10:55 +0000 Subject: [PATCH] feat: go.mod on 2 License: MIT Signed-off-by: Henrique Dias --- auth/auth.go | 2 +- auth/json.go | 4 ++-- auth/none.go | 4 ++-- auth/proxy.go | 6 +++--- auth/storage.go | 4 ++-- cmd/config.go | 6 +++--- cmd/config_init.go | 2 +- cmd/config_set.go | 2 +- cmd/import.go | 2 +- cmd/root.go | 10 +++++----- cmd/users.go | 4 ++-- cmd/users_find.go | 2 +- cmd/users_new.go | 2 +- cmd/users_update.go | 4 ++-- cmd/utils.go | 4 ++-- cmd/version.go | 2 +- files/file.go | 4 ++-- go.mod | 2 +- http/auth.go | 4 ++-- http/commands.go | 2 +- http/data.go | 8 ++++---- http/http.go | 2 +- http/public.go | 2 +- http/raw.go | 4 ++-- http/resource.go | 6 +++--- http/search.go | 2 +- http/settings.go | 4 ++-- http/share.go | 4 ++-- http/static.go | 6 +++--- http/users.go | 4 ++-- http/utils.go | 2 +- main.go | 3 ++- runner/parser.go | 2 +- runner/runner.go | 4 ++-- search/search.go | 2 +- settings/defaults.go | 4 ++-- settings/settings.go | 2 +- settings/storage.go | 6 +++--- share/storage.go | 2 +- storage/bolt/auth.go | 6 +++--- storage/bolt/bolt.go | 10 +++++----- storage/bolt/config.go | 2 +- storage/bolt/importer/conf.go | 8 ++++---- storage/bolt/importer/importer.go | 2 +- storage/bolt/importer/users.go | 6 +++--- storage/bolt/share.go | 4 ++-- storage/bolt/users.go | 4 ++-- storage/bolt/utils.go | 2 +- storage/storage.go | 8 ++++---- users/storage.go | 2 +- users/users.go | 6 +++--- 51 files changed, 101 insertions(+), 100 deletions(-) diff --git a/auth/auth.go b/auth/auth.go index be6e768b..bcde03d7 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -3,7 +3,7 @@ package auth import ( "net/http" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/users" ) // Auther is the authentication interface. diff --git a/auth/json.go b/auth/json.go index 6df0e80e..ecf067a2 100644 --- a/auth/json.go +++ b/auth/json.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "github.com/filebrowser/filebrowser/settings" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/settings" + "github.com/filebrowser/filebrowser/v2/users" ) // MethodJSONAuth is used to identify json auth. diff --git a/auth/none.go b/auth/none.go index 28f8754c..0d3e2293 100644 --- a/auth/none.go +++ b/auth/none.go @@ -3,8 +3,8 @@ package auth import ( "net/http" - "github.com/filebrowser/filebrowser/settings" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/settings" + "github.com/filebrowser/filebrowser/v2/users" ) // MethodNoAuth is used to identify no auth. diff --git a/auth/proxy.go b/auth/proxy.go index 58f96863..ff0e062a 100644 --- a/auth/proxy.go +++ b/auth/proxy.go @@ -4,9 +4,9 @@ import ( "net/http" "os" - "github.com/filebrowser/filebrowser/settings" - "github.com/filebrowser/filebrowser/users" - "github.com/filebrowser/filebrowser/errors" + "github.com/filebrowser/filebrowser/v2/settings" + "github.com/filebrowser/filebrowser/v2/users" + "github.com/filebrowser/filebrowser/v2/errors" ) // MethodProxyAuth is used to identify no auth. diff --git a/auth/storage.go b/auth/storage.go index 496a1eef..b5bd5e83 100644 --- a/auth/storage.go +++ b/auth/storage.go @@ -1,8 +1,8 @@ package auth import ( - "github.com/filebrowser/filebrowser/settings" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/settings" + "github.com/filebrowser/filebrowser/v2/users" ) // StorageBackend is a storage backend for auth storage. diff --git a/cmd/config.go b/cmd/config.go index 9d23e973..e03fb354 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -8,9 +8,9 @@ import ( "strings" "text/tabwriter" - "github.com/filebrowser/filebrowser/auth" - "github.com/filebrowser/filebrowser/errors" - "github.com/filebrowser/filebrowser/settings" + "github.com/filebrowser/filebrowser/v2/auth" + "github.com/filebrowser/filebrowser/v2/errors" + "github.com/filebrowser/filebrowser/v2/settings" "github.com/spf13/cobra" ) diff --git a/cmd/config_init.go b/cmd/config_init.go index fa237ef5..cec455a0 100644 --- a/cmd/config_init.go +++ b/cmd/config_init.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/asdine/storm" - "github.com/filebrowser/filebrowser/settings" + "github.com/filebrowser/filebrowser/v2/settings" "github.com/spf13/cobra" ) diff --git a/cmd/config_set.go b/cmd/config_set.go index 4bbeefe9..b2d4658a 100644 --- a/cmd/config_set.go +++ b/cmd/config_set.go @@ -3,7 +3,7 @@ package cmd import ( "strings" - "github.com/filebrowser/filebrowser/auth" + "github.com/filebrowser/filebrowser/v2/auth" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/import.go b/cmd/import.go index 285af273..b90b3449 100644 --- a/cmd/import.go +++ b/cmd/import.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/filebrowser/filebrowser/storage/bolt/importer" + "github.com/filebrowser/filebrowser/v2/storage/bolt/importer" "github.com/spf13/cobra" ) diff --git a/cmd/root.go b/cmd/root.go index 22cf6689..9444dc4c 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -12,12 +12,12 @@ import ( "strconv" "github.com/asdine/storm" - "github.com/filebrowser/filebrowser/auth" - "github.com/filebrowser/filebrowser/settings" - "github.com/filebrowser/filebrowser/storage" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/auth" + "github.com/filebrowser/filebrowser/v2/settings" + "github.com/filebrowser/filebrowser/v2/storage" + "github.com/filebrowser/filebrowser/v2/users" - fbhttp "github.com/filebrowser/filebrowser/http" + fbhttp "github.com/filebrowser/filebrowser/v2/http" "github.com/spf13/cobra" "github.com/spf13/pflag" lumberjack "gopkg.in/natefinch/lumberjack.v2" diff --git a/cmd/users.go b/cmd/users.go index f4700301..e497e82b 100644 --- a/cmd/users.go +++ b/cmd/users.go @@ -6,8 +6,8 @@ import ( "os" "text/tabwriter" - "github.com/filebrowser/filebrowser/settings" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/settings" + "github.com/filebrowser/filebrowser/v2/users" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/users_find.go b/cmd/users_find.go index 02713881..9fdd92b6 100644 --- a/cmd/users_find.go +++ b/cmd/users_find.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/users" "github.com/spf13/cobra" ) diff --git a/cmd/users_new.go b/cmd/users_new.go index 467df194..47480d65 100644 --- a/cmd/users_new.go +++ b/cmd/users_new.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/users" "github.com/spf13/cobra" ) diff --git a/cmd/users_update.go b/cmd/users_update.go index 996dffad..ebeef419 100644 --- a/cmd/users_update.go +++ b/cmd/users_update.go @@ -1,8 +1,8 @@ package cmd import ( - "github.com/filebrowser/filebrowser/settings" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/settings" + "github.com/filebrowser/filebrowser/v2/users" "github.com/spf13/cobra" ) diff --git a/cmd/utils.go b/cmd/utils.go index 15112fef..e943c2a7 100644 --- a/cmd/utils.go +++ b/cmd/utils.go @@ -5,8 +5,8 @@ import ( "os" "github.com/asdine/storm" - "github.com/filebrowser/filebrowser/storage" - "github.com/filebrowser/filebrowser/storage/bolt" + "github.com/filebrowser/filebrowser/v2/storage" + "github.com/filebrowser/filebrowser/v2/storage/bolt" "github.com/spf13/cobra" ) diff --git a/cmd/version.go b/cmd/version.go index c60ef7e9..b23b928f 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/filebrowser/filebrowser/version" + "github.com/filebrowser/filebrowser/v2/version" "github.com/spf13/cobra" ) diff --git a/files/file.go b/files/file.go index 6dadead3..b50dc929 100644 --- a/files/file.go +++ b/files/file.go @@ -16,8 +16,8 @@ import ( "strings" "time" - "github.com/filebrowser/filebrowser/errors" - "github.com/filebrowser/filebrowser/rules" + "github.com/filebrowser/filebrowser/v2/errors" + "github.com/filebrowser/filebrowser/v2/rules" "github.com/spf13/afero" ) diff --git a/go.mod b/go.mod index 9341d944..08b1a00c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/filebrowser/filebrowser +module github.com/filebrowser/filebrowser/v2 require ( github.com/BurntSushi/toml v0.3.1 // indirect diff --git a/http/auth.go b/http/auth.go index e702a85e..9ea0a889 100644 --- a/http/auth.go +++ b/http/auth.go @@ -9,8 +9,8 @@ import ( "github.com/dgrijalva/jwt-go" "github.com/dgrijalva/jwt-go/request" - "github.com/filebrowser/filebrowser/errors" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/errors" + "github.com/filebrowser/filebrowser/v2/users" ) type userInfo struct { diff --git a/http/commands.go b/http/commands.go index 4e9add25..f6371b7d 100644 --- a/http/commands.go +++ b/http/commands.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/filebrowser/filebrowser/runner" + "github.com/filebrowser/filebrowser/v2/runner" "github.com/gorilla/websocket" ) diff --git a/http/data.go b/http/data.go index 235a1dd5..d891c280 100644 --- a/http/data.go +++ b/http/data.go @@ -5,10 +5,10 @@ import ( "net/http" "strconv" - "github.com/filebrowser/filebrowser/runner" - "github.com/filebrowser/filebrowser/settings" - "github.com/filebrowser/filebrowser/storage" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/runner" + "github.com/filebrowser/filebrowser/v2/settings" + "github.com/filebrowser/filebrowser/v2/storage" + "github.com/filebrowser/filebrowser/v2/users" ) type handleFunc func(w http.ResponseWriter, r *http.Request, d *data) (int, error) diff --git a/http/http.go b/http/http.go index 6384ff67..7978805c 100644 --- a/http/http.go +++ b/http/http.go @@ -3,7 +3,7 @@ package http import ( "net/http" - "github.com/filebrowser/filebrowser/storage" + "github.com/filebrowser/filebrowser/v2/storage" "github.com/gorilla/mux" ) diff --git a/http/public.go b/http/public.go index a3319bca..656e3698 100644 --- a/http/public.go +++ b/http/public.go @@ -3,7 +3,7 @@ package http import ( "net/http" - "github.com/filebrowser/filebrowser/files" + "github.com/filebrowser/filebrowser/v2/files" ) var withHashFile = func(fn handleFunc) handleFunc { diff --git a/http/raw.go b/http/raw.go index cbabda1b..19433387 100644 --- a/http/raw.go +++ b/http/raw.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/filebrowser/filebrowser/files" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/files" + "github.com/filebrowser/filebrowser/v2/users" "github.com/hacdias/fileutils" "github.com/mholt/archiver" ) diff --git a/http/resource.go b/http/resource.go index afefc42e..99135d49 100644 --- a/http/resource.go +++ b/http/resource.go @@ -9,10 +9,10 @@ import ( "os" "strings" - "github.com/filebrowser/filebrowser/files" + "github.com/filebrowser/filebrowser/v2/files" - "github.com/filebrowser/filebrowser/errors" - "github.com/filebrowser/filebrowser/fileutils" + "github.com/filebrowser/filebrowser/v2/errors" + "github.com/filebrowser/filebrowser/v2/fileutils" ) var resourceGetHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) { diff --git a/http/search.go b/http/search.go index 58d9ddd8..1c78b781 100644 --- a/http/search.go +++ b/http/search.go @@ -4,7 +4,7 @@ import ( "net/http" "os" - "github.com/filebrowser/filebrowser/search" + "github.com/filebrowser/filebrowser/v2/search" ) var searchHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) { diff --git a/http/settings.go b/http/settings.go index 4200f0c1..6a75b930 100644 --- a/http/settings.go +++ b/http/settings.go @@ -4,8 +4,8 @@ import ( "encoding/json" "net/http" - "github.com/filebrowser/filebrowser/rules" - "github.com/filebrowser/filebrowser/settings" + "github.com/filebrowser/filebrowser/v2/rules" + "github.com/filebrowser/filebrowser/v2/settings" ) type settingsData struct { diff --git a/http/share.go b/http/share.go index ae018762..9c17dda6 100644 --- a/http/share.go +++ b/http/share.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/filebrowser/filebrowser/errors" - "github.com/filebrowser/filebrowser/share" + "github.com/filebrowser/filebrowser/v2/errors" + "github.com/filebrowser/filebrowser/v2/share" ) func withPermShare(fn handleFunc) handleFunc { diff --git a/http/static.go b/http/static.go index 06a41b6d..0ee8a170 100644 --- a/http/static.go +++ b/http/static.go @@ -10,9 +10,9 @@ import ( "strings" "github.com/GeertJohan/go.rice" - "github.com/filebrowser/filebrowser/auth" - "github.com/filebrowser/filebrowser/storage" - "github.com/filebrowser/filebrowser/version" + "github.com/filebrowser/filebrowser/v2/auth" + "github.com/filebrowser/filebrowser/v2/storage" + "github.com/filebrowser/filebrowser/v2/version" ) func handleWithStaticData(w http.ResponseWriter, r *http.Request, d *data, box *rice.Box, file, contentType string) (int, error) { diff --git a/http/users.go b/http/users.go index dc38490d..545b2536 100644 --- a/http/users.go +++ b/http/users.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/filebrowser/filebrowser/errors" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/errors" + "github.com/filebrowser/filebrowser/v2/users" "github.com/gorilla/mux" ) diff --git a/http/utils.go b/http/utils.go index 07f04c03..1d872a53 100644 --- a/http/utils.go +++ b/http/utils.go @@ -5,7 +5,7 @@ import ( "net/http" "os" - "github.com/filebrowser/filebrowser/errors" + "github.com/filebrowser/filebrowser/v2/errors" ) func renderJSON(w http.ResponseWriter, r *http.Request, data interface{}) (int, error) { diff --git a/main.go b/main.go index 40756bad..1d562df3 100644 --- a/main.go +++ b/main.go @@ -1,9 +1,10 @@ +//go:generate cd http && rice embed-go package main import ( "runtime" - "github.com/filebrowser/filebrowser/cmd" + "github.com/filebrowser/filebrowser/v2/cmd" ) func main() { diff --git a/runner/parser.go b/runner/parser.go index 3477b98c..0ff4f856 100644 --- a/runner/parser.go +++ b/runner/parser.go @@ -4,7 +4,7 @@ import ( "os/exec" "github.com/mholt/caddy" - "github.com/filebrowser/filebrowser/settings" + "github.com/filebrowser/filebrowser/v2/settings" ) // ParseCommand parses the command taking in account if the current diff --git a/runner/runner.go b/runner/runner.go index bb06c527..d484b0cf 100644 --- a/runner/runner.go +++ b/runner/runner.go @@ -7,8 +7,8 @@ import ( "os/exec" "strings" - "github.com/filebrowser/filebrowser/settings" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/settings" + "github.com/filebrowser/filebrowser/v2/users" ) // Runner is a commands runner. diff --git a/search/search.go b/search/search.go index c158ffbe..ce85fa24 100644 --- a/search/search.go +++ b/search/search.go @@ -4,7 +4,7 @@ import ( "os" "strings" - "github.com/filebrowser/filebrowser/rules" + "github.com/filebrowser/filebrowser/v2/rules" "github.com/spf13/afero" ) diff --git a/settings/defaults.go b/settings/defaults.go index 0b6bc03d..b0829655 100644 --- a/settings/defaults.go +++ b/settings/defaults.go @@ -1,8 +1,8 @@ package settings import ( - "github.com/filebrowser/filebrowser/files" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/files" + "github.com/filebrowser/filebrowser/v2/users" ) // UserDefaults is a type that holds the default values diff --git a/settings/settings.go b/settings/settings.go index 8fe757d8..11991a66 100644 --- a/settings/settings.go +++ b/settings/settings.go @@ -1,6 +1,6 @@ package settings -import "github.com/filebrowser/filebrowser/rules" +import "github.com/filebrowser/filebrowser/v2/rules" // AuthMethod describes an authentication method. type AuthMethod string diff --git a/settings/storage.go b/settings/storage.go index 98b0eaeb..940fbf28 100644 --- a/settings/storage.go +++ b/settings/storage.go @@ -3,9 +3,9 @@ package settings import ( "strings" - "github.com/filebrowser/filebrowser/errors" - "github.com/filebrowser/filebrowser/rules" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/errors" + "github.com/filebrowser/filebrowser/v2/rules" + "github.com/filebrowser/filebrowser/v2/users" ) // StorageBackend is a settings storage backend. diff --git a/share/storage.go b/share/storage.go index 563d5673..6f317001 100644 --- a/share/storage.go +++ b/share/storage.go @@ -3,7 +3,7 @@ package share import ( "time" - "github.com/filebrowser/filebrowser/errors" + "github.com/filebrowser/filebrowser/v2/errors" ) // StorageBackend is the interface to implement for a share storage. diff --git a/storage/bolt/auth.go b/storage/bolt/auth.go index 280d06f7..3bf7ae00 100644 --- a/storage/bolt/auth.go +++ b/storage/bolt/auth.go @@ -2,9 +2,9 @@ package bolt import ( "github.com/asdine/storm" - "github.com/filebrowser/filebrowser/auth" - "github.com/filebrowser/filebrowser/errors" - "github.com/filebrowser/filebrowser/settings" + "github.com/filebrowser/filebrowser/v2/auth" + "github.com/filebrowser/filebrowser/v2/errors" + "github.com/filebrowser/filebrowser/v2/settings" ) type authBackend struct { diff --git a/storage/bolt/bolt.go b/storage/bolt/bolt.go index f6366d7e..be500823 100644 --- a/storage/bolt/bolt.go +++ b/storage/bolt/bolt.go @@ -1,12 +1,12 @@ package bolt import ( - "github.com/filebrowser/filebrowser/settings" + "github.com/filebrowser/filebrowser/v2/settings" "github.com/asdine/storm" - "github.com/filebrowser/filebrowser/auth" - "github.com/filebrowser/filebrowser/share" - "github.com/filebrowser/filebrowser/storage" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/auth" + "github.com/filebrowser/filebrowser/v2/share" + "github.com/filebrowser/filebrowser/v2/storage" + "github.com/filebrowser/filebrowser/v2/users" ) // NewStorage creates a storage.Storage based on Bolt DB. diff --git a/storage/bolt/config.go b/storage/bolt/config.go index 37b81cab..0d5f09ef 100644 --- a/storage/bolt/config.go +++ b/storage/bolt/config.go @@ -2,7 +2,7 @@ package bolt import ( "github.com/asdine/storm" - "github.com/filebrowser/filebrowser/settings" + "github.com/filebrowser/filebrowser/v2/settings" ) type settingsBackend struct { diff --git a/storage/bolt/importer/conf.go b/storage/bolt/importer/conf.go index c9391165..efd98df7 100644 --- a/storage/bolt/importer/conf.go +++ b/storage/bolt/importer/conf.go @@ -7,12 +7,12 @@ import ( "os" "path/filepath" - "github.com/filebrowser/filebrowser/auth" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/auth" + "github.com/filebrowser/filebrowser/v2/users" "github.com/asdine/storm" - "github.com/filebrowser/filebrowser/settings" - "github.com/filebrowser/filebrowser/storage" + "github.com/filebrowser/filebrowser/v2/settings" + "github.com/filebrowser/filebrowser/v2/storage" "github.com/pelletier/go-toml" "gopkg.in/yaml.v2" ) diff --git a/storage/bolt/importer/importer.go b/storage/bolt/importer/importer.go index e06a6100..374d0ada 100644 --- a/storage/bolt/importer/importer.go +++ b/storage/bolt/importer/importer.go @@ -2,7 +2,7 @@ package importer import ( "github.com/asdine/storm" - "github.com/filebrowser/filebrowser/storage/bolt" + "github.com/filebrowser/filebrowser/v2/storage/bolt" ) // Import imports an old configuration to a newer database. diff --git a/storage/bolt/importer/users.go b/storage/bolt/importer/users.go index 677f2cee..660403b4 100644 --- a/storage/bolt/importer/users.go +++ b/storage/bolt/importer/users.go @@ -6,9 +6,9 @@ import ( "path/filepath" "github.com/asdine/storm" - "github.com/filebrowser/filebrowser/rules" - "github.com/filebrowser/filebrowser/storage" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/rules" + "github.com/filebrowser/filebrowser/v2/storage" + "github.com/filebrowser/filebrowser/v2/users" "go.etcd.io/bbolt" ) diff --git a/storage/bolt/share.go b/storage/bolt/share.go index f3196034..1e6420e1 100644 --- a/storage/bolt/share.go +++ b/storage/bolt/share.go @@ -3,8 +3,8 @@ package bolt import ( "github.com/asdine/storm" "github.com/asdine/storm/q" - "github.com/filebrowser/filebrowser/errors" - "github.com/filebrowser/filebrowser/share" + "github.com/filebrowser/filebrowser/v2/errors" + "github.com/filebrowser/filebrowser/v2/share" ) type shareBackend struct { diff --git a/storage/bolt/users.go b/storage/bolt/users.go index cced8c89..0ffa7164 100644 --- a/storage/bolt/users.go +++ b/storage/bolt/users.go @@ -4,8 +4,8 @@ import ( "reflect" "github.com/asdine/storm" - "github.com/filebrowser/filebrowser/errors" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/errors" + "github.com/filebrowser/filebrowser/v2/users" ) type usersBackend struct { diff --git a/storage/bolt/utils.go b/storage/bolt/utils.go index bf68c45c..f34237f9 100644 --- a/storage/bolt/utils.go +++ b/storage/bolt/utils.go @@ -2,7 +2,7 @@ package bolt import ( "github.com/asdine/storm" - "github.com/filebrowser/filebrowser/errors" + "github.com/filebrowser/filebrowser/v2/errors" ) func get(db *storm.DB, name string, to interface{}) error { diff --git a/storage/storage.go b/storage/storage.go index 6924d1f7..8f222616 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -1,10 +1,10 @@ package storage import ( - "github.com/filebrowser/filebrowser/auth" - "github.com/filebrowser/filebrowser/settings" - "github.com/filebrowser/filebrowser/share" - "github.com/filebrowser/filebrowser/users" + "github.com/filebrowser/filebrowser/v2/auth" + "github.com/filebrowser/filebrowser/v2/settings" + "github.com/filebrowser/filebrowser/v2/share" + "github.com/filebrowser/filebrowser/v2/users" ) // Storage is a storage powered by a Backend whih makes the neccessary diff --git a/users/storage.go b/users/storage.go index 5f6031f7..1366b968 100644 --- a/users/storage.go +++ b/users/storage.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/filebrowser/filebrowser/errors" + "github.com/filebrowser/filebrowser/v2/errors" ) // StorageBackend is the interface to implement for a users storage. diff --git a/users/users.go b/users/users.go index 0527009b..8d530048 100644 --- a/users/users.go +++ b/users/users.go @@ -1,12 +1,12 @@ package users import ( - "github.com/filebrowser/filebrowser/errors" + "github.com/filebrowser/filebrowser/v2/errors" "path/filepath" "regexp" - "github.com/filebrowser/filebrowser/files" - "github.com/filebrowser/filebrowser/rules" + "github.com/filebrowser/filebrowser/v2/files" + "github.com/filebrowser/filebrowser/v2/rules" "github.com/spf13/afero" )