|
|
|
@ -548,13 +548,15 @@ func pad(s string, mustLen int) (ret string) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func formatTemp(c cond) string {
|
|
|
|
func formatTemp(c cond) string {
|
|
|
|
color := func(temp int, explicit_plus bool) string {
|
|
|
|
color := func(temp int, explicitPlus bool) string {
|
|
|
|
var col = 0
|
|
|
|
var col = 0
|
|
|
|
if !config.Inverse {
|
|
|
|
if !config.Inverse {
|
|
|
|
col = 21
|
|
|
|
// Extemely cold temperature must be shown with violet
|
|
|
|
|
|
|
|
// because dark blue is too dark
|
|
|
|
|
|
|
|
col = 165
|
|
|
|
switch temp {
|
|
|
|
switch temp {
|
|
|
|
case -15, -14, -13:
|
|
|
|
case -15, -14, -13:
|
|
|
|
col = 27
|
|
|
|
col = 171
|
|
|
|
case -12, -11, -10:
|
|
|
|
case -12, -11, -10:
|
|
|
|
col = 33
|
|
|
|
col = 33
|
|
|
|
case -9, -8, -7:
|
|
|
|
case -9, -8, -7:
|
|
|
|
@ -646,11 +648,10 @@ func formatTemp(c cond) string {
|
|
|
|
if config.Imperial {
|
|
|
|
if config.Imperial {
|
|
|
|
temp = (temp*18 + 320) / 10
|
|
|
|
temp = (temp*18 + 320) / 10
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if explicit_plus {
|
|
|
|
if explicitPlus {
|
|
|
|
return fmt.Sprintf("\033[38;5;%03dm+%d\033[0m", col, temp)
|
|
|
|
return fmt.Sprintf("\033[38;5;%03dm+%d\033[0m", col, temp)
|
|
|
|
} else {
|
|
|
|
|
|
|
|
return fmt.Sprintf("\033[38;5;%03dm%d\033[0m", col, temp)
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return fmt.Sprintf("\033[38;5;%03dm%d\033[0m", col, temp)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
t := c.TempC
|
|
|
|
t := c.TempC
|
|
|
|
if t == 0 {
|
|
|
|
if t == 0 {
|
|
|
|
@ -663,17 +664,17 @@ func formatTemp(c cond) string {
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
hyphen = ".."
|
|
|
|
hyphen = ".."
|
|
|
|
|
|
|
|
|
|
|
|
explicit_plus := false
|
|
|
|
explicitPlus := false
|
|
|
|
if c.FeelsLikeC < t {
|
|
|
|
if c.FeelsLikeC < t {
|
|
|
|
if c.FeelsLikeC < 0 && t > 0 {
|
|
|
|
if c.FeelsLikeC < 0 && t > 0 {
|
|
|
|
explicit_plus = true
|
|
|
|
explicitPlus = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return pad(fmt.Sprintf("%s%s%s °%s", color(c.FeelsLikeC, false), hyphen, color(t, explicit_plus), unitTemp[config.Imperial]), 15)
|
|
|
|
return pad(fmt.Sprintf("%s%s%s °%s", color(c.FeelsLikeC, false), hyphen, color(t, explicitPlus), unitTemp[config.Imperial]), 15)
|
|
|
|
} else if c.FeelsLikeC > t {
|
|
|
|
} else if c.FeelsLikeC > t {
|
|
|
|
if t < 0 && c.FeelsLikeC > 0 {
|
|
|
|
if t < 0 && c.FeelsLikeC > 0 {
|
|
|
|
explicit_plus = true
|
|
|
|
explicitPlus = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return pad(fmt.Sprintf("%s%s%s °%s", color(t, false), hyphen, color(c.FeelsLikeC, explicit_plus), unitTemp[config.Imperial]), 15)
|
|
|
|
return pad(fmt.Sprintf("%s%s%s °%s", color(t, false), hyphen, color(c.FeelsLikeC, explicitPlus), unitTemp[config.Imperial]), 15)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return pad(fmt.Sprintf("%s °%s", color(c.FeelsLikeC, false), unitTemp[config.Imperial]), 15)
|
|
|
|
return pad(fmt.Sprintf("%s °%s", color(c.FeelsLikeC, false), unitTemp[config.Imperial]), 15)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -735,8 +736,8 @@ func formatWind(c cond) string {
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
hyphen = "-"
|
|
|
|
hyphen = "-"
|
|
|
|
|
|
|
|
|
|
|
|
cWindGustKmph := fmt.Sprintf("%s", color(c.WindGustKmph))
|
|
|
|
cWindGustKmph := color(c.WindGustKmph)
|
|
|
|
cWindspeedKmph := fmt.Sprintf("%s", color(c.WindspeedKmph))
|
|
|
|
cWindspeedKmph := color(c.WindspeedKmph)
|
|
|
|
if windInRightUnits(c.WindGustKmph) > windInRightUnits(c.WindspeedKmph) {
|
|
|
|
if windInRightUnits(c.WindGustKmph) > windInRightUnits(c.WindspeedKmph) {
|
|
|
|
return pad(fmt.Sprintf("%s %s%s%s %s", windDir[c.Winddir16Point], cWindspeedKmph, hyphen, cWindGustKmph, unitWindString), 15)
|
|
|
|
return pad(fmt.Sprintf("%s %s%s%s %s", windDir[c.Winddir16Point], cWindspeedKmph, hyphen, cWindGustKmph, unitWindString), 15)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -770,7 +771,7 @@ func formatCond(cur []string, c cond, current bool) (ret []string) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if config.Inverse {
|
|
|
|
if config.Inverse {
|
|
|
|
// inverting colors
|
|
|
|
// inverting colors
|
|
|
|
for i, _ := range icon {
|
|
|
|
for i := range icon {
|
|
|
|
icon[i] = strings.Replace(icon[i], "38;5;226", "38;5;94", -1)
|
|
|
|
icon[i] = strings.Replace(icon[i], "38;5;226", "38;5;94", -1)
|
|
|
|
icon[i] = strings.Replace(icon[i], "38;5;250", "38;5;243", -1)
|
|
|
|
icon[i] = strings.Replace(icon[i], "38;5;250", "38;5;243", -1)
|
|
|
|
icon[i] = strings.Replace(icon[i], "38;5;21", "38;5;18", -1)
|
|
|
|
icon[i] = strings.Replace(icon[i], "38;5;21", "38;5;18", -1)
|
|
|
|
@ -787,7 +788,7 @@ func formatCond(cur []string, c cond, current bool) (ret []string) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for runewidth.StringWidth(desc) > 15 {
|
|
|
|
for runewidth.StringWidth(desc) > 15 {
|
|
|
|
_, size := utf8.DecodeLastRuneInString(desc)
|
|
|
|
_, size := utf8.DecodeLastRuneInString(desc)
|
|
|
|
desc = desc[size:len(desc)]
|
|
|
|
desc = desc[size:]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
for runewidth.StringWidth(desc) < 15 {
|
|
|
|
for runewidth.StringWidth(desc) < 15 {
|
|
|
|
@ -810,7 +811,7 @@ func formatCond(cur []string, c cond, current bool) (ret []string) {
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
if config.RightToLeft {
|
|
|
|
if config.RightToLeft {
|
|
|
|
if frstRune, size := utf8.DecodeRuneInString(desc); frstRune != ' ' {
|
|
|
|
if frstRune, size := utf8.DecodeRuneInString(desc); frstRune != ' ' {
|
|
|
|
desc = "…" + desc[size:len(desc)]
|
|
|
|
desc = "…" + desc[size:]
|
|
|
|
for runewidth.StringWidth(desc) < 15 {
|
|
|
|
for runewidth.StringWidth(desc) < 15 {
|
|
|
|
desc = " " + desc
|
|
|
|
desc = " " + desc
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -955,28 +956,26 @@ func printDay(w weather) (ret []string) {
|
|
|
|
return append(ret,
|
|
|
|
return append(ret,
|
|
|
|
"└──────────────────────────────┴──────────────────────────────┘")
|
|
|
|
"└──────────────────────────────┴──────────────────────────────┘")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
names := ""
|
|
|
|
|
|
|
|
if config.RightToLeft {
|
|
|
|
|
|
|
|
names = "│" + justifyCenter(trans[3], 29) + "│ " + justifyCenter(trans[2], 16) +
|
|
|
|
|
|
|
|
"└──────┬──────┘" + justifyCenter(trans[1], 16) + " │" + justifyCenter(trans[0], 29) + "│"
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
|
|
|
|
names = "│" + justifyCenter(trans[0], 29) + "│ " + justifyCenter(trans[1], 16) +
|
|
|
|
|
|
|
|
"└──────┬──────┘" + justifyCenter(trans[2], 16) + " │" + justifyCenter(trans[3], 29) + "│"
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
names := ""
|
|
|
|
ret = append([]string{
|
|
|
|
if config.RightToLeft {
|
|
|
|
" ┌─────────────┐ ",
|
|
|
|
names = "│" + justifyCenter(trans[3], 29) + "│ " + justifyCenter(trans[2], 16) +
|
|
|
|
"┌──────────────────────────────┬───────────────────────" + dateFmt + "───────────────────────┬──────────────────────────────┐",
|
|
|
|
"└──────┬──────┘" + justifyCenter(trans[1], 16) + " │" + justifyCenter(trans[0], 29) + "│"
|
|
|
|
names,
|
|
|
|
} else {
|
|
|
|
"├──────────────────────────────┼──────────────────────────────┼──────────────────────────────┼──────────────────────────────┤"},
|
|
|
|
names = "│" + justifyCenter(trans[0], 29) + "│ " + justifyCenter(trans[1], 16) +
|
|
|
|
ret...)
|
|
|
|
"└──────┬──────┘" + justifyCenter(trans[2], 16) + " │" + justifyCenter(trans[3], 29) + "│"
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ret = append([]string{
|
|
|
|
return append(ret,
|
|
|
|
" ┌─────────────┐ ",
|
|
|
|
"└──────────────────────────────┴──────────────────────────────┴──────────────────────────────┴──────────────────────────────┘")
|
|
|
|
"┌──────────────────────────────┬───────────────────────" + dateFmt + "───────────────────────┬──────────────────────────────┐",
|
|
|
|
|
|
|
|
names,
|
|
|
|
|
|
|
|
"├──────────────────────────────┼──────────────────────────────┼──────────────────────────────┼──────────────────────────────┤"},
|
|
|
|
|
|
|
|
ret...)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return append(ret,
|
|
|
|
|
|
|
|
"└──────────────────────────────┴──────────────────────────────┴──────────────────────────────┴──────────────────────────────┘")
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func unmarshalLang(body []byte, r *resp) error {
|
|
|
|
func unmarshalLang(body []byte, r *resp) error {
|
|
|
|
@ -1031,10 +1030,9 @@ func unmarshalLang(body []byte, r *resp) error {
|
|
|
|
var buf bytes.Buffer
|
|
|
|
var buf bytes.Buffer
|
|
|
|
if err := json.NewEncoder(&buf).Encode(rv); err != nil {
|
|
|
|
if err := json.NewEncoder(&buf).Encode(rv); err != nil {
|
|
|
|
return err
|
|
|
|
return err
|
|
|
|
} else {
|
|
|
|
}
|
|
|
|
if err = json.NewDecoder(&buf).Decode(r); err != nil {
|
|
|
|
if err := json.NewDecoder(&buf).Decode(r); err != nil {
|
|
|
|
return err
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -1084,7 +1082,7 @@ func getDataFromAPI() (ret resp) {
|
|
|
|
var out bytes.Buffer
|
|
|
|
var out bytes.Buffer
|
|
|
|
json.Indent(&out, body, "", " ")
|
|
|
|
json.Indent(&out, body, "", " ")
|
|
|
|
out.WriteTo(os.Stderr)
|
|
|
|
out.WriteTo(os.Stderr)
|
|
|
|
fmt.Println("\n")
|
|
|
|
fmt.Print("\n\n")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if config.Lang == "" {
|
|
|
|
if config.Lang == "" {
|
|
|
|
|
Igor Chubin
4 years ago