feat: go.mod on 2

License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>

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.

auth/json.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/filebrowser/filebrowser/settings"
+	"github.com/filebrowser/filebrowser/v2/settings"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
 )
 
 // MethodJSONAuth is used to identify json auth.

auth/none.go

@@ -3,8 +3,8 @@ package auth
 import (
 	"net/http"
 
-	"github.com/filebrowser/filebrowser/settings"
+	"github.com/filebrowser/filebrowser/v2/settings"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
 )
 
 // MethodNoAuth is used to identify no auth.

auth/proxy.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/filebrowser/filebrowser/settings"
+	"github.com/filebrowser/filebrowser/v2/settings"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
-	"github.com/filebrowser/filebrowser/errors"
+	"github.com/filebrowser/filebrowser/v2/errors"
 )
 
 // MethodProxyAuth is used to identify no auth.

auth/storage.go

@@ -1,8 +1,8 @@
 package auth
 
 import (
-	"github.com/filebrowser/filebrowser/settings"
+	"github.com/filebrowser/filebrowser/v2/settings"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
 )
 
 // StorageBackend is a storage backend for auth storage.

cmd/config.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/filebrowser/filebrowser/auth"
+	"github.com/filebrowser/filebrowser/v2/auth"
-	"github.com/filebrowser/filebrowser/errors"
+	"github.com/filebrowser/filebrowser/v2/errors"
-	"github.com/filebrowser/filebrowser/settings"
+	"github.com/filebrowser/filebrowser/v2/settings"
 	"github.com/spf13/cobra"
 )
 

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"
 )
 

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"
 )

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"
 )
 

cmd/root.go

@@ -12,12 +12,12 @@ import (
 	"strconv"
 
 	"github.com/asdine/storm"
-	"github.com/filebrowser/filebrowser/auth"
+	"github.com/filebrowser/filebrowser/v2/auth"
-	"github.com/filebrowser/filebrowser/settings"
+	"github.com/filebrowser/filebrowser/v2/settings"
-	"github.com/filebrowser/filebrowser/storage"
+	"github.com/filebrowser/filebrowser/v2/storage"
-	"github.com/filebrowser/filebrowser/users"
+	"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"

cmd/users.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"text/tabwriter"
 
-	"github.com/filebrowser/filebrowser/settings"
+	"github.com/filebrowser/filebrowser/v2/settings"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )

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"
 )
 

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"
 )
 

cmd/users_update.go

@@ -1,8 +1,8 @@
 package cmd
 
 import (
-	"github.com/filebrowser/filebrowser/settings"
+	"github.com/filebrowser/filebrowser/v2/settings"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
 	"github.com/spf13/cobra"
 )
 

cmd/utils.go

@@ -5,8 +5,8 @@ import (
 	"os"
 
 	"github.com/asdine/storm"
-	"github.com/filebrowser/filebrowser/storage"
+	"github.com/filebrowser/filebrowser/v2/storage"
-	"github.com/filebrowser/filebrowser/storage/bolt"
+	"github.com/filebrowser/filebrowser/v2/storage/bolt"
 	"github.com/spf13/cobra"
 )
 

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"
 )
 

files/file.go

@@ -16,8 +16,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/filebrowser/filebrowser/errors"
+	"github.com/filebrowser/filebrowser/v2/errors"
-	"github.com/filebrowser/filebrowser/rules"
+	"github.com/filebrowser/filebrowser/v2/rules"
 	"github.com/spf13/afero"
 )
 

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

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/v2/errors"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
 )
 
 type userInfo struct {

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"
 )
 

http/data.go

@@ -5,10 +5,10 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/filebrowser/filebrowser/runner"
+	"github.com/filebrowser/filebrowser/v2/runner"
-	"github.com/filebrowser/filebrowser/settings"
+	"github.com/filebrowser/filebrowser/v2/settings"
-	"github.com/filebrowser/filebrowser/storage"
+	"github.com/filebrowser/filebrowser/v2/storage"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
 )
 
 type handleFunc func(w http.ResponseWriter, r *http.Request, d *data) (int, error)

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"
 )
 

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 {

http/raw.go

@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/filebrowser/filebrowser/files"
+	"github.com/filebrowser/filebrowser/v2/files"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
 	"github.com/hacdias/fileutils"
 	"github.com/mholt/archiver"
 )

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/v2/errors"
-	"github.com/filebrowser/filebrowser/fileutils"
+	"github.com/filebrowser/filebrowser/v2/fileutils"
 )
 
 var resourceGetHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {

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) {

http/settings.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/filebrowser/filebrowser/rules"
+	"github.com/filebrowser/filebrowser/v2/rules"
-	"github.com/filebrowser/filebrowser/settings"
+	"github.com/filebrowser/filebrowser/v2/settings"
 )
 
 type settingsData struct {

http/share.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/filebrowser/filebrowser/errors"
+	"github.com/filebrowser/filebrowser/v2/errors"
-	"github.com/filebrowser/filebrowser/share"
+	"github.com/filebrowser/filebrowser/v2/share"
 )
 
 func withPermShare(fn handleFunc) handleFunc {

http/static.go

@@ -10,9 +10,9 @@ import (
 	"strings"
 
 	"github.com/GeertJohan/go.rice"
-	"github.com/filebrowser/filebrowser/auth"
+	"github.com/filebrowser/filebrowser/v2/auth"
-	"github.com/filebrowser/filebrowser/storage"
+	"github.com/filebrowser/filebrowser/v2/storage"
-	"github.com/filebrowser/filebrowser/version"
+	"github.com/filebrowser/filebrowser/v2/version"
 )
 
 func handleWithStaticData(w http.ResponseWriter, r *http.Request, d *data, box *rice.Box, file, contentType string) (int, error) {

http/users.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/filebrowser/filebrowser/errors"
+	"github.com/filebrowser/filebrowser/v2/errors"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
 	"github.com/gorilla/mux"
 )
 

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) {

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() {

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

runner/runner.go

@@ -7,8 +7,8 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/filebrowser/filebrowser/settings"
+	"github.com/filebrowser/filebrowser/v2/settings"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
 )
 
 // Runner is a commands runner.

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"
 )
 

settings/defaults.go

@@ -1,8 +1,8 @@
 package settings
 
 import (
-	"github.com/filebrowser/filebrowser/files"
+	"github.com/filebrowser/filebrowser/v2/files"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
 )
 
 // UserDefaults is a type that holds the default values

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

settings/storage.go

@@ -3,9 +3,9 @@ package settings
 import (
 	"strings"
 
-	"github.com/filebrowser/filebrowser/errors"
+	"github.com/filebrowser/filebrowser/v2/errors"
-	"github.com/filebrowser/filebrowser/rules"
+	"github.com/filebrowser/filebrowser/v2/rules"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
 )
 
 // StorageBackend is a settings storage backend.

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.

storage/bolt/auth.go

@@ -2,9 +2,9 @@ package bolt
 
 import (
 	"github.com/asdine/storm"
-	"github.com/filebrowser/filebrowser/auth"
+	"github.com/filebrowser/filebrowser/v2/auth"
-	"github.com/filebrowser/filebrowser/errors"
+	"github.com/filebrowser/filebrowser/v2/errors"
-	"github.com/filebrowser/filebrowser/settings"
+	"github.com/filebrowser/filebrowser/v2/settings"
 )
 
 type authBackend struct {

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/v2/auth"
-	"github.com/filebrowser/filebrowser/share"
+	"github.com/filebrowser/filebrowser/v2/share"
-	"github.com/filebrowser/filebrowser/storage"
+	"github.com/filebrowser/filebrowser/v2/storage"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
 )
 
 // NewStorage creates a storage.Storage based on Bolt DB.

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 {

storage/bolt/importer/conf.go

@@ -7,12 +7,12 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/filebrowser/filebrowser/auth"
+	"github.com/filebrowser/filebrowser/v2/auth"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
 
 	"github.com/asdine/storm"
-	"github.com/filebrowser/filebrowser/settings"
+	"github.com/filebrowser/filebrowser/v2/settings"
-	"github.com/filebrowser/filebrowser/storage"
+	"github.com/filebrowser/filebrowser/v2/storage"
 	"github.com/pelletier/go-toml"
 	"gopkg.in/yaml.v2"
 )

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.

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/v2/rules"
-	"github.com/filebrowser/filebrowser/storage"
+	"github.com/filebrowser/filebrowser/v2/storage"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
 	"go.etcd.io/bbolt"
 )
 

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/v2/errors"
-	"github.com/filebrowser/filebrowser/share"
+	"github.com/filebrowser/filebrowser/v2/share"
 )
 
 type shareBackend struct {

storage/bolt/users.go

@@ -4,8 +4,8 @@ import (
 	"reflect"
 
 	"github.com/asdine/storm"
-	"github.com/filebrowser/filebrowser/errors"
+	"github.com/filebrowser/filebrowser/v2/errors"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
 )
 
 type usersBackend struct {

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 {

storage/storage.go

@@ -1,10 +1,10 @@
 package storage
 
 import (
-	"github.com/filebrowser/filebrowser/auth"
+	"github.com/filebrowser/filebrowser/v2/auth"
-	"github.com/filebrowser/filebrowser/settings"
+	"github.com/filebrowser/filebrowser/v2/settings"
-	"github.com/filebrowser/filebrowser/share"
+	"github.com/filebrowser/filebrowser/v2/share"
-	"github.com/filebrowser/filebrowser/users"
+	"github.com/filebrowser/filebrowser/v2/users"
 )
 
 // Storage is a storage powered by a Backend whih makes the neccessary

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.

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/v2/files"
-	"github.com/filebrowser/filebrowser/rules"
+	"github.com/filebrowser/filebrowser/v2/rules"
 	"github.com/spf13/afero"
 )