eat: default sorting on cli and working
License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>
This commit is contained in:
parent
0544381818
commit
e0ec056699
@ -99,6 +99,9 @@ func printSettings(s *types.Settings, auther types.Auther) {
|
|||||||
fmt.Fprintf(w, "\tScope:\t%s\n", s.Defaults.Scope)
|
fmt.Fprintf(w, "\tScope:\t%s\n", s.Defaults.Scope)
|
||||||
fmt.Fprintf(w, "\tLocale:\t%s\n", s.Defaults.Locale)
|
fmt.Fprintf(w, "\tLocale:\t%s\n", s.Defaults.Locale)
|
||||||
fmt.Fprintf(w, "\tView mode:\t%s\n", s.Defaults.ViewMode)
|
fmt.Fprintf(w, "\tView mode:\t%s\n", s.Defaults.ViewMode)
|
||||||
|
fmt.Fprintf(w, "\tSorting:\n")
|
||||||
|
fmt.Fprintf(w, "\t\tBy:\t%s\n", s.Defaults.Sorting.By)
|
||||||
|
fmt.Fprintf(w, "\t\tAsc:\t%t\n", s.Defaults.Sorting.Asc)
|
||||||
fmt.Fprintf(w, "\tPermissions:\n")
|
fmt.Fprintf(w, "\tPermissions:\n")
|
||||||
fmt.Fprintf(w, "\t\tAdmin:\t%t\n", s.Defaults.Perm.Admin)
|
fmt.Fprintf(w, "\t\tAdmin:\t%t\n", s.Defaults.Perm.Admin)
|
||||||
fmt.Fprintf(w, "\t\tExecute:\t%t\n", s.Defaults.Perm.Execute)
|
fmt.Fprintf(w, "\t\tExecute:\t%t\n", s.Defaults.Perm.Execute)
|
||||||
|
|||||||
@ -73,6 +73,8 @@ func addUserFlags(cmd *cobra.Command) {
|
|||||||
cmd.Flags().Bool("perm.delete", true, "delete 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.share", true, "share perm for users")
|
||||||
cmd.Flags().Bool("perm.download", true, "download 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().Bool("lockPassword", false, "lock password")
|
||||||
cmd.Flags().String("scope", "", "scope for users")
|
cmd.Flags().String("scope", "", "scope for users")
|
||||||
cmd.Flags().String("locale", "en", "locale for users")
|
cmd.Flags().String("locale", "en", "locale for users")
|
||||||
@ -116,6 +118,10 @@ func getUserDefaults(cmd *cobra.Command, defaults *types.UserDefaults, all bool)
|
|||||||
commands, err := cmd.Flags().GetStringSlice("perm.commands")
|
commands, err := cmd.Flags().GetStringSlice("perm.commands")
|
||||||
checkErr(err)
|
checkErr(err)
|
||||||
defaults.Perm.Commands = commands
|
defaults.Perm.Commands = commands
|
||||||
|
case "sorting.by":
|
||||||
|
defaults.Sorting.By = mustGetString(cmd, "sorting.by")
|
||||||
|
case "sorting.asc":
|
||||||
|
defaults.Sorting.Asc = mustGetBool(cmd, "sorting.asc")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -43,6 +43,7 @@ var usersNewCmd = &cobra.Command{
|
|||||||
Locale: settings.Defaults.Locale,
|
Locale: settings.Defaults.Locale,
|
||||||
ViewMode: settings.Defaults.ViewMode,
|
ViewMode: settings.Defaults.ViewMode,
|
||||||
Perm: settings.Defaults.Perm,
|
Perm: settings.Defaults.Perm,
|
||||||
|
Sorting: settings.Defaults.Sorting,
|
||||||
}
|
}
|
||||||
|
|
||||||
err = ust.Save(user)
|
err = ust.Save(user)
|
||||||
|
|||||||
@ -46,12 +46,14 @@ options you want to change.`,
|
|||||||
Locale: user.Locale,
|
Locale: user.Locale,
|
||||||
ViewMode: user.ViewMode,
|
ViewMode: user.ViewMode,
|
||||||
Perm: user.Perm,
|
Perm: user.Perm,
|
||||||
|
Sorting: user.Sorting,
|
||||||
}
|
}
|
||||||
getUserDefaults(cmd, &defaults, false)
|
getUserDefaults(cmd, &defaults, false)
|
||||||
user.Scope = defaults.Scope
|
user.Scope = defaults.Scope
|
||||||
user.Locale = defaults.Locale
|
user.Locale = defaults.Locale
|
||||||
user.ViewMode = defaults.ViewMode
|
user.ViewMode = defaults.ViewMode
|
||||||
user.Perm = defaults.Perm
|
user.Perm = defaults.Perm
|
||||||
|
user.Sorting = defaults.Sorting
|
||||||
user.LockPassword = mustGetBool(cmd, "lockPassword")
|
user.LockPassword = mustGetBool(cmd, "lockPassword")
|
||||||
|
|
||||||
if user.Username != username && username != "" {
|
if user.Username != username && username != "" {
|
||||||
|
|||||||
@ -38,6 +38,6 @@ type UserDefaults struct {
|
|||||||
Scope string `json:"scope"`
|
Scope string `json:"scope"`
|
||||||
Locale string `json:"locale"`
|
Locale string `json:"locale"`
|
||||||
ViewMode ViewMode `json:"viewMode"`
|
ViewMode ViewMode `json:"viewMode"`
|
||||||
Sorting Sorting `json:"sorting"` // TODO: add to cli
|
Sorting Sorting `json:"sorting"`
|
||||||
Perm Permissions `json:"perm"`
|
Perm Permissions `json:"perm"`
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user