github
/
filebrowser
mirror of https://github.com/filebrowser/filebrowser
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor: rename mustGet* functions to get*

pull/5286/head
Henrique Dias 2025-07-22 08:19:00 +02:00
parent 3959bbe3e6
commit a30872e26b
No known key found for this signature in database
13 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cmds_ls.go
View File

@ -19,7 +19,7 @@ var cmdsLsCmd = &cobra.Command{
if err != nil { if err != nil {
return err return err
} }
evt, err := mustGetString(cmd.Flags(), "event") evt, err := getString(cmd.Flags(), "event")
if err != nil { if err != nil {
return err return err
} }

12
cmd/config.go
View File

@ -56,7 +56,7 @@ func addConfigFlags(flags *pflag.FlagSet) {
} }
func getAuthMethod(flags *pflag.FlagSet, defaults ...interface{}) (settings.AuthMethod, map[string]interface{}, error) { func getAuthMethod(flags *pflag.FlagSet, defaults ...interface{}) (settings.AuthMethod, map[string]interface{}, error) {
methodStr, err := mustGetString(flags, "auth.method") methodStr, err := getString(flags, "auth.method")
if err != nil { if err != nil {
return "", nil, err return "", nil, err
} }
@ -87,7 +87,7 @@ func getAuthMethod(flags *pflag.FlagSet, defaults ...interface{}) (settings.Auth
} }
func getProxyAuth(flags *pflag.FlagSet, defaultAuther map[string]interface{}) (auth.Auther, error) { func getProxyAuth(flags *pflag.FlagSet, defaultAuther map[string]interface{}) (auth.Auther, error) {
header, err := mustGetString(flags, "auth.header") header, err := getString(flags, "auth.header")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -109,15 +109,15 @@ func getNoAuth() auth.Auther {
func getJSONAuth(flags *pflag.FlagSet, defaultAuther map[string]interface{}) (auth.Auther, error) { func getJSONAuth(flags *pflag.FlagSet, defaultAuther map[string]interface{}) (auth.Auther, error) {
jsonAuth := &auth.JSONAuth{} jsonAuth := &auth.JSONAuth{}
host, err := mustGetString(flags, "recaptcha.host") host, err := getString(flags, "recaptcha.host")
if err != nil { if err != nil {
return nil, err return nil, err
} }
key, err := mustGetString(flags, "recaptcha.key") key, err := getString(flags, "recaptcha.key")
if err != nil { if err != nil {
return nil, err return nil, err
} }
secret, err := mustGetString(flags, "recaptcha.secret") secret, err := getString(flags, "recaptcha.secret")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -145,7 +145,7 @@ func getJSONAuth(flags *pflag.FlagSet, defaultAuther map[string]interface{}) (au
} }
func getHookAuth(flags *pflag.FlagSet, defaultAuther map[string]interface{}) (auth.Auther, error) { func getHookAuth(flags *pflag.FlagSet, defaultAuther map[string]interface{}) (auth.Auther, error) {
command, err := mustGetString(flags, "auth.command") command, err := getString(flags, "auth.command")
if err != nil { if err != nil {
return nil, err return nil, err
} }

38
cmd/config_init.go
View File

@ -36,47 +36,47 @@ override the options.`,
key := generateKey() key := generateKey()
signup, err := mustGetBool(flags, "signup") signup, err := getBool(flags, "signup")
if err != nil { if err != nil {
return err return err
} }
createUserDir, err := mustGetBool(flags, "create-user-dir") createUserDir, err := getBool(flags, "create-user-dir")
if err != nil { if err != nil {
return err return err
} }
minLength, err := mustGetUint(flags, "minimum-password-length") minLength, err := getUint(flags, "minimum-password-length")
if err != nil { if err != nil {
return err return err
} }
shell, err := mustGetString(flags, "shell") shell, err := getString(flags, "shell")
if err != nil { if err != nil {
return err return err
} }
brandingName, err := mustGetString(flags, "branding.name") brandingName, err := getString(flags, "branding.name")
if err != nil { if err != nil {
return err return err
} }
brandingDisableExternal, err := mustGetBool(flags, "branding.disableExternal") brandingDisableExternal, err := getBool(flags, "branding.disableExternal")
if err != nil { if err != nil {
return err return err
} }
brandingDisableUsedPercentage, err := mustGetBool(flags, "branding.disableUsedPercentage") brandingDisableUsedPercentage, err := getBool(flags, "branding.disableUsedPercentage")
if err != nil { if err != nil {
return err return err
} }
brandingTheme, err := mustGetString(flags, "branding.theme") brandingTheme, err := getString(flags, "branding.theme")
if err != nil { if err != nil {
return err return err
} }
brandingFiles, err := mustGetString(flags, "branding.files") brandingFiles, err := getString(flags, "branding.files")
if err != nil { if err != nil {
return err return err
} }
@ -98,52 +98,52 @@ override the options.`,
}, },
} }
s.FileMode, err = mustGetMode(flags, "file-mode") s.FileMode, err = getMode(flags, "file-mode")
if err != nil { if err != nil {
return err return err
} }
s.DirMode, err = mustGetMode(flags, "file-mode") s.DirMode, err = getMode(flags, "file-mode")
if err != nil { if err != nil {
return err return err
} }
address, err := mustGetString(flags, "address") address, err := getString(flags, "address")
if err != nil { if err != nil {
return err return err
} }
socket, err := mustGetString(flags, "socket") socket, err := getString(flags, "socket")
if err != nil { if err != nil {
return err return err
} }
root, err := mustGetString(flags, "root") root, err := getString(flags, "root")
if err != nil { if err != nil {
return err return err
} }
baseURL, err := mustGetString(flags, "baseurl") baseURL, err := getString(flags, "baseurl")
if err != nil { if err != nil {
return err return err
} }
tlsKey, err := mustGetString(flags, "key") tlsKey, err := getString(flags, "key")
if err != nil { if err != nil {
return err return err
} }
cert, err := mustGetString(flags, "cert") cert, err := getString(flags, "cert")
if err != nil { if err != nil {
return err return err
} }
port, err := mustGetString(flags, "port") port, err := getString(flags, "port")
if err != nil { if err != nil {
return err return err
} }
log, err := mustGetString(flags, "log") log, err := getString(flags, "log")
if err != nil { if err != nil {
return err return err
} }

40
cmd/config_set.go
View File

@ -35,49 +35,49 @@ you want to change. Other options will remain unchanged.`,
} }
switch flag.Name { switch flag.Name {
case "baseurl": case "baseurl":
ser.BaseURL, err = mustGetString(flags, flag.Name) ser.BaseURL, err = getString(flags, flag.Name)
case "root": case "root":
ser.Root, err = mustGetString(flags, flag.Name) ser.Root, err = getString(flags, flag.Name)
case "socket": case "socket":
ser.Socket, err = mustGetString(flags, flag.Name) ser.Socket, err = getString(flags, flag.Name)
case "cert": case "cert":
ser.TLSCert, err = mustGetString(flags, flag.Name) ser.TLSCert, err = getString(flags, flag.Name)
case "key": case "key":
ser.TLSKey, err = mustGetString(flags, flag.Name) ser.TLSKey, err = getString(flags, flag.Name)
case "address": case "address":
ser.Address, err = mustGetString(flags, flag.Name) ser.Address, err = getString(flags, flag.Name)
case "port": case "port":
ser.Port, err = mustGetString(flags, flag.Name) ser.Port, err = getString(flags, flag.Name)
case "log": case "log":
ser.Log, err = mustGetString(flags, flag.Name) ser.Log, err = getString(flags, flag.Name)
case "signup": case "signup":
set.Signup, err = mustGetBool(flags, flag.Name) set.Signup, err = getBool(flags, flag.Name)
case "auth.method": case "auth.method":
hasAuth = true hasAuth = true
case "shell": case "shell":
var shell string var shell string
shell, err = mustGetString(flags, flag.Name) shell, err = getString(flags, flag.Name)
set.Shell = convertCmdStrToCmdArray(shell) set.Shell = convertCmdStrToCmdArray(shell)
case "create-user-dir": case "create-user-dir":
set.CreateUserDir, err = mustGetBool(flags, flag.Name) set.CreateUserDir, err = getBool(flags, flag.Name)
case "minimum-password-length": case "minimum-password-length":
set.MinimumPasswordLength, err = mustGetUint(flags, flag.Name) set.MinimumPasswordLength, err = getUint(flags, flag.Name)
case "branding.name": case "branding.name":
set.Branding.Name, err = mustGetString(flags, flag.Name) set.Branding.Name, err = getString(flags, flag.Name)
case "branding.color": case "branding.color":
set.Branding.Color, err = mustGetString(flags, flag.Name) set.Branding.Color, err = getString(flags, flag.Name)
case "branding.theme": case "branding.theme":
set.Branding.Theme, err = mustGetString(flags, flag.Name) set.Branding.Theme, err = getString(flags, flag.Name)
case "branding.disableExternal": case "branding.disableExternal":
set.Branding.DisableExternal, err = mustGetBool(flags, flag.Name) set.Branding.DisableExternal, err = getBool(flags, flag.Name)
case "branding.disableUsedPercentage": case "branding.disableUsedPercentage":
set.Branding.DisableUsedPercentage, err = mustGetBool(flags, flag.Name) set.Branding.DisableUsedPercentage, err = getBool(flags, flag.Name)
case "branding.files": case "branding.files":
set.Branding.Files, err = mustGetString(flags, flag.Name) set.Branding.Files, err = getString(flags, flag.Name)
case "file-mode": case "file-mode":
set.FileMode, err = mustGetMode(flags, flag.Name) set.FileMode, err = getMode(flags, flag.Name)
case "dir-mode": case "dir-mode":
set.DirMode, err = mustGetMode(flags, flag.Name) set.DirMode, err = getMode(flags, flag.Name)
} }
}) })

2
cmd/docs.go
View File

@ -40,7 +40,7 @@ var docsCmd = &cobra.Command{
Hidden: true, Hidden: true,
Args: cobra.NoArgs, Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, _ []string) error { RunE: func(cmd *cobra.Command, _ []string) error {
dir, err := mustGetString(cmd.Flags(), "path") dir, err := getString(cmd.Flags(), "path")
if err != nil { if err != nil {
return err return err
} }

4
cmd/rules.go
View File

@ -68,11 +68,11 @@ func runRules(st *storage.Storage, cmd *cobra.Command, usersFn func(*users.User)
} }
func getUserIdentifier(flags *pflag.FlagSet) (interface{}, error) { func getUserIdentifier(flags *pflag.FlagSet) (interface{}, error) {
id, err := mustGetUint(flags, "id") id, err := getUint(flags, "id")
if err != nil { if err != nil {
return nil, err return nil, err
} }
username, err := mustGetString(flags, "username") username, err := getString(flags, "username")
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
cmd/rules_add.go
View File

@ -22,11 +22,11 @@ var rulesAddCmd = &cobra.Command{
Long: `Add a global rule or user rule.`, Long: `Add a global rule or user rule.`,
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
RunE: python(func(cmd *cobra.Command, args []string, d *pythonData) error { RunE: python(func(cmd *cobra.Command, args []string, d *pythonData) error {
allow, err := mustGetBool(cmd.Flags(), "allow") allow, err := getBool(cmd.Flags(), "allow")
if err != nil { if err != nil {
return err return err
} }
regex, err := mustGetBool(cmd.Flags(), "regex") regex, err := getBool(cmd.Flags(), "regex")
if err != nil { if err != nil {
return err return err
} }

6
cmd/upgrade.go
View File

@ -23,15 +23,15 @@ this version.`,
Args: cobra.NoArgs, Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, _ []string) error { RunE: func(cmd *cobra.Command, _ []string) error {
flags := cmd.Flags() flags := cmd.Flags()
oldDB, err := mustGetString(flags, "old.database") oldDB, err := getString(flags, "old.database")
if err != nil { if err != nil {
return err return err
} }
oldConf, err := mustGetString(flags, "old.config") oldConf, err := getString(flags, "old.config")
if err != nil { if err != nil {
return err return err
} }
db, err := mustGetString(flags, "database") db, err := getString(flags, "database")
if err != nil { if err != nil {
return err return err
} }

28
cmd/users.go
View File

@ -80,7 +80,7 @@ func addUserFlags(flags *pflag.FlagSet) {
} }
func getViewMode(flags *pflag.FlagSet) (users.ViewMode, error) { func getViewMode(flags *pflag.FlagSet) (users.ViewMode, error) {
viewModeStr, err := mustGetString(flags, "viewMode") viewModeStr, err := getString(flags, "viewMode")
if err != nil { if err != nil {
return "", err return "", err
} }
@ -101,35 +101,35 @@ func getUserDefaults(flags *pflag.FlagSet, defaults *settings.UserDefaults, all
var err error var err error
switch flag.Name { switch flag.Name {
case "scope": case "scope":
defaults.Scope, err = mustGetString(flags, flag.Name) defaults.Scope, err = getString(flags, flag.Name)
case "locale": case "locale":
defaults.Locale, err = mustGetString(flags, flag.Name) defaults.Locale, err = getString(flags, flag.Name)
case "viewMode": case "viewMode":
defaults.ViewMode, err = getViewMode(flags) defaults.ViewMode, err = getViewMode(flags)
case "singleClick": case "singleClick":
defaults.SingleClick, err = mustGetBool(flags, flag.Name) defaults.SingleClick, err = getBool(flags, flag.Name)
case "perm.admin": case "perm.admin":
defaults.Perm.Admin, err = mustGetBool(flags, flag.Name) defaults.Perm.Admin, err = getBool(flags, flag.Name)
case "perm.execute": case "perm.execute":
defaults.Perm.Execute, err = mustGetBool(flags, flag.Name) defaults.Perm.Execute, err = getBool(flags, flag.Name)
case "perm.create": case "perm.create":
defaults.Perm.Create, err = mustGetBool(flags, flag.Name) defaults.Perm.Create, err = getBool(flags, flag.Name)
case "perm.rename": case "perm.rename":
defaults.Perm.Rename, err = mustGetBool(flags, flag.Name) defaults.Perm.Rename, err = getBool(flags, flag.Name)
case "perm.modify": case "perm.modify":
defaults.Perm.Modify, err = mustGetBool(flags, flag.Name) defaults.Perm.Modify, err = getBool(flags, flag.Name)
case "perm.delete": case "perm.delete":
defaults.Perm.Delete, err = mustGetBool(flags, flag.Name) defaults.Perm.Delete, err = getBool(flags, flag.Name)
case "perm.share": case "perm.share":
defaults.Perm.Share, err = mustGetBool(flags, flag.Name) defaults.Perm.Share, err = getBool(flags, flag.Name)
case "perm.download": case "perm.download":
defaults.Perm.Download, err = mustGetBool(flags, flag.Name) defaults.Perm.Download, err = getBool(flags, flag.Name)
case "commands": case "commands":
defaults.Commands, err = flags.GetStringSlice(flag.Name) defaults.Commands, err = flags.GetStringSlice(flag.Name)
case "sorting.by": case "sorting.by":
defaults.Sorting.By, err = mustGetString(flags, flag.Name) defaults.Sorting.By, err = getString(flags, flag.Name)
case "sorting.asc": case "sorting.asc":
defaults.Sorting.Asc, err = mustGetBool(flags, flag.Name) defaults.Sorting.Asc, err = getBool(flags, flag.Name)
} }
if err != nil { if err != nil {
visitErr = err visitErr = err

2
cmd/users_add.go
View File

@ -31,7 +31,7 @@ var usersAddCmd = &cobra.Command{
return err return err
} }
lockPassword, err := mustGetBool(cmd.Flags(), "lockPassword") lockPassword, err := getBool(cmd.Flags(), "lockPassword")
if err != nil { if err != nil {
return err return err
} }

4
cmd/users_import.go
View File

@ -45,7 +45,7 @@ list or set it to 0.`,
} }
} }
replace, err := mustGetBool(cmd.Flags(), "replace") replace, err := getBool(cmd.Flags(), "replace")
if err != nil { if err != nil {
return err return err
} }
@ -69,7 +69,7 @@ list or set it to 0.`,
} }
} }
overwrite, err := mustGetBool(cmd.Flags(), "overwrite") overwrite, err := getBool(cmd.Flags(), "overwrite")
if err != nil { if err != nil {
return err return err
} }

6
cmd/users_update.go
View File

@ -24,11 +24,11 @@ options you want to change.`,
RunE: python(func(cmd *cobra.Command, args []string, d *pythonData) error { RunE: python(func(cmd *cobra.Command, args []string, d *pythonData) error {
username, id := parseUsernameOrID(args[0]) username, id := parseUsernameOrID(args[0])
flags := cmd.Flags() flags := cmd.Flags()
password, err := mustGetString(flags, "password") password, err := getString(flags, "password")
if err != nil { if err != nil {
return err return err
} }
newUsername, err := mustGetString(flags, "username") newUsername, err := getString(flags, "username")
if err != nil { if err != nil {
return err return err
} }
@ -72,7 +72,7 @@ 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, err = mustGetBool(flags, "lockPassword") user.LockPassword, err = getBool(flags, "lockPassword")
if err != nil { if err != nil {
return err return err
} }

10
cmd/utils.go
View File

@ -30,13 +30,13 @@ func returnErr(err error) error {
return nil return nil
} }
func mustGetString(flags *pflag.FlagSet, flag string) (string, error) { func getString(flags *pflag.FlagSet, flag string) (string, error) {
s, err := flags.GetString(flag) s, err := flags.GetString(flag)
return s, returnErr(err) return s, returnErr(err)
} }
func mustGetMode(flags *pflag.FlagSet, flag string) (fs.FileMode, error) { func getMode(flags *pflag.FlagSet, flag string) (fs.FileMode, error) {
s, err := mustGetString(flags, flag) s, err := getString(flags, flag)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -47,12 +47,12 @@ func mustGetMode(flags *pflag.FlagSet, flag string) (fs.FileMode, error) {
return fs.FileMode(b), nil return fs.FileMode(b), nil
} }
func mustGetBool(flags *pflag.FlagSet, flag string) (bool, error) { func getBool(flags *pflag.FlagSet, flag string) (bool, error) {
b, err := flags.GetBool(flag) b, err := flags.GetBool(flag)
return b, returnErr(err) return b, returnErr(err)
} }
func mustGetUint(flags *pflag.FlagSet, flag string) (uint, error) { func getUint(flags *pflag.FlagSet, flag string) (uint, error) {
b, err := flags.GetUint(flag) b, err := flags.GetUint(flag)
return b, returnErr(err) return b, returnErr(err)
} }