psycodad
/
wttr.in
mirror of https://github.com/chubin/wttr.in
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Run gofumpt for view/v1

Browse Source
chubin/logging
Igor Chubin 2 years ago
parent cfe5b0761e
commit 0bf476bd41
6 changed files with 81 additions and 64 deletions
Show Stats Download Patch File Download Diff File

2
internal/view/v1/cmd.go
Unescape View File

@ -58,7 +58,7 @@ func configload() error {
func configsave() error { func configsave() error {
j, err := json.MarshalIndent(config, "", "\t") j, err := json.MarshalIndent(config, "", "\t")
if err == nil { if err == nil {
return ioutil.WriteFile(configpath, j, 0600) return ioutil.WriteFile(configpath, j, 0o600)
} }
return err return err
} }

46
internal/view/v1/format.go
Unescape View File

@ -8,30 +8,28 @@ import (
"github.com/mattn/go-runewidth" "github.com/mattn/go-runewidth"
) )
var ( var windDir = map[string]string{
windDir = map[string]string{ "N": "\033[1m↓\033[0m",
"N": "\033[1m↓\033[0m", "NNE": "\033[1m↓\033[0m",
"NNE": "\033[1m↓\033[0m", "NE": "\033[1m↙\033[0m",
"NE": "\033[1m↙\033[0m", "ENE": "\033[1m↙\033[0m",
"ENE": "\033[1m↙\033[0m", "E": "\033[1m←\033[0m",
"E": "\033[1m←\033[0m", "ESE": "\033[1m←\033[0m",
"ESE": "\033[1m←\033[0m", "SE": "\033[1m↖\033[0m",
"SE": "\033[1m↖\033[0m", "SSE": "\033[1m↖\033[0m",
"SSE": "\033[1m↖\033[0m", "S": "\033[1m↑\033[0m",
"S": "\033[1m↑\033[0m", "SSW": "\033[1m↑\033[0m",
"SSW": "\033[1m↑\033[0m", "SW": "\033[1m↗\033[0m",
"SW": "\033[1m↗\033[0m", "WSW": "\033[1m↗\033[0m",
"WSW": "\033[1m↗\033[0m", "W": "\033[1m→\033[0m",
"W": "\033[1m→\033[0m", "WNW": "\033[1m→\033[0m",
"WNW": "\033[1m→\033[0m", "NW": "\033[1m↘\033[0m",
"NW": "\033[1m↘\033[0m", "NNW": "\033[1m↘\033[0m",
"NNW": "\033[1m↘\033[0m", }
}
)
func formatTemp(c cond) string { func formatTemp(c cond) string {
color := func(temp int, explicitPlus bool) string { color := func(temp int, explicitPlus bool) string {
var col = 0 col := 0
if !config.Inverse { if !config.Inverse {
// Extemely cold temperature must be shown with violet // Extemely cold temperature must be shown with violet
// because dark blue is too dark // because dark blue is too dark
@ -193,7 +191,7 @@ func formatWind(c cond) string {
return spd return spd
} }
color := func(spd int) string { color := func(spd int) string {
var col = 46 col := 46
switch spd { switch spd {
case 1, 2, 3: case 1, 2, 3:
col = 82 col = 82
@ -286,7 +284,7 @@ func formatCond(cur []string, c cond, current bool) (ret []string) {
icon[i] = strings.Replace(icon[i], "38;5;251", "38;5;238", -1) icon[i] = strings.Replace(icon[i], "38;5;251", "38;5;238", -1)
} }
} }
//desc := fmt.Sprintf("%-15.15v", c.WeatherDesc[0].Value) // desc := fmt.Sprintf("%-15.15v", c.WeatherDesc[0].Value)
desc := c.WeatherDesc[0].Value desc := c.WeatherDesc[0].Value
if config.RightToLeft { if config.RightToLeft {
for runewidth.StringWidth(desc) < 15 { for runewidth.StringWidth(desc) < 15 {
@ -325,7 +323,7 @@ func formatCond(cur []string, c cond, current bool) (ret []string) {
} else { } else {
if lastRune, size := utf8.DecodeLastRuneInString(desc); lastRune != ' ' { if lastRune, size := utf8.DecodeLastRuneInString(desc); lastRune != ' ' {
desc = desc[:len(desc)-size] + "…" desc = desc[:len(desc)-size] + "…"
//for numberOfSpaces < runewidth.StringWidth(fmt.Sprintf("%c", lastRune)) - 1 { // for numberOfSpaces < runewidth.StringWidth(fmt.Sprintf("%c", lastRune)) - 1 {
for runewidth.StringWidth(desc) < 15 { for runewidth.StringWidth(desc) < 15 {
desc = desc + " " desc = desc + " "
} }

57
internal/view/v1/icons.go
Unescape View File

@ -6,133 +6,152 @@ var (
" __) ", " __) ",
" ( ", " ( ",
" `-’ ", " `-’ ",
" • "} " • ",
}
iconSunny = []string{ iconSunny = []string{
"\033[38;5;226m \\ / \033[0m", "\033[38;5;226m \\ / \033[0m",
"\033[38;5;226m .-. \033[0m", "\033[38;5;226m .-. \033[0m",
"\033[38;5;226m ― ( ) ― \033[0m", "\033[38;5;226m ― ( ) ― \033[0m",
"\033[38;5;226m `-’ \033[0m", "\033[38;5;226m `-’ \033[0m",
"\033[38;5;226m / \\ \033[0m"} "\033[38;5;226m / \\ \033[0m",
}
iconPartlyCloudy = []string{ iconPartlyCloudy = []string{
"\033[38;5;226m \\ /\033[0m ", "\033[38;5;226m \\ /\033[0m ",
"\033[38;5;226m _ /\"\"\033[38;5;250m.-. \033[0m", "\033[38;5;226m _ /\"\"\033[38;5;250m.-. \033[0m",
"\033[38;5;226m \\_\033[38;5;250m( ). \033[0m", "\033[38;5;226m \\_\033[38;5;250m( ). \033[0m",
"\033[38;5;226m /\033[38;5;250m(___(__) \033[0m", "\033[38;5;226m /\033[38;5;250m(___(__) \033[0m",
" "} " ",
}
iconCloudy = []string{ iconCloudy = []string{
" ", " ",
"\033[38;5;250m .--. \033[0m", "\033[38;5;250m .--. \033[0m",
"\033[38;5;250m .-( ). \033[0m", "\033[38;5;250m .-( ). \033[0m",
"\033[38;5;250m (___.__)__) \033[0m", "\033[38;5;250m (___.__)__) \033[0m",
" "} " ",
}
iconVeryCloudy = []string{ iconVeryCloudy = []string{
" ", " ",
"\033[38;5;240;1m .--. \033[0m", "\033[38;5;240;1m .--. \033[0m",
"\033[38;5;240;1m .-( ). \033[0m", "\033[38;5;240;1m .-( ). \033[0m",
"\033[38;5;240;1m (___.__)__) \033[0m", "\033[38;5;240;1m (___.__)__) \033[0m",
" "} " ",
}
iconLightShowers = []string{ iconLightShowers = []string{
"\033[38;5;226m _`/\"\"\033[38;5;250m.-. \033[0m", "\033[38;5;226m _`/\"\"\033[38;5;250m.-. \033[0m",
"\033[38;5;226m ,\\_\033[38;5;250m( ). \033[0m", "\033[38;5;226m ,\\_\033[38;5;250m( ). \033[0m",
"\033[38;5;226m /\033[38;5;250m(___(__) \033[0m", "\033[38;5;226m /\033[38;5;250m(___(__) \033[0m",
"\033[38;5;111m ‘ ‘ ‘ ‘ \033[0m", "\033[38;5;111m ‘ ‘ ‘ ‘ \033[0m",
"\033[38;5;111m ‘ ‘ ‘ ‘ \033[0m"} "\033[38;5;111m ‘ ‘ ‘ ‘ \033[0m",
}
iconHeavyShowers = []string{ iconHeavyShowers = []string{
"\033[38;5;226m _`/\"\"\033[38;5;240;1m.-. \033[0m", "\033[38;5;226m _`/\"\"\033[38;5;240;1m.-. \033[0m",
"\033[38;5;226m ,\\_\033[38;5;240;1m( ). \033[0m", "\033[38;5;226m ,\\_\033[38;5;240;1m( ). \033[0m",
"\033[38;5;226m /\033[38;5;240;1m(___(__) \033[0m", "\033[38;5;226m /\033[38;5;240;1m(___(__) \033[0m",
"\033[38;5;21;1m ‚‘‚‘‚‘‚‘ \033[0m", "\033[38;5;21;1m ‚‘‚‘‚‘‚‘ \033[0m",
"\033[38;5;21;1m ‚’‚’‚’‚’ \033[0m"} "\033[38;5;21;1m ‚’‚’‚’‚’ \033[0m",
}
iconLightSnowShowers = []string{ iconLightSnowShowers = []string{
"\033[38;5;226m _`/\"\"\033[38;5;250m.-. \033[0m", "\033[38;5;226m _`/\"\"\033[38;5;250m.-. \033[0m",
"\033[38;5;226m ,\\_\033[38;5;250m( ). \033[0m", "\033[38;5;226m ,\\_\033[38;5;250m( ). \033[0m",
"\033[38;5;226m /\033[38;5;250m(___(__) \033[0m", "\033[38;5;226m /\033[38;5;250m(___(__) \033[0m",
"\033[38;5;255m * * * \033[0m", "\033[38;5;255m * * * \033[0m",
"\033[38;5;255m * * * \033[0m"} "\033[38;5;255m * * * \033[0m",
}
iconHeavySnowShowers = []string{ iconHeavySnowShowers = []string{
"\033[38;5;226m _`/\"\"\033[38;5;240;1m.-. \033[0m", "\033[38;5;226m _`/\"\"\033[38;5;240;1m.-. \033[0m",
"\033[38;5;226m ,\\_\033[38;5;240;1m( ). \033[0m", "\033[38;5;226m ,\\_\033[38;5;240;1m( ). \033[0m",
"\033[38;5;226m /\033[38;5;240;1m(___(__) \033[0m", "\033[38;5;226m /\033[38;5;240;1m(___(__) \033[0m",
"\033[38;5;255;1m * * * * \033[0m", "\033[38;5;255;1m * * * * \033[0m",
"\033[38;5;255;1m * * * * \033[0m"} "\033[38;5;255;1m * * * * \033[0m",
}
iconLightSleetShowers = []string{ iconLightSleetShowers = []string{
"\033[38;5;226m _`/\"\"\033[38;5;250m.-. \033[0m", "\033[38;5;226m _`/\"\"\033[38;5;250m.-. \033[0m",
"\033[38;5;226m ,\\_\033[38;5;250m( ). \033[0m", "\033[38;5;226m ,\\_\033[38;5;250m( ). \033[0m",
"\033[38;5;226m /\033[38;5;250m(___(__) \033[0m", "\033[38;5;226m /\033[38;5;250m(___(__) \033[0m",
"\033[38;5;111m ‘ \033[38;5;255m*\033[38;5;111m ‘ \033[38;5;255m* \033[0m", "\033[38;5;111m ‘ \033[38;5;255m*\033[38;5;111m ‘ \033[38;5;255m* \033[0m",
"\033[38;5;255m *\033[38;5;111m ‘ \033[38;5;255m*\033[38;5;111m ‘ \033[0m"} "\033[38;5;255m *\033[38;5;111m ‘ \033[38;5;255m*\033[38;5;111m ‘ \033[0m",
}
iconThunderyShowers = []string{ iconThunderyShowers = []string{
"\033[38;5;226m _`/\"\"\033[38;5;250m.-. \033[0m", "\033[38;5;226m _`/\"\"\033[38;5;250m.-. \033[0m",
"\033[38;5;226m ,\\_\033[38;5;250m( ). \033[0m", "\033[38;5;226m ,\\_\033[38;5;250m( ). \033[0m",
"\033[38;5;226m /\033[38;5;250m(___(__) \033[0m", "\033[38;5;226m /\033[38;5;250m(___(__) \033[0m",
"\033[38;5;228;5m ⚡\033[38;5;111;25m‘‘\033[38;5;228;5m⚡\033[38;5;111;25m‘‘ \033[0m", "\033[38;5;228;5m ⚡\033[38;5;111;25m‘‘\033[38;5;228;5m⚡\033[38;5;111;25m‘‘ \033[0m",
"\033[38;5;111m ‘ ‘ ‘ ‘ \033[0m"} "\033[38;5;111m ‘ ‘ ‘ ‘ \033[0m",
}
iconThunderyHeavyRain = []string{ iconThunderyHeavyRain = []string{
"\033[38;5;240;1m .-. \033[0m", "\033[38;5;240;1m .-. \033[0m",
"\033[38;5;240;1m ( ). \033[0m", "\033[38;5;240;1m ( ). \033[0m",
"\033[38;5;240;1m (___(__) \033[0m", "\033[38;5;240;1m (___(__) \033[0m",
"\033[38;5;21;1m ‚‘\033[38;5;228;5m⚡\033[38;5;21;25m‘‚\033[38;5;228;5m⚡\033[38;5;21;25m‚‘ \033[0m", "\033[38;5;21;1m ‚‘\033[38;5;228;5m⚡\033[38;5;21;25m‘‚\033[38;5;228;5m⚡\033[38;5;21;25m‚‘ \033[0m",
"\033[38;5;21;1m ‚’‚’\033[38;5;228;5m⚡\033[38;5;21;25m’‚’ \033[0m"} "\033[38;5;21;1m ‚’‚’\033[38;5;228;5m⚡\033[38;5;21;25m’‚’ \033[0m",
}
iconThunderySnowShowers = []string{ iconThunderySnowShowers = []string{
"\033[38;5;226m _`/\"\"\033[38;5;250m.-. \033[0m", "\033[38;5;226m _`/\"\"\033[38;5;250m.-. \033[0m",
"\033[38;5;226m ,\\_\033[38;5;250m( ). \033[0m", "\033[38;5;226m ,\\_\033[38;5;250m( ). \033[0m",
"\033[38;5;226m /\033[38;5;250m(___(__) \033[0m", "\033[38;5;226m /\033[38;5;250m(___(__) \033[0m",
"\033[38;5;255m *\033[38;5;228;5m⚡\033[38;5;255;25m*\033[38;5;228;5m⚡\033[38;5;255;25m* \033[0m", "\033[38;5;255m *\033[38;5;228;5m⚡\033[38;5;255;25m*\033[38;5;228;5m⚡\033[38;5;255;25m* \033[0m",
"\033[38;5;255m * * * \033[0m"} "\033[38;5;255m * * * \033[0m",
}
iconLightRain = []string{ iconLightRain = []string{
"\033[38;5;250m .-. \033[0m", "\033[38;5;250m .-. \033[0m",
"\033[38;5;250m ( ). \033[0m", "\033[38;5;250m ( ). \033[0m",
"\033[38;5;250m (___(__) \033[0m", "\033[38;5;250m (___(__) \033[0m",
"\033[38;5;111m ‘ ‘ ‘ ‘ \033[0m", "\033[38;5;111m ‘ ‘ ‘ ‘ \033[0m",
"\033[38;5;111m ‘ ‘ ‘ ‘ \033[0m"} "\033[38;5;111m ‘ ‘ ‘ ‘ \033[0m",
}
iconHeavyRain = []string{ iconHeavyRain = []string{
"\033[38;5;240;1m .-. \033[0m", "\033[38;5;240;1m .-. \033[0m",
"\033[38;5;240;1m ( ). \033[0m", "\033[38;5;240;1m ( ). \033[0m",
"\033[38;5;240;1m (___(__) \033[0m", "\033[38;5;240;1m (___(__) \033[0m",
"\033[38;5;21;1m ‚‘‚‘‚‘‚‘ \033[0m", "\033[38;5;21;1m ‚‘‚‘‚‘‚‘ \033[0m",
"\033[38;5;21;1m ‚’‚’‚’‚’ \033[0m"} "\033[38;5;21;1m ‚’‚’‚’‚’ \033[0m",
}
iconLightSnow = []string{ iconLightSnow = []string{
"\033[38;5;250m .-. \033[0m", "\033[38;5;250m .-. \033[0m",
"\033[38;5;250m ( ). \033[0m", "\033[38;5;250m ( ). \033[0m",
"\033[38;5;250m (___(__) \033[0m", "\033[38;5;250m (___(__) \033[0m",
"\033[38;5;255m * * * \033[0m", "\033[38;5;255m * * * \033[0m",
"\033[38;5;255m * * * \033[0m"} "\033[38;5;255m * * * \033[0m",
}
iconHeavySnow = []string{ iconHeavySnow = []string{
"\033[38;5;240;1m .-. \033[0m", "\033[38;5;240;1m .-. \033[0m",
"\033[38;5;240;1m ( ). \033[0m", "\033[38;5;240;1m ( ). \033[0m",
"\033[38;5;240;1m (___(__) \033[0m", "\033[38;5;240;1m (___(__) \033[0m",
"\033[38;5;255;1m * * * * \033[0m", "\033[38;5;255;1m * * * * \033[0m",
"\033[38;5;255;1m * * * * \033[0m"} "\033[38;5;255;1m * * * * \033[0m",
}
iconLightSleet = []string{ iconLightSleet = []string{
"\033[38;5;250m .-. \033[0m", "\033[38;5;250m .-. \033[0m",
"\033[38;5;250m ( ). \033[0m", "\033[38;5;250m ( ). \033[0m",
"\033[38;5;250m (___(__) \033[0m", "\033[38;5;250m (___(__) \033[0m",
"\033[38;5;111m ‘ \033[38;5;255m*\033[38;5;111m ‘ \033[38;5;255m* \033[0m", "\033[38;5;111m ‘ \033[38;5;255m*\033[38;5;111m ‘ \033[38;5;255m* \033[0m",
"\033[38;5;255m *\033[38;5;111m ‘ \033[38;5;255m*\033[38;5;111m ‘ \033[0m"} "\033[38;5;255m *\033[38;5;111m ‘ \033[38;5;255m*\033[38;5;111m ‘ \033[0m",
}
iconFog = []string{ iconFog = []string{
" ", " ",
"\033[38;5;251m _ - _ - _ - \033[0m", "\033[38;5;251m _ - _ - _ - \033[0m",
"\033[38;5;251m _ - _ - _ \033[0m", "\033[38;5;251m _ - _ - _ \033[0m",
"\033[38;5;251m _ - _ - _ - \033[0m", "\033[38;5;251m _ - _ - _ - \033[0m",
" "} " ",
}
codes = map[int][]string{ codes = map[int][]string{
113: iconSunny, 113: iconSunny,

26
internal/view/v1/locale.go
Unescape View File

@ -229,65 +229,65 @@ var (
} }
localizedRain = map[string]map[bool]string{ localizedRain = map[string]map[bool]string{
"en": map[bool]string{ "en": {
false: "mm", false: "mm",
true: "in", true: "in",
}, },
"be": map[bool]string{ "be": {
false: "мм", false: "мм",
true: "in", true: "in",
}, },
"ru": map[bool]string{ "ru": {
false: "мм", false: "мм",
true: "in", true: "in",
}, },
"uk": map[bool]string{ "uk": {
false: "мм", false: "мм",
true: "in", true: "in",
}, },
} }
localizedVis = map[string]map[bool]string{ localizedVis = map[string]map[bool]string{
"en": map[bool]string{ "en": {
false: "km", false: "km",
true: "mi", true: "mi",
}, },
"be": map[bool]string{ "be": {
false: "км", false: "км",
true: "mi", true: "mi",
}, },
"ru": map[bool]string{ "ru": {
false: "км", false: "км",
true: "mi", true: "mi",
}, },
"uk": map[bool]string{ "uk": {
false: "км", false: "км",
true: "mi", true: "mi",
}, },
} }
localizedWind = map[string]map[int]string{ localizedWind = map[string]map[int]string{
"en": map[int]string{ "en": {
0: "km/h", 0: "km/h",
1: "mph", 1: "mph",
2: "m/s", 2: "m/s",
}, },
"be": map[int]string{ "be": {
0: "км/г", 0: "км/г",
1: "mph", 1: "mph",
2: "м/c", 2: "м/c",
}, },
"ru": map[int]string{ "ru": {
0: "км/ч", 0: "км/ч",
1: "mph", 1: "mph",
2: "м/c", 2: "м/c",
}, },
"tr": map[int]string{ "tr": {
0: "km/sa", 0: "km/sa",
1: "mph", 1: "mph",
2: "m/s", 2: "m/s",
}, },
"uk": map[int]string{ "uk": {
0: "км/год", 0: "км/год",
1: "mph", 1: "mph",
2: "м/c", 2: "м/c",

10
internal/view/v1/view1.go
Unescape View File

@ -7,9 +7,7 @@ import (
"github.com/klauspost/lctime" "github.com/klauspost/lctime"
) )
var ( var slotTimes = [slotcount]int{9 * 60, 12 * 60, 18 * 60, 22 * 60}
slotTimes = [slotcount]int{9 * 60, 12 * 60, 18 * 60, 22 * 60}
)
func printDay(w weather) (ret []string) { func printDay(w weather) (ret []string) {
hourly := w.Hourly hourly := w.Hourly
@ -97,7 +95,8 @@ func printDay(w weather) (ret []string) {
" ┌─────────────┐ ", " ┌─────────────┐ ",
"┌───────────────────────" + dateFmt + "───────────────────────┐", "┌───────────────────────" + dateFmt + "───────────────────────┐",
names, names,
"├──────────────────────────────┼──────────────────────────────┤"}, "├──────────────────────────────┼──────────────────────────────┤",
},
ret...) ret...)
return append(ret, return append(ret,
@ -118,7 +117,8 @@ func printDay(w weather) (ret []string) {
" ┌─────────────┐ ", " ┌─────────────┐ ",
"┌──────────────────────────────┬───────────────────────" + dateFmt + "───────────────────────┬──────────────────────────────┐", "┌──────────────────────────────┬───────────────────────" + dateFmt + "───────────────────────┬──────────────────────────────┐",
names, names,
"├──────────────────────────────┼──────────────────────────────┼──────────────────────────────┼──────────────────────────────┤"}, "├──────────────────────────────┼──────────────────────────────┼──────────────────────────────┼──────────────────────────────┤",
},
ret...) ret...)
return append(ret, return append(ret,

4
srv.go
Unescape View File

@ -17,7 +17,7 @@ import (
"github.com/chubin/wttr.in/internal/logging" "github.com/chubin/wttr.in/internal/logging"
"github.com/chubin/wttr.in/internal/processor" "github.com/chubin/wttr.in/internal/processor"
"github.com/chubin/wttr.in/internal/types" "github.com/chubin/wttr.in/internal/types"
"github.com/chubin/wttr.in/internal/view/v1" v1 "github.com/chubin/wttr.in/internal/view/v1"
) )
//nolint:gochecknoglobals //nolint:gochecknoglobals
@ -31,7 +31,7 @@ var cli struct {
GeoResolve string `name:"geo-resolve" help:"Resolve location"` GeoResolve string `name:"geo-resolve" help:"Resolve location"`
LogLevel string `name:"log-level" short:"l" help:"Show log messages with level" default:"info"` LogLevel string `name:"log-level" short:"l" help:"Show log messages with level" default:"info"`
V1 struct v1.Configuration V1 v1.Configuration
} }
const logLineStart = "LOG_LINE_START " const logLineStart = "LOG_LINE_START "

Write Preview
Loading…
Cancel
Save