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

revert: defaults.

Browse Source 
License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>
This commit is contained in:
Henrique Dias 2019-01-06 12:37:54 +00:00
parent 7f060b7362
commit 3dbd99570c
6 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/config.go
View File

@ -30,7 +30,7 @@ var configCmd = &cobra.Command{
}
func addConfigFlags(cmd *cobra.Command) {
addUserFlags(cmd, "defaults.")
addUserFlags(cmd)
cmd.Flags().StringP("baseURL", "b", "/", "base url of this installation")
cmd.Flags().BoolP("signup", "s", false, "allow users to signup")
cmd.Flags().String("shell", "", "shell command to which other commands should be appended")

2
cmd/config_init.go
View File

@ -32,7 +32,7 @@ override the options.`,
}
defaults := settings.UserDefaults{}
getUserDefaults(cmd, &defaults, "defaults.", true)
getUserDefaults(cmd, &defaults, true)
authMethod, auther := getAuthentication(cmd)
var err error

2
cmd/config_set.go
View File

@ -47,7 +47,7 @@ you want to change.`,
}
})
getUserDefaults(cmd, &s.Defaults, "defaults.", false)
getUserDefaults(cmd, &s.Defaults, false)
var auther auth.Auther
if hasAuth {

62
cmd/users.go
View File

@ -64,22 +64,22 @@ func usernameOrIDRequired(cmd *cobra.Command, args []string) error {
return nil
}
func addUserFlags(cmd *cobra.Command, prepend string) {
cmd.Flags().Bool(prepend+"perm.admin", false, "admin perm for users")
cmd.Flags().Bool(prepend+"perm.execute", true, "execute perm for users")
cmd.Flags().Bool(prepend+"perm.create", true, "create perm for users")
cmd.Flags().Bool(prepend+"perm.rename", true, "rename perm for users")
cmd.Flags().Bool(prepend+"perm.modify", true, "modify perm for users")
cmd.Flags().Bool(prepend+"perm.delete", true, "delete perm for users")
cmd.Flags().Bool(prepend+"perm.share", true, "share perm for users")
cmd.Flags().Bool(prepend+"perm.download", true, "download perm for users")
cmd.Flags().String(prepend+"sorting.by", "name", "sorting mode (name, size or modified)")
cmd.Flags().Bool(prepend+"sorting.asc", false, "sorting by ascending order")
cmd.Flags().Bool(prepend+"lockPassword", false, "lock password")
cmd.Flags().StringSlice(prepend+"commands", nil, "a list of the commands a user can execute")
cmd.Flags().String(prepend+"scope", "", "scope for users")
cmd.Flags().String(prepend+"locale", "en", "locale for users")
cmd.Flags().String(prepend+"viewMode", string(users.ListViewMode), "view mode for users")
func addUserFlags(cmd *cobra.Command) {
cmd.Flags().Bool("perm.admin", false, "admin perm for users")
cmd.Flags().Bool("perm.execute", true, "execute perm for users")
cmd.Flags().Bool("perm.create", true, "create perm for users")
cmd.Flags().Bool("perm.rename", true, "rename perm for users")
cmd.Flags().Bool("perm.modify", true, "modify perm for users")
cmd.Flags().Bool("perm.delete", true, "delete perm for users")
cmd.Flags().Bool("perm.share", true, "share perm for users")
cmd.Flags().Bool("perm.download", true, "download perm for users")
cmd.Flags().String("sorting.by", "name", "sorting mode (name, size or modified)")
cmd.Flags().Bool("sorting.asc", false, "sorting by ascending order")
cmd.Flags().Bool("lockPassword", false, "lock password")
cmd.Flags().StringSlice("commands", nil, "a list of the commands a user can execute")
cmd.Flags().String("scope", "", "scope for users")
cmd.Flags().String("locale", "en", "locale for users")
cmd.Flags().String("viewMode", string(users.ListViewMode), "view mode for users")
}
func getViewMode(cmd *cobra.Command) users.ViewMode {
@ -90,38 +90,38 @@ func getViewMode(cmd *cobra.Command) users.ViewMode {
return viewMode
}
func getUserDefaults(cmd *cobra.Command, defaults *settings.UserDefaults, prepend string, all bool) {
func getUserDefaults(cmd *cobra.Command, defaults *settings.UserDefaults, all bool) {
visit := func(flag *pflag.Flag) {
switch flag.Name {
case prepend+"scope":
case "scope":
defaults.Scope = mustGetString(cmd, flag.Name)
case prepend+"locale":
case "locale":
defaults.Locale = mustGetString(cmd, flag.Name)
case prepend+"viewMode":
case "viewMode":
defaults.ViewMode = getViewMode(cmd)
case prepend+"perm.admin":
case "perm.admin":
defaults.Perm.Admin = mustGetBool(cmd, flag.Name)
case prepend+"perm.execute":
case "perm.execute":
defaults.Perm.Execute = mustGetBool(cmd, flag.Name)
case prepend+"perm.create":
case "perm.create":
defaults.Perm.Create = mustGetBool(cmd, flag.Name)
case prepend+"perm.rename":
case "perm.rename":
defaults.Perm.Rename = mustGetBool(cmd, flag.Name)
case prepend+"perm.modify":
case "perm.modify":
defaults.Perm.Modify = mustGetBool(cmd, flag.Name)
case prepend+"perm.delete":
case "perm.delete":
defaults.Perm.Delete = mustGetBool(cmd, flag.Name)
case prepend+"perm.share":
case "perm.share":
defaults.Perm.Share = mustGetBool(cmd, flag.Name)
case prepend+"perm.download":
case "perm.download":
defaults.Perm.Download = mustGetBool(cmd, flag.Name)
case prepend+"commands":
case "commands":
commands, err := cmd.Flags().GetStringSlice(flag.Name)
checkErr(err)
defaults.Commands = commands
case prepend+"sorting.by":
case "sorting.by":
defaults.Sorting.By = mustGetString(cmd, flag.Name)
case prepend+"sorting.asc":
case "sorting.asc":
defaults.Sorting.Asc = mustGetBool(cmd, flag.Name)
}
}

4
cmd/users_new.go
View File

@ -8,7 +8,7 @@ import (
func init() {
usersCmd.AddCommand(usersNewCmd)
addUserFlags(usersNewCmd, "")
addUserFlags(usersNewCmd)
usersNewCmd.Flags().StringP("username", "u", "", "new users's username")
usersNewCmd.Flags().StringP("password", "p", "", "new user's password")
usersNewCmd.MarkFlagRequired("username")
@ -27,7 +27,7 @@ var usersNewCmd = &cobra.Command{
s, err := st.Settings.Get()
checkErr(err)
getUserDefaults(cmd, &s.Defaults, "", false)
getUserDefaults(cmd, &s.Defaults, false)
password, _ := cmd.Flags().GetString("password")
password, err = users.HashPwd(password)

4
cmd/users_update.go
View File

@ -12,7 +12,7 @@ func init() {
usersUpdateCmd.Flags().UintP("id", "i", 0, "id of the user")
usersUpdateCmd.Flags().StringP("username", "u", "", "user to change or new username if flag 'id' is set")
usersUpdateCmd.Flags().StringP("password", "p", "", "new password")
addUserFlags(usersUpdateCmd, "")
addUserFlags(usersUpdateCmd)
}
var usersUpdateCmd = &cobra.Command{
@ -51,7 +51,7 @@ options you want to change.`,
Sorting: user.Sorting,
Commands: user.Commands,
}
getUserDefaults(cmd, &defaults, "", false)
getUserDefaults(cmd, &defaults, false)
user.Scope = defaults.Scope
user.Locale = defaults.Locale
user.ViewMode = defaults.ViewMode