From 3dbd99570cbed4158ec8f68cba0ecbfdcd0da660 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Sun, 6 Jan 2019 12:37:54 +0000 Subject: [PATCH] revert: defaults. License: MIT Signed-off-by: Henrique Dias --- cmd/config.go | 2 +- cmd/config_init.go | 2 +- cmd/config_set.go | 2 +- cmd/users.go | 62 ++++++++++++++++++++++----------------------- cmd/users_new.go | 4 +-- cmd/users_update.go | 4 +-- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/cmd/config.go b/cmd/config.go index 255caf3c..bca203c5 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -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") diff --git a/cmd/config_init.go b/cmd/config_init.go index 79200bb7..d8260200 100644 --- a/cmd/config_init.go +++ b/cmd/config_init.go @@ -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 diff --git a/cmd/config_set.go b/cmd/config_set.go index 7c66b378..b5e7b510 100644 --- a/cmd/config_set.go +++ b/cmd/config_set.go @@ -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 { diff --git a/cmd/users.go b/cmd/users.go index 215a142b..f49f46e4 100644 --- a/cmd/users.go +++ b/cmd/users.go @@ -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) } } diff --git a/cmd/users_new.go b/cmd/users_new.go index f181a61f..47480d65 100644 --- a/cmd/users_new.go +++ b/cmd/users_new.go @@ -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) diff --git a/cmd/users_update.go b/cmd/users_update.go index fd22fc91..f0aa27ba 100644 --- a/cmd/users_update.go +++ b/cmd/users_update.go @@ -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