lint: lint the code
License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>pull/721/head
parent
c4bef0d616
commit
b7fdcc3ee9
|
@ -111,7 +111,7 @@ func generateMarkdown(cmd *cobra.Command, w io.Writer) {
|
|||
checkErr(err)
|
||||
}
|
||||
|
||||
func generateFlagsTable(fs *pflag.FlagSet, buf *bytes.Buffer) {
|
||||
func generateFlagsTable(fs *pflag.FlagSet, buf io.StringWriter) {
|
||||
buf.WriteString("| Name | Shorthand | Usage |\n")
|
||||
buf.WriteString("|------|-----------|-------|\n")
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package cmd
|
||||
|
||||
import (
|
||||
"github.com/filebrowser/filebrowser/v2/settings"
|
||||
"github.com/filebrowser/filebrowser/v2/users"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
@ -40,7 +39,7 @@ var usersAddCmd = &cobra.Command{
|
|||
s2, err := d.store.Settings.Get()
|
||||
checkErr(err)
|
||||
|
||||
userHome, err := settings.CreateUserDir(user.Username, user.Scope, servSettings.Root, s2)
|
||||
userHome, err := s2.MakeUserDir(user.Username, user.Scope, servSettings.Root)
|
||||
checkErr(err)
|
||||
user.Scope = userHome
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@ package http
|
|||
|
||||
import (
|
||||
"encoding/json"
|
||||
"github.com/filebrowser/filebrowser/v2/settings"
|
||||
"log"
|
||||
"net/http"
|
||||
"sort"
|
||||
|
@ -121,7 +120,7 @@ var userPostHandler = withAdmin(func(w http.ResponseWriter, r *http.Request, d *
|
|||
return http.StatusInternalServerError, err
|
||||
}
|
||||
|
||||
userHome,err := settings.CreateUserDir(req.Data.Username, req.Data.Scope, d.server.Root, d.settings)
|
||||
userHome, err := d.settings.MakeUserDir(req.Data.Username, req.Data.Scope, d.server.Root)
|
||||
if err != nil {
|
||||
log.Printf("create user: failed to mkdir user home dir: [%s]", userHome)
|
||||
return http.StatusInternalServerError, err
|
||||
|
|
|
@ -2,11 +2,12 @@ package settings
|
|||
|
||||
import (
|
||||
"errors"
|
||||
"github.com/spf13/afero"
|
||||
"log"
|
||||
"os"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"github.com/spf13/afero"
|
||||
)
|
||||
|
||||
var (
|
||||
|
@ -15,7 +16,8 @@ var (
|
|||
dashes = regexp.MustCompile(`[\-]+`)
|
||||
)
|
||||
|
||||
func CreateUserDir(username, userScope, serverRoot string, settings *Settings) (string, error) {
|
||||
// MakeUserDir makes the user directory according to settings.
|
||||
func (settings *Settings) MakeUserDir(username, userScope, serverRoot string) (string, error) {
|
||||
var err error
|
||||
userScope = strings.TrimSpace(userScope)
|
||||
if userScope == "" || userScope == "./" {
|
||||
|
@ -56,10 +58,9 @@ func CreateUserDir(username, userScope, serverRoot string, settings *Settings) (
|
|||
} else {
|
||||
log.Printf("create user: mkdir user home dir: [%s] successfully.", userHome)
|
||||
}
|
||||
return userHome,err
|
||||
return userHome, err
|
||||
}
|
||||
|
||||
|
||||
func cleanUsername(s string) string {
|
||||
|
||||
// Remove any trailing space to avoid ending on -
|
||||
|
|
Loading…
Reference in New Issue