Remove the no-pager config variable

pull/6/head
Mickaël Menu 3 years ago
parent aac1c17a13
commit 5ef45020f0
No known key found for this signature in database
GPG Key ID: 53D73664CD359895

@ -78,7 +78,7 @@ func (c *Container) Database(path string) (*sqlite.DB, error) {
//
// You can write to the pager only in the run callback.
func (c *Container) Paginate(noPager bool, config zk.Config, run func(out io.Writer) error) error {
pager, err := c.pager(noPager || config.NoPager, config)
pager, err := c.pager(noPager || config.Pager.String() == "no", config)
if err != nil {
return err
}

@ -88,7 +88,7 @@ func (cmd *List) Run(container *Container) error {
}
if err == nil && !cmd.Quiet {
fmt.Printf("\n\nFound %d %s\n", count, strings.Pluralize("note", count))
fmt.Fprintf(os.Stderr, "\n\nFound %d %s\n", count, strings.Pluralize("note", count))
}
return err

@ -14,7 +14,6 @@ type Config struct {
Dirs map[string]DirConfig
Editor opt.String
Pager opt.String
NoPager bool
Aliases map[string]string
}
@ -129,7 +128,6 @@ func ParseConfig(content []byte, templatesDir string) (*Config, error) {
Dirs: dirs,
Editor: opt.NewNotEmptyString(tomlConf.Editor),
Pager: opt.NewNotEmptyString(tomlConf.Pager),
NoPager: tomlConf.NoPager,
Aliases: aliases,
}, nil
}
@ -192,7 +190,6 @@ type tomlConfig struct {
Dirs map[string]tomlDirConfig `toml:"dir"`
Editor string
Pager string
NoPager bool `toml:"no-pager"`
Aliases map[string]string `toml:"alias"`
}

@ -45,7 +45,6 @@ func TestParseComplete(t *testing.T) {
# Comment
editor = "vim"
pager = "less"
no-pager = true
filename = "{{id}}.note"
extension = "txt"
template = "default.note"
@ -137,9 +136,8 @@ func TestParseComplete(t *testing.T) {
},
},
},
Editor: opt.NewString("vim"),
Pager: opt.NewString("less"),
NoPager: true,
Editor: opt.NewString("vim"),
Pager: opt.NewString("less"),
Aliases: map[string]string{
"ls": "zk list $@",
"ed": "zk edit $@",

Loading…
Cancel
Save