aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAndrew Jeffery <dev@jeffas.io>2020-07-06 20:14:15 +0100
committerReto Brunner <reto@labrat.space>2020-07-08 09:07:43 +0200
commitfda3f43e7c5e5a175a01dd3e5b8637b1ecb30c51 (patch)
tree8f6f15424a9e5711ade8b9ef66679cdf5aeb4779 /lib
parent3e6189f243c8d0717979da1a1a18e46996f6a2ef (diff)
downloadaerc-fda3f43e7c5e5a175a01dd3e5b8637b1ecb30c51.tar.gz
Allow open to be asynchronous
This stops the ui being blocked while the resource is opened. The wait ensures that resources are reclaimed when the process finishes while aerc is still running.
Diffstat (limited to 'lib')
-rw-r--r--lib/open.go15
-rw-r--r--lib/open_darwin.go15
2 files changed, 26 insertions, 4 deletions
diff --git a/lib/open.go b/lib/open.go
index ad6533e1..ebcf8780 100644
--- a/lib/open.go
+++ b/lib/open.go
@@ -6,7 +6,18 @@ import (
"os/exec"
)
-func OpenFile(filename string) error {
+func OpenFile(filename string, onErr func(error)) {
cmd := exec.Command("xdg-open", filename)
- return cmd.Run()
+ err := cmd.Start()
+ if err != nil && onErr != nil {
+ onErr(err)
+ return
+ }
+
+ go func() {
+ err := cmd.Wait()
+ if err != nil && onErr != nil {
+ onErr(err)
+ }
+ }()
}
diff --git a/lib/open_darwin.go b/lib/open_darwin.go
index 0ffd9a16..d98c8988 100644
--- a/lib/open_darwin.go
+++ b/lib/open_darwin.go
@@ -4,7 +4,18 @@ import (
"os/exec"
)
-func OpenFile(filename string) error {
+func OpenFile(filename string, onErr func(error)) {
cmd := exec.Command("open", filename)
- return cmd.Run()
+ err := cmd.Start()
+ if err != nil && onErr != nil {
+ onErr(err)
+ return
+ }
+
+ go func() {
+ err := cmd.Wait()
+ if err != nil && onErr != nil {
+ onErr(err)
+ }
+ }()
}