[*] Renamed implementation type due to naming conflict with package.

This commit is contained in:
Jack Mordaunt 2018-01-31 01:10:03 +01:00
parent 18d97db12a
commit 99667b95ae
1 changed files with 10 additions and 9 deletions

View File

@ -7,6 +7,7 @@ import (
"os" "os"
"time" "time"
"github.com/0xAX/notificator"
"github.com/fatih/color" "github.com/fatih/color"
"github.com/kevinschoon/pomo/libnotify" "github.com/kevinschoon/pomo/libnotify"
@ -184,13 +185,13 @@ func (ln LibNotifier) Notify(title, body string) error {
) )
} }
// notificator can push notifications to mac, linux and windows. // xnotifier can push notifications to mac, linux and windows.
type notificator struct { type xnotifier struct {
*notificator.Notificator *notificator.Notificator
iconPath string iconPath string
} }
func newNotificator(iconPath string) notificator { func newXnotifier(iconPath string) xnotifier {
// Write the built-in tomato icon if it // Write the built-in tomato icon if it
// doesn't already exist. // doesn't already exist.
_, err := os.Stat(iconPath) _, err := os.Stat(iconPath)
@ -198,25 +199,25 @@ func newNotificator(iconPath string) notificator {
raw := MustAsset("tomato-icon.png") raw := MustAsset("tomato-icon.png")
_ = ioutil.WriteFile(iconPath, raw, 0644) _ = ioutil.WriteFile(iconPath, raw, 0644)
} }
return notificator{ return xnotifier{
Notificator: notificator.New(notificator.Options{}), Notificator: notificator.New(notificator.Options{}),
iconPath: iconPath, iconPath: iconPath,
} }
} }
// Notify sends a notification to the OS. // Notify sends a notification to the OS.
func (n notificator) Notify(title, body string) error { func (n xnotifier) Notify(title, body string) error {
return n.Push(title, body, n.iconPath, notificator.UR_NORMAL) return n.Push(title, body, n.iconPath, notificator.UR_NORMAL)
} }
type DarwinNotifier = notificator type DarwinNotifier = xnotifier
func NewDarwinNotifier(iconPath string) DarwinNotifier { func NewDarwinNotifier(iconPath string) DarwinNotifier {
return newNotificator(iconPath) return newXnotifier(iconPath)
} }
type WindowsNotifier = notificator type WindowsNotifier = xnotifier
func NewWindowsNotifier(iconPath string) WindowsNotifier { func NewWindowsNotifier(iconPath string) WindowsNotifier {
return newNotificator(iconPath) return newXnotifier(iconPath)
} }