taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Minor improvements to the IPInfo widget display

Browse Source
This commit is contained in:
Chris Cummer 2018-08-03 05:16:43 -07:00
parent 9c3ff8890a
commit 6a7c07eddc
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clocks/display.go
View File

@ -12,7 +12,7 @@ func (widget *Widget) display(clocks []Clock) {
return return
} }
str := "\n" str := ""
for idx, clock := range clocks { for idx, clock := range clocks {
str = str + fmt.Sprintf( str = str + fmt.Sprintf(
" [%s]%-12s %-10s %7s[white]\n", " [%s]%-12s %-10s %7s[white]\n",

14
ipaddresses/ipinfo/widget.go
View File

@ -78,21 +78,19 @@ func (widget *Widget) ipinfo() {
// read module configs // read module configs
func (widget *Widget) config() { func (widget *Widget) config() {
nameColor, valueColor := wtf.Config.UString("wtf.mods.ipinfo.colors.name", "red"), wtf.Config.UString("wtf.mods.ipinfo.colors.value", "white") widget.colors.name = wtf.Config.UString("wtf.mods.ipinfo.colors.name", "white")
widget.colors.name = nameColor widget.colors.value = wtf.Config.UString("wtf.mods.ipinfo.colors.value", "white")
widget.colors.value = valueColor
} }
func (widget *Widget) setResult(info *ipinfo) { func (widget *Widget) setResult(info *ipinfo) {
resultTemplate, _ := template.New("ipinfo_result").Parse( resultTemplate, _ := template.New("ipinfo_result").Parse(
formatableText("IP Address", "Ip") + formatableText("IP", "Ip") +
formatableText("Hostname", "Hostname") + formatableText("Hostname", "Hostname") +
formatableText("City", "City") + formatableText("City", "City") +
formatableText("Region", "Region") + formatableText("Region", "Region") +
formatableText("Country", "Country") + formatableText("Country", "Country") +
formatableText("Coordinates", "Coordinates") + formatableText("Coords", "Coordinates") +
formatableText("Postal Code", "PostalCode") + formatableText("Org", "Organization"),
formatableText("Organization", "Organization"),
) )
resultBuffer := new(bytes.Buffer) resultBuffer := new(bytes.Buffer)
@ -114,5 +112,5 @@ func (widget *Widget) setResult(info *ipinfo) {
} }
func formatableText(key, value string) string { func formatableText(key, value string) string {
return fmt.Sprintf(" [{{.nameColor}}]%s: [{{.valueColor}}]{{.%s}}\n", key, value) return fmt.Sprintf(" [{{.nameColor}}]%8s: [{{.valueColor}}]{{.%s}}\n", key, value)
} }