nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use lowerCamelCase name when getting keys

Browse Source
This commit is contained in:
Henrique Dias 2025-11-16 08:09:29 +01:00
parent e19bded986
commit 8242aff36b
No known key found for this signature in database
5 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/config_init.go
View File

@ -37,16 +37,16 @@ override the options.`,
s := &settings.Settings{
Key: generateKey(),
Signup: v.GetBool("signup"),
HideLoginButton: v.GetBool("hideloginbutton"),
CreateUserDir: v.GetBool("createuserdir"),
MinimumPasswordLength: v.GetUint("minimumpasswordlength"),
HideLoginButton: v.GetBool("hideLoginButton"),
CreateUserDir: v.GetBool("createUserDir"),
MinimumPasswordLength: v.GetUint("minimumPasswordLength"),
Shell: convertCmdStrToCmdArray(v.GetString("shell")),
AuthMethod: authMethod,
Defaults: defaults,
Branding: settings.Branding{
Name: v.GetString("branding.name"),
DisableExternal: v.GetBool("branding.disableexternal"),
DisableUsedPercentage: v.GetBool("branding.disableusedpercentage"),
DisableExternal: v.GetBool("branding.disableExternal"),
DisableUsedPercentage: v.GetBool("branding.disableUsedPercentage"),
Theme: v.GetString("branding.theme"),
Files: v.GetString("branding.files"),
},

26
cmd/root.go
View File

@ -151,17 +151,14 @@ user created with the credentials from options "username" and "password".`,
}
// build img service
workersCount := v.GetInt("imageprocessors")
workersCount := v.GetInt("imageProcessors")
if workersCount < 1 {
return errors.New("image resize workers count could not be < 1")
}
imgSvc := img.New(workersCount)
var fileCache diskcache.Interface = diskcache.NewNoOp()
cacheDir, err := cmd.Flags().GetString("cachedir")
if err != nil {
return err
}
cacheDir := v.GetString("cacheDir")
if cacheDir != "" {
if err := os.MkdirAll(cacheDir, 0700); err != nil {
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 {
return err
}
socketPerm, err := cmd.Flags().GetUint32("socketperm")
if err != nil {
return err
}
socketPerm := v.GetUint32("socketPerm")
err = os.Chmod(server.Socket, os.FileMode(socketPerm))
if err != nil {
return err
@ -333,16 +327,16 @@ func getRunParams(st *storage.Storage) (*settings.Server, error) {
server.Socket = ""
}
disableThumbnails := v.GetBool("disablethumbnails")
disableThumbnails := v.GetBool("disableThumbnails")
server.EnableThumbnails = !disableThumbnails
disablePreviewResize := v.GetBool("disablepreviewresize")
disablePreviewResize := v.GetBool("disablePreviewResize")
server.ResizePreview = !disablePreviewResize
disableTypeDetectionByHeader := v.GetBool("disabletypedetectionbyheader")
disableTypeDetectionByHeader := v.GetBool("disableTypeDetectionByHeader")
server.TypeDetectionByHeader = !disableTypeDetectionByHeader
disableExec := v.GetBool("disableexec")
disableExec := v.GetBool("disableExec")
server.EnableExec = !disableExec
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")
}
if val, set := getStringParamB("tokenexpirationtime"); set {
if val, set := getStringParamB("tokenExpirationTime"); set {
server.TokenExpirationTime = val
}
@ -395,7 +389,7 @@ func quickSetup(d pythonData) error {
Scope: ".",
Locale: "en",
SingleClick: false,
AceEditorTheme: v.GetString("defaults.aceeditortheme"),
AceEditorTheme: v.GetString("defaults.aceEditorTheme"),
Perm: users.Permissions{
Admin: false,
Execute: true,
@ -436,7 +430,7 @@ func quickSetup(d pythonData) error {
}
ser := &settings.Server{
BaseURL: v.GetString("baseurl"),
BaseURL: v.GetString("baseURL"),
Port: v.GetString("port"),
Log: v.GetString("log"),
TLSKey: v.GetString("key"),

2
cmd/users.go
View File

@ -84,7 +84,7 @@ func addUserFlags(flags *pflag.FlagSet) {
}
func getAndParseViewMode() (users.ViewMode, error) {
viewModeStr := v.GetString("viewmode")
viewModeStr := v.GetString("viewMode")
viewMode := users.ViewMode(viewModeStr)
if viewMode != users.ListViewMode && viewMode != users.MosaicViewMode {
return "", errors.New("view mode must be \"" + string(users.ListViewMode) + "\" or \"" + string(users.MosaicViewMode) + "\"")

6
cmd/users_add.go
View File

@ -35,9 +35,9 @@ var usersAddCmd = &cobra.Command{
user := &users.User{
Username: args[0],
Password: password,
LockPassword: v.GetBool("lockpassword"),
DateFormat: v.GetBool("dateformat"),
HideDotfiles: v.GetBool("hidedotfiles"),
LockPassword: v.GetBool("lockPassword"),
DateFormat: v.GetBool("dateFormat"),
HideDotfiles: v.GetBool("hideDotfiles"),
}
s.Defaults.Apply(user)

6
cmd/users_update.go
View File

@ -66,9 +66,9 @@ options you want to change.`,
user.Perm = defaults.Perm
user.Commands = defaults.Commands
user.Sorting = defaults.Sorting
user.LockPassword = v.GetBool("lockpassword")
user.DateFormat = v.GetBool("dateformat")
user.HideDotfiles = v.GetBool("hidedotfiles")
user.LockPassword = v.GetBool("lockPassword")
user.DateFormat = v.GetBool("dateFormat")
user.HideDotfiles = v.GetBool("hideDotfiles")
if newUsername != "" {
user.Username = newUsername