blacklight/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove passing of showHeaders explicitly

Browse source 
Where it is needed the configs are already available so just extract the
value from these.
This commit is contained in:
Jeffas 2019-07-17 21:49:28 +01:00 committed by Drew DeVault
parent 1d1fe7c7ef
commit 4a5aa7dc27
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
widgets/msgviewer.go
View file

@ -56,7 +56,7 @@ func NewMessageViewer(acct *AccountView, conf *config.AercConfig,
switcher := &PartSwitcher{} switcher := &PartSwitcher{}
switcher.selected = -1 switcher.selected = -1
err := createSwitcher(switcher, conf, store, msg, conf.Viewer.ShowHeaders) err := createSwitcher(switcher, conf, store, msg)
if err != nil { if err != nil {
return &MessageViewer{ return &MessageViewer{
err: err, err: err,
@ -135,7 +135,7 @@ func fmtHeader(msg *models.MessageInfo, header string) string {
func enumerateParts(conf *config.AercConfig, store *lib.MessageStore, func enumerateParts(conf *config.AercConfig, store *lib.MessageStore,
msg *models.MessageInfo, body *models.BodyStructure, msg *models.MessageInfo, body *models.BodyStructure,
showHeaders bool, index []int) ([]*PartViewer, error) { index []int) ([]*PartViewer, error) {
var parts []*PartViewer var parts []*PartViewer
for i, part := range body.Parts { for i, part := range body.Parts {
@ -145,14 +145,14 @@ func enumerateParts(conf *config.AercConfig, store *lib.MessageStore,
pv := &PartViewer{part: part} pv := &PartViewer{part: part}
parts = append(parts, pv) parts = append(parts, pv)
subParts, err := enumerateParts( subParts, err := enumerateParts(
conf, store, msg, part, showHeaders, curindex) conf, store, msg, part, curindex)
if err != nil { if err != nil {
return nil, err return nil, err
} }
parts = append(parts, subParts...) parts = append(parts, subParts...)
continue continue
} }
pv, err := NewPartViewer(conf, store, msg, part, showHeaders, curindex) pv, err := NewPartViewer(conf, store, msg, part, curindex)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -162,14 +162,13 @@ func enumerateParts(conf *config.AercConfig, store *lib.MessageStore,
} }
func createSwitcher(switcher *PartSwitcher, conf *config.AercConfig, func createSwitcher(switcher *PartSwitcher, conf *config.AercConfig,
store *lib.MessageStore, msg *models.MessageInfo, showHeaders bool) error { store *lib.MessageStore, msg *models.MessageInfo) error {
var err error var err error
switcher.showHeaders = showHeaders switcher.showHeaders = conf.Viewer.ShowHeaders
if len(msg.BodyStructure.Parts) == 0 { if len(msg.BodyStructure.Parts) == 0 {
switcher.selected = 0 switcher.selected = 0
pv, err := NewPartViewer(conf, store, msg, msg.BodyStructure, pv, err := NewPartViewer(conf, store, msg, msg.BodyStructure, []int{1})
showHeaders, []int{1})
if err != nil { if err != nil {
return err return err
} }
@ -179,7 +178,7 @@ func createSwitcher(switcher *PartSwitcher, conf *config.AercConfig,
}) })
} else { } else {
switcher.parts, err = enumerateParts(conf, store, switcher.parts, err = enumerateParts(conf, store,
msg, msg.BodyStructure, showHeaders, []int{}) msg, msg.BodyStructure, []int{})
if err != nil { if err != nil {
return err return err
} }
@ -244,8 +243,9 @@ func (mv *MessageViewer) SelectedMessage() (*models.MessageInfo, error) {
func (mv *MessageViewer) ToggleHeaders() { func (mv *MessageViewer) ToggleHeaders() {
switcher := mv.switcher switcher := mv.switcher
mv.conf.Viewer.ShowHeaders = !mv.conf.Viewer.ShowHeaders
err := createSwitcher( err := createSwitcher(
switcher, mv.conf, mv.store, mv.msg, !switcher.showHeaders) switcher, mv.conf, mv.store, mv.msg)
if err != nil { if err != nil {
mv.acct.Logger().Printf( mv.acct.Logger().Printf(
"warning: error during create switcher - %v", err) "warning: error during create switcher - %v", err)
@ -360,7 +360,7 @@ type PartViewer struct {
func NewPartViewer(conf *config.AercConfig, func NewPartViewer(conf *config.AercConfig,
store *lib.MessageStore, msg *models.MessageInfo, store *lib.MessageStore, msg *models.MessageInfo,
part *models.BodyStructure, showHeaders bool, part *models.BodyStructure,
index []int) (*PartViewer, error) { index []int) (*PartViewer, error) {
var ( var (
@ -424,7 +424,7 @@ func NewPartViewer(conf *config.AercConfig,
pager: pager, pager: pager,
pagerin: pagerin, pagerin: pagerin,
part: part, part: part,
showHeaders: showHeaders, showHeaders: conf.Viewer.ShowHeaders,
sink: pipe, sink: pipe,
store: store, store: store,
term: term, term: term,