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 /app/status.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 'app/status.go')
-rw-r--r-- | app/status.go | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/app/status.go b/app/status.go index f6919e29..fdeede19 100644 --- a/app/status.go +++ b/app/status.go @@ -18,7 +18,6 @@ import ( type StatusLine struct { sync.Mutex stack []*StatusMessage - aerc *Aerc acct *AccountView err string } @@ -48,9 +47,9 @@ func (status *StatusLine) Draw(ctx *ui.Context) { msg = runewidth.FillRight(msg, ctx.Width()) style := status.uiConfig().GetStyle(config.STYLE_STATUSLINE_ERROR) ctx.Printf(0, 0, style, "%s", msg) - case status.aerc != nil && status.acct != nil: + case aerc != nil && status.acct != nil: data := state.NewDataSetter() - data.SetPendingKeys(status.aerc.pendingKeys) + data.SetPendingKeys(aerc.pendingKeys) data.SetState(&status.acct.state) data.SetAccount(status.acct.acct) data.SetFolder(status.acct.Directories().SelectedDirectory()) @@ -154,11 +153,7 @@ func (status *StatusLine) Expire() { } func (status *StatusLine) uiConfig() *config.UIConfig { - return status.aerc.SelectedAccountUiConfig() -} - -func (status *StatusLine) SetAerc(aerc *Aerc) { - status.aerc = aerc + return SelectedAccountUiConfig() } func (msg *StatusMessage) Color(style tcell.Style) { |