From c0705b02a08bc9054ab8dca0363248bf72896b3d Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 11 Apr 2018 15:05:42 +0300 Subject: Move notification package to lib/ and add open package --- notification/doc.go | 2 -- notification/notify_darwin.go | 54 -------------------------------------- notification/notify_linux.go | 38 --------------------------- notification/notify_unsupported.go | 23 ---------------- notification/notify_windows.go | 37 -------------------------- 5 files changed, 154 deletions(-) delete mode 100644 notification/doc.go delete mode 100644 notification/notify_darwin.go delete mode 100644 notification/notify_linux.go delete mode 100644 notification/notify_unsupported.go delete mode 100644 notification/notify_windows.go (limited to 'notification') diff --git a/notification/doc.go b/notification/doc.go deleted file mode 100644 index 05295c6..0000000 --- a/notification/doc.go +++ /dev/null @@ -1,2 +0,0 @@ -// Package notification contains a simple cross-platform desktop notification sending function. -package notification diff --git a/notification/notify_darwin.go b/notification/notify_darwin.go deleted file mode 100644 index 1e09ef8..0000000 --- a/notification/notify_darwin.go +++ /dev/null @@ -1,54 +0,0 @@ -// gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -package notification - -import ( - "fmt" - "os/exec" - "strings" -) - -var TerminalNotifierAvailable = false - -func init() { - if err := exec.Command("which", "terminal-notifier").Run(); err != nil { - TerminalNotifierAvailable = false - } - TerminalNotifierAvailable = true -} - -func Send(title, text string, critical, sound bool) error { - if TerminalNotifierAvailable { - args := []string{"-title", "gomuks", "-subtitle", title, "-message", text} - if critical { - args = append(args, "-timeout", "15") - } else { - args = append(args, "-timeout", "4") - } - if sound { - args = append(args, "-sound", "default") - } -// if len(iconPath) > 0 { -// args = append(args, "-appIcon", iconPath) -// } - return exec.Command("terminal-notifier", args...).Run() - } - title = strings.Replace(title, `"`, `\"`, -1) - text = strings.Replace(text, `"`, `\"`, -1) - notification := fmt.Sprintf("display notification \"%s\" with title \"gomuks\" subtitle \"%s\"", text, title) - return exec.Command("osascript", "-e", notification).Run() -} diff --git a/notification/notify_linux.go b/notification/notify_linux.go deleted file mode 100644 index f8ecdaf..0000000 --- a/notification/notify_linux.go +++ /dev/null @@ -1,38 +0,0 @@ -// gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -package notification - -import "os/exec" - -func Send(title, text string, critical, sound bool) error { - args := []string{"-a", "gomuks"} - if critical { - args = append(args, "-u", "critical") - } -// if iconPath { -// args = append(args, "-i", iconPath) -// } - args = append(args, title, text) - if sound { - soundName := "message-new-instant" - if critical { - soundName = "complete" - } - exec.Command("paplay", "/usr/share/sounds/freedesktop/stereo/"+soundName+".oga").Run() - } - return exec.Command("notify-send", args...).Run() -} diff --git a/notification/notify_unsupported.go b/notification/notify_unsupported.go deleted file mode 100644 index 0b350e8..0000000 --- a/notification/notify_unsupported.go +++ /dev/null @@ -1,23 +0,0 @@ -// +build !linux,!darwin,!windows - -// gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -package notification - -func Send(title, text string, critical, sound bool) error { - return nil -} diff --git a/notification/notify_windows.go b/notification/notify_windows.go deleted file mode 100644 index d927ee1..0000000 --- a/notification/notify_windows.go +++ /dev/null @@ -1,37 +0,0 @@ -// gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -package notification - -import "gopkg.in/toast.v1" - -func Send(title, text string, critical, sound bool) error { - notification := toast.Notification{ - AppID: "gomuks", - Title: title, - Message: message, - Audio: toast.Silent, - Duration: toast.Short, -// Icon: ..., - } - if sound { - notification.Audio = toast.IM - } - if critical { - notification.Duration = toast.Long - } - return notification.Push() -} -- cgit v1.2.3