c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move all directory related functionality into paths utils

Browse source 
As per suggestion by @willscott in: https://github.com/OpenObservatory/gooni/pull/9#discussion_r176760264
This commit is contained in:
Arturo Filastò 2018-03-27 15:09:34 +02:00
commit cffb9ea74c
4 changed files with 54 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ooni.go
View file

@ -59,9 +59,9 @@ func (c *Context) MaybeLocationLookup() error {
func (c *Context) LocationLookup() error {
var err error
dbPath := filepath.Join(c.Home, "geoip")
geoipDir := utils.GeoIPDir(c.Home)
c.Location, err = utils.GeoIPLookup(dbPath)
c.Location, err = utils.GeoIPLookup(geoipDir)
if err != nil {
return err
}
@ -92,7 +92,7 @@ func (c *Context) Init() error {
return err
}
c.dbPath = filepath.Join(c.Home, "db", "main.sqlite3")
c.dbPath = utils.DBDir(c.Home, "main")
if c.Config.InformedConsent == false {
if err = Onboarding(c.Config); err != nil {
return errors.Wrap(err, "onboarding")
@ -215,11 +215,10 @@ func ParseConfig(b []byte) (*Config, error) {
// MaybeInitializeHome does the setup for a new OONI Home
func MaybeInitializeHome(home string) error {
firstRun := false
requiredDirs := []string{"db", "msmts", "geoip"}
for _, d := range requiredDirs {
if _, e := os.Stat(filepath.Join(home, d)); e != nil {
for _, d := range utils.RequiredDirs(home) {
if _, e := os.Stat(d); e != nil {
firstRun = true
if err := os.MkdirAll(filepath.Join(home, d), 0700); err != nil {
if err := os.MkdirAll(d, 0700); err != nil {
return err
}
}