diff options
| -rw-r--r-- | main.go | 18 | ||||
| -rw-r--r-- | setup.go | 6 |
2 files changed, 9 insertions, 15 deletions
@@ -149,17 +149,13 @@ func (m model) View() string { } func formatDefinitionForDisplay(policy bluemonday.Policy, definition string) string { - return wordwrap.String( - strings.ReplaceAll( - whitespaceTrimmerRe.ReplaceAllLiteralString( - policy.Sanitize(definition), - "", - ), - "\n\n", - "\n", - ), - 72, - ) + str := strings.ReplaceAll(definition, "<li class=sense>", "<li class=sense>- ") + str = strings.ReplaceAll(str, "\t<ul><li><i>", "\n\t<ul><li><i>\x1b[3;39;49m") + str = strings.ReplaceAll(str, "</i></li></ul></li>", "</i></li></ul></li>\x1b[0m") + str = policy.Sanitize(str) + str = strings.ReplaceAll(str, "\t- ", "\x1b[0;33;49m•\x1b[0m ") + + return wordwrap.String(str, 72) } func formatStatus(lastError error, lastSuccess string) string { @@ -91,10 +91,8 @@ func populateDictionary(db *sql.DB) error { tmpl, err := template.New("entry").Parse( `<p>{{ .Word }} {{ .Sound }} <i>{{ .POS }} {{ .Gender }}</i></p> <ol>{{ range .Senses}} - <li>{{ .Sense }}<br> - {{ if .Example }} - <ul><li><i>{{ .Example }}</i></li></ul></li> - {{ end }} + <li class=sense>{{ .Sense }}<br> + {{ if .Example }}<ul><li><i>{{ .Example }}</i></li></ul></li>{{ end }} {{ end }}</ol>`) if err != nil { panic(err) |