Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AAT Compact Mode #191

Merged
merged 1 commit into from
Oct 6, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 45 additions & 13 deletions frontends/ascii-art-table.go
Original file line number Diff line number Diff line change
@@ -18,10 +18,12 @@ import (
type aatConfig struct {
coords bool
monochrome bool
unit iface.UnitSystem
compact bool

unit iface.UnitSystem
}

//TODO: replace s parameter with printf interface?
// TODO: replace s parameter with printf interface?
func aatPad(s string, mustLen int) (ret string) {
ansiEsc := regexp.MustCompile("\033.*?m")
ret = s
@@ -283,9 +285,13 @@ func (c *aatConfig) formatCond(cur []string, cond iface.Cond, current bool) (ret
},
}

icon, ok := codes[cond.Code]
if !ok {
log.Fatalln("aat-frontend: The following weather code has no icon:", cond.Code)
icon := make([]string, 5)
if !c.compact {
var ok bool
icon, ok = codes[cond.Code]
if !ok {
log.Fatalln("aat-frontend: The following weather code has no icon:", cond.Code)
}
}

desc := cond.Desc
@@ -352,19 +358,45 @@ func (c *aatConfig) printDay(day iface.Day) (ret []string) {
}

dateFmt := "┤ " + day.Date.Format("Mon 02. Jan") + " ├"
ret = append([]string{
" ┌─────────────┐ ",
"┌──────────────────────────────┬───────────────────────" + dateFmt + "───────────────────────┬──────────────────────────────┐",
"│ Morning │ Noon └──────┬──────┘ Evening │ Night │",
"├──────────────────────────────┼──────────────────────────────┼──────────────────────────────┼──────────────────────────────┤"},
ret...)
return append(ret,
"└──────────────────────────────┴──────────────────────────────┴──────────────────────────────┴──────────────────────────────┘")
if !c.compact {
ret = append([]string{
" ┌─────────────┐ ",
"┌──────────────────────────────┬───────────────────────" + dateFmt + "───────────────────────┬──────────────────────────────┐",
"│ Morning │ Noon └──────┬──────┘ Evening │ Night │",
"├──────────────────────────────┼──────────────────────────────┼──────────────────────────────┼──────────────────────────────┤"},
ret...)
ret = append(ret,
"└──────────────────────────────┴──────────────────────────────┴──────────────────────────────┴──────────────────────────────┘")
} else {
merge := func(src string, into string) string {
ret := []rune(into)
for k, v := range src {
ret[k] = v
}
return string(ret)
}

spaces := (len(ret[0]) / 4) - 3
bar := strings.Repeat("─", spaces)

ret = append([]string{
day.Date.Format("Mon 02. Jan"),
"┌" + merge("Morning", bar) + "┬" + merge("Noon", bar) + "┬" + merge("Evening", bar) + "┬" + merge("Night", bar) + "┐",
}, ret...)

ret = append(ret,
"└"+bar+"┴"+bar+"┴"+bar+"┴"+bar+"┘",
)
}

return ret
}

func (c *aatConfig) Setup() {
flag.BoolVar(&c.coords, "aat-coords", false, "aat-frontend: Show geo coordinates")
flag.BoolVar(&c.monochrome, "aat-monochrome", false, "aat-frontend: Monochrome output")

flag.BoolVar(&c.compact, "aat-compact", false, "aat-frontend: Compact output")
}

func (c *aatConfig) Render(r iface.Data, unitSystem iface.UnitSystem) {