fix: use lowerCamelCase name when getting keys
This commit is contained in:
parent
e19bded986
commit
8242aff36b
@ -37,16 +37,16 @@ override the options.`,
|
|||||||
s := &settings.Settings{
|
s := &settings.Settings{
|
||||||
Key: generateKey(),
|
Key: generateKey(),
|
||||||
Signup: v.GetBool("signup"),
|
Signup: v.GetBool("signup"),
|
||||||
HideLoginButton: v.GetBool("hideloginbutton"),
|
HideLoginButton: v.GetBool("hideLoginButton"),
|
||||||
CreateUserDir: v.GetBool("createuserdir"),
|
CreateUserDir: v.GetBool("createUserDir"),
|
||||||
MinimumPasswordLength: v.GetUint("minimumpasswordlength"),
|
MinimumPasswordLength: v.GetUint("minimumPasswordLength"),
|
||||||
Shell: convertCmdStrToCmdArray(v.GetString("shell")),
|
Shell: convertCmdStrToCmdArray(v.GetString("shell")),
|
||||||
AuthMethod: authMethod,
|
AuthMethod: authMethod,
|
||||||
Defaults: defaults,
|
Defaults: defaults,
|
||||||
Branding: settings.Branding{
|
Branding: settings.Branding{
|
||||||
Name: v.GetString("branding.name"),
|
Name: v.GetString("branding.name"),
|
||||||
DisableExternal: v.GetBool("branding.disableexternal"),
|
DisableExternal: v.GetBool("branding.disableExternal"),
|
||||||
DisableUsedPercentage: v.GetBool("branding.disableusedpercentage"),
|
DisableUsedPercentage: v.GetBool("branding.disableUsedPercentage"),
|
||||||
Theme: v.GetString("branding.theme"),
|
Theme: v.GetString("branding.theme"),
|
||||||
Files: v.GetString("branding.files"),
|
Files: v.GetString("branding.files"),
|
||||||
},
|
},
|
||||||
|
|||||||
26
cmd/root.go
26
cmd/root.go
@ -151,17 +151,14 @@ user created with the credentials from options "username" and "password".`,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// build img service
|
// build img service
|
||||||
workersCount := v.GetInt("imageprocessors")
|
workersCount := v.GetInt("imageProcessors")
|
||||||
if workersCount < 1 {
|
if workersCount < 1 {
|
||||||
return errors.New("image resize workers count could not be < 1")
|
return errors.New("image resize workers count could not be < 1")
|
||||||
}
|
}
|
||||||
imgSvc := img.New(workersCount)
|
imgSvc := img.New(workersCount)
|
||||||
|
|
||||||
var fileCache diskcache.Interface = diskcache.NewNoOp()
|
var fileCache diskcache.Interface = diskcache.NewNoOp()
|
||||||
cacheDir, err := cmd.Flags().GetString("cachedir")
|
cacheDir := v.GetString("cacheDir")
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if cacheDir != "" {
|
if cacheDir != "" {
|
||||||
if err := os.MkdirAll(cacheDir, 0700); err != nil {
|
if err := os.MkdirAll(cacheDir, 0700); err != nil {
|
||||||
return fmt.Errorf("can't make directory %s: %w", cacheDir, err)
|
return fmt.Errorf("can't make directory %s: %w", cacheDir, err)
|
||||||
@ -191,10 +188,7 @@ user created with the credentials from options "username" and "password".`,
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
socketPerm, err := cmd.Flags().GetUint32("socketperm")
|
socketPerm := v.GetUint32("socketPerm")
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
err = os.Chmod(server.Socket, os.FileMode(socketPerm))
|
err = os.Chmod(server.Socket, os.FileMode(socketPerm))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -333,16 +327,16 @@ func getRunParams(st *storage.Storage) (*settings.Server, error) {
|
|||||||
server.Socket = ""
|
server.Socket = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
disableThumbnails := v.GetBool("disablethumbnails")
|
disableThumbnails := v.GetBool("disableThumbnails")
|
||||||
server.EnableThumbnails = !disableThumbnails
|
server.EnableThumbnails = !disableThumbnails
|
||||||
|
|
||||||
disablePreviewResize := v.GetBool("disablepreviewresize")
|
disablePreviewResize := v.GetBool("disablePreviewResize")
|
||||||
server.ResizePreview = !disablePreviewResize
|
server.ResizePreview = !disablePreviewResize
|
||||||
|
|
||||||
disableTypeDetectionByHeader := v.GetBool("disabletypedetectionbyheader")
|
disableTypeDetectionByHeader := v.GetBool("disableTypeDetectionByHeader")
|
||||||
server.TypeDetectionByHeader = !disableTypeDetectionByHeader
|
server.TypeDetectionByHeader = !disableTypeDetectionByHeader
|
||||||
|
|
||||||
disableExec := v.GetBool("disableexec")
|
disableExec := v.GetBool("disableExec")
|
||||||
server.EnableExec = !disableExec
|
server.EnableExec = !disableExec
|
||||||
|
|
||||||
if server.EnableExec {
|
if server.EnableExec {
|
||||||
@ -352,7 +346,7 @@ func getRunParams(st *storage.Storage) (*settings.Server, error) {
|
|||||||
log.Println("WARNING: read https://github.com/filebrowser/filebrowser/issues/5199")
|
log.Println("WARNING: read https://github.com/filebrowser/filebrowser/issues/5199")
|
||||||
}
|
}
|
||||||
|
|
||||||
if val, set := getStringParamB("tokenexpirationtime"); set {
|
if val, set := getStringParamB("tokenExpirationTime"); set {
|
||||||
server.TokenExpirationTime = val
|
server.TokenExpirationTime = val
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -395,7 +389,7 @@ func quickSetup(d pythonData) error {
|
|||||||
Scope: ".",
|
Scope: ".",
|
||||||
Locale: "en",
|
Locale: "en",
|
||||||
SingleClick: false,
|
SingleClick: false,
|
||||||
AceEditorTheme: v.GetString("defaults.aceeditortheme"),
|
AceEditorTheme: v.GetString("defaults.aceEditorTheme"),
|
||||||
Perm: users.Permissions{
|
Perm: users.Permissions{
|
||||||
Admin: false,
|
Admin: false,
|
||||||
Execute: true,
|
Execute: true,
|
||||||
@ -436,7 +430,7 @@ func quickSetup(d pythonData) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ser := &settings.Server{
|
ser := &settings.Server{
|
||||||
BaseURL: v.GetString("baseurl"),
|
BaseURL: v.GetString("baseURL"),
|
||||||
Port: v.GetString("port"),
|
Port: v.GetString("port"),
|
||||||
Log: v.GetString("log"),
|
Log: v.GetString("log"),
|
||||||
TLSKey: v.GetString("key"),
|
TLSKey: v.GetString("key"),
|
||||||
|
|||||||
@ -84,7 +84,7 @@ func addUserFlags(flags *pflag.FlagSet) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func getAndParseViewMode() (users.ViewMode, error) {
|
func getAndParseViewMode() (users.ViewMode, error) {
|
||||||
viewModeStr := v.GetString("viewmode")
|
viewModeStr := v.GetString("viewMode")
|
||||||
viewMode := users.ViewMode(viewModeStr)
|
viewMode := users.ViewMode(viewModeStr)
|
||||||
if viewMode != users.ListViewMode && viewMode != users.MosaicViewMode {
|
if viewMode != users.ListViewMode && viewMode != users.MosaicViewMode {
|
||||||
return "", errors.New("view mode must be \"" + string(users.ListViewMode) + "\" or \"" + string(users.MosaicViewMode) + "\"")
|
return "", errors.New("view mode must be \"" + string(users.ListViewMode) + "\" or \"" + string(users.MosaicViewMode) + "\"")
|
||||||
|
|||||||
@ -35,9 +35,9 @@ var usersAddCmd = &cobra.Command{
|
|||||||
user := &users.User{
|
user := &users.User{
|
||||||
Username: args[0],
|
Username: args[0],
|
||||||
Password: password,
|
Password: password,
|
||||||
LockPassword: v.GetBool("lockpassword"),
|
LockPassword: v.GetBool("lockPassword"),
|
||||||
DateFormat: v.GetBool("dateformat"),
|
DateFormat: v.GetBool("dateFormat"),
|
||||||
HideDotfiles: v.GetBool("hidedotfiles"),
|
HideDotfiles: v.GetBool("hideDotfiles"),
|
||||||
}
|
}
|
||||||
|
|
||||||
s.Defaults.Apply(user)
|
s.Defaults.Apply(user)
|
||||||
|
|||||||
@ -66,9 +66,9 @@ options you want to change.`,
|
|||||||
user.Perm = defaults.Perm
|
user.Perm = defaults.Perm
|
||||||
user.Commands = defaults.Commands
|
user.Commands = defaults.Commands
|
||||||
user.Sorting = defaults.Sorting
|
user.Sorting = defaults.Sorting
|
||||||
user.LockPassword = v.GetBool("lockpassword")
|
user.LockPassword = v.GetBool("lockPassword")
|
||||||
user.DateFormat = v.GetBool("dateformat")
|
user.DateFormat = v.GetBool("dateFormat")
|
||||||
user.HideDotfiles = v.GetBool("hidedotfiles")
|
user.HideDotfiles = v.GetBool("hideDotfiles")
|
||||||
|
|
||||||
if newUsername != "" {
|
if newUsername != "" {
|
||||||
user.Username = newUsername
|
user.Username = newUsername
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user