diff options
| author | Robin Jarry <robin@jarry.cc> | 2023-10-10 00:08:31 +0200 |
|---|---|---|
| committer | Robin Jarry <robin@jarry.cc> | 2023-10-10 11:38:01 +0200 |
| commit | bc176bd61ba726351a489cabf4da16a47dc5ec3b (patch) | |
| tree | bbf06f731592d072f3d6f76f1648d61989375f2e /commands/util.go | |
| parent | 598e4a5803578ab3e291f232d6aad31b4efd8ea4 (diff) | |
| download | aerc-bc176bd61ba726351a489cabf4da16a47dc5ec3b.tar.gz | |
app: export global functions
The single Aerc object is passed around in almost all command functions.
This hinders readability.
Store the single Aerc instance as a global variable. Export public
functions from the app package to access methods of that object. Remove
all explicit references to *app.Aerc and replace them with calls to
these functions. For references to private/unexported fields and
functions from within the app package, directly access the global aerc
object.
Signed-off-by: Robin Jarry <robin@jarry.cc>
Acked-by: Moritz Poldrack <moritz@poldrack.dev>
Diffstat (limited to 'commands/util.go')
| -rw-r--r-- | commands/util.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/commands/util.go b/commands/util.go index fbb20433..e9a377a6 100644 --- a/commands/util.go +++ b/commands/util.go @@ -22,7 +22,7 @@ import ( ) // QuickTerm is an ephemeral terminal for running a single command and quitting. -func QuickTerm(aerc *app.Aerc, args []string, stdin io.Reader) (*app.Terminal, error) { +func QuickTerm(args []string, stdin io.Reader) (*app.Terminal, error) { cmd := exec.Command(args[0], args[1:]...) pipe, err := cmd.StdinPipe() if err != nil { @@ -36,14 +36,14 @@ func QuickTerm(aerc *app.Aerc, args []string, stdin io.Reader) (*app.Terminal, e term.OnClose = func(err error) { if err != nil { - aerc.PushError(err.Error()) + app.PushError(err.Error()) // remove the tab on error, otherwise it gets stuck - aerc.RemoveTab(term, false) + app.RemoveTab(term, false) } else { - aerc.PushStatus("Process complete, press any key to close.", + app.PushStatus("Process complete, press any key to close.", 10*time.Second) term.OnEvent = func(event tcell.Event) bool { - aerc.RemoveTab(term, true) + app.RemoveTab(term, true) return true } } @@ -62,7 +62,7 @@ func QuickTerm(aerc *app.Aerc, args []string, stdin io.Reader) (*app.Terminal, e err := <-status if err != nil { - aerc.PushError(err.Error()) + app.PushError(err.Error()) } } |