checkpoint: process unordered lists
This commit is contained in:
parent
5cf6116fe8
commit
ffc40d5165
4 changed files with 23 additions and 14 deletions
|
@ -88,7 +88,7 @@ func (a Account) Display(noColor bool) string {
|
||||||
metadata += fmt.Sprintf(
|
metadata += fmt.Sprintf(
|
||||||
"\n %s: %s",
|
"\n %s: %s",
|
||||||
utilities.FieldFormat(noColor, field.Name),
|
utilities.FieldFormat(noColor, field.Name),
|
||||||
utilities.StripHTMLTags(field.Value),
|
utilities.ConvertHTMLToText(field.Value),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -105,7 +105,7 @@ func (a Account) Display(noColor bool) string {
|
||||||
utilities.FieldFormat(noColor, "Following:"), a.FollowingCount,
|
utilities.FieldFormat(noColor, "Following:"), a.FollowingCount,
|
||||||
utilities.FieldFormat(noColor, "Statuses:"), a.StatusCount,
|
utilities.FieldFormat(noColor, "Statuses:"), a.StatusCount,
|
||||||
utilities.HeaderFormat(noColor, "BIOGRAPHY:"),
|
utilities.HeaderFormat(noColor, "BIOGRAPHY:"),
|
||||||
utilities.WrapLines(utilities.StripHTMLTags(a.Note), "\n ", 80),
|
utilities.WrapLines(utilities.ConvertHTMLToText(a.Note), "\n ", 80),
|
||||||
utilities.HeaderFormat(noColor, "METADATA:"),
|
utilities.HeaderFormat(noColor, "METADATA:"),
|
||||||
metadata,
|
metadata,
|
||||||
utilities.HeaderFormat(noColor, "ACCOUNT URL:"),
|
utilities.HeaderFormat(noColor, "ACCOUNT URL:"),
|
||||||
|
|
|
@ -180,7 +180,7 @@ func (s Status) Display(noColor bool) string {
|
||||||
format,
|
format,
|
||||||
utilities.DisplayNameFormat(noColor, s.Account.DisplayName), s.Account.Username,
|
utilities.DisplayNameFormat(noColor, s.Account.DisplayName), s.Account.Username,
|
||||||
utilities.HeaderFormat(noColor, "CONTENT:"),
|
utilities.HeaderFormat(noColor, "CONTENT:"),
|
||||||
utilities.WrapLines(utilities.StripHTMLTags(s.Content), "\n ", 80),
|
utilities.WrapLines(utilities.ConvertHTMLToText(s.Content), "\n ", 80),
|
||||||
utilities.HeaderFormat(noColor, "STATUS ID:"),
|
utilities.HeaderFormat(noColor, "STATUS ID:"),
|
||||||
s.ID,
|
s.ID,
|
||||||
utilities.HeaderFormat(noColor, "CREATED AT:"),
|
utilities.HeaderFormat(noColor, "CREATED AT:"),
|
||||||
|
|
|
@ -30,7 +30,7 @@ func (t Timeline) Display(noColor bool) string {
|
||||||
createdAt = status.Reblog.CreatedAt
|
createdAt = status.Reblog.CreatedAt
|
||||||
}
|
}
|
||||||
|
|
||||||
builder.WriteString(utilities.WrapLines(utilities.StripHTMLTags(status.Content), "\n", 80) + "\n\n")
|
builder.WriteString(utilities.WrapLines(utilities.ConvertHTMLToText(status.Content), "\n", 80) + "\n\n")
|
||||||
builder.WriteString(utilities.FieldFormat(noColor, "ID:") + " " + statusID + "\t" + utilities.FieldFormat(noColor, "Created at:") + " " + utilities.FormatTime(createdAt) + "\n")
|
builder.WriteString(utilities.FieldFormat(noColor, "ID:") + " " + statusID + "\t" + utilities.FieldFormat(noColor, "Created at:") + " " + utilities.FormatTime(createdAt) + "\n")
|
||||||
builder.WriteString(separator + "\n")
|
builder.WriteString(separator + "\n")
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,16 +1,19 @@
|
||||||
package utilities
|
package utilities
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"io"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"golang.org/x/net/html"
|
"golang.org/x/net/html"
|
||||||
)
|
)
|
||||||
|
|
||||||
func StripHTMLTags(text string) string {
|
func ConvertHTMLToText(text string) string {
|
||||||
token := html.NewTokenizer(strings.NewReader(text))
|
|
||||||
|
|
||||||
var builder strings.Builder
|
var builder strings.Builder
|
||||||
|
|
||||||
|
var unorderedList bool
|
||||||
|
|
||||||
|
token := html.NewTokenizer(strings.NewReader(text))
|
||||||
|
|
||||||
for {
|
for {
|
||||||
tt := token.Next()
|
tt := token.Next()
|
||||||
switch tt {
|
switch tt {
|
||||||
|
@ -21,18 +24,24 @@ func StripHTMLTags(text string) string {
|
||||||
builder.WriteString(text)
|
builder.WriteString(text)
|
||||||
case html.StartTagToken, html.EndTagToken:
|
case html.StartTagToken, html.EndTagToken:
|
||||||
tag := token.Token().String()
|
tag := token.Token().String()
|
||||||
builder.WriteString(transformTag(tag))
|
unorderedList = processTag(&builder, tag, unorderedList)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func transformTag(tag string) string {
|
func processTag(writer io.StringWriter, tag string, unorderedList bool) bool {
|
||||||
switch tag {
|
switch tag {
|
||||||
case "<br>":
|
case "<br>", "<p>", "</p>", "</li>":
|
||||||
return "\n"
|
_, _ = writer.WriteString("\n")
|
||||||
case "<p>", "</p>":
|
case "<ul>":
|
||||||
return "\n"
|
unorderedList = true
|
||||||
|
case "</ul>":
|
||||||
|
unorderedList = false
|
||||||
|
case "<li>":
|
||||||
|
if unorderedList {
|
||||||
|
_, _ = writer.WriteString("• ")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return ""
|
return unorderedList
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue