debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-01-18 09:15:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Migrate to goconfig pkg

Browse source
This commit is contained in:
Sebastien Binet 2010-12-16 23:13:09 +01:00 committed by Carl Worth
parent 2fcfb1aa50
commit 38ce0dbf82
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bindings/go/cmds/notmuch-addrlookup.go
View file

@ -11,7 +11,8 @@ import "sort"
// 3rd-party imports // 3rd-party imports
import "notmuch" import "notmuch"
import "github.com/jteeuwen/go-pkg-ini/ini" //import "github.com/jteeuwen/go-pkg-ini/ini"
import "github.com/kless/goconfig/config"
type mail_addr_freq struct { type mail_addr_freq struct {
addr string addr string
@ -178,7 +179,7 @@ type address_matcher struct {
} }
func new_address_matcher() *address_matcher { func new_address_matcher() *address_matcher {
var cfg *ini.Config var cfg *config.Config
var err os.Error var err os.Error
// honor NOTMUCH_CONFIG // honor NOTMUCH_CONFIG
@ -187,13 +188,16 @@ func new_address_matcher() *address_matcher {
home = os.Getenv("HOME") home = os.Getenv("HOME")
} }
if cfg,err = ini.Load(path.Join(home, ".notmuch-config")); err != nil { if cfg,err = config.ReadDefault(path.Join(home, ".notmuch-config")); err != nil {
log.Exitf("error loading config file:",err) log.Exitf("error loading config file:",err)
} }
db_path := cfg.S("database", "path", "") db_path,_ := cfg.String("database", "path")
primary_email := cfg.S("user", "primary_email", "") primary_email,_ := cfg.String("user", "primary_email")
addrbook_tag := cfg.S("user", "addrbook_tag", "addressbook") addrbook_tag,err := cfg.String("user", "addrbook_tag")
if err != nil {
addrbook_tag = "addressbook"
}
self := &address_matcher{db:nil, self := &address_matcher{db:nil,
user_db_path:db_path, user_db_path:db_path,