store tomato icon in config path

This commit is contained in:
Kevin Schoon 2018-01-28 19:27:13 -05:00
parent 31f1cfaa4e
commit d7863cb264
2 changed files with 12 additions and 10 deletions

View File

@ -9,9 +9,9 @@ import (
"time" "time"
) )
func notifier() Notifier { func notifier(iconPath string) Notifier {
if runtime.GOOS == "linux" { if runtime.GOOS == "linux" {
return NewLibNotifier() return NewLibNotifier(iconPath)
} }
return NoopNotifier{} return NoopNotifier{}
} }
@ -37,7 +37,7 @@ func start(path *string) func(*cli.Cmd) {
NPomodoros: *pomodoros, NPomodoros: *pomodoros,
Duration: parsed, Duration: parsed,
} }
runner, err := NewTaskRunner(task, db, notifier()) runner, err := NewTaskRunner(task, db, notifier(*path+"/icon.png"))
maybe(err) maybe(err)
runner.Start() runner.Start()
startUI(runner) startUI(runner)

View File

@ -159,16 +159,18 @@ type LibNotifier struct {
iconPath string iconPath string
} }
func NewLibNotifier() Notifier { func NewLibNotifier(iconPath string) Notifier {
ln := &LibNotifier{ ln := &LibNotifier{
client: libnotify.NewClient(), client: libnotify.NewClient(),
} }
// Write the tomato icon to a temp path // Write the built-in tomato icon if it
raw := MustAsset("tomato-icon.png") // doesn't already exist.
fp, _ := ioutil.TempFile("", "pomo") _, err := os.Stat(iconPath)
fp.Write(raw) if os.IsNotExist(err) {
ln.iconPath = fp.Name() raw := MustAsset("tomato-icon.png")
fp.Close() ioutil.WriteFile(iconPath, raw, 0644)
}
ln.iconPath = iconPath
return ln return ln
} }