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

Merge branch 'cyingfan-master'

Browse Source
This commit is contained in:
Chris Cummer 2020-10-03 05:58:44 -07:00
commit c1f7e3acc9
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/feedreader/widget.go
View File

@ -58,7 +58,7 @@ func getShowText(feedItem *FeedItem, showType ShowType) string {
returnValue = feedItem.item.Link returnValue = feedItem.item.Link
case SHOW_CONTENT: case SHOW_CONTENT:
text, _ := html2text.FromString(feedItem.item.Content, html2text.Options{PrettyTables: true}) text, _ := html2text.FromString(feedItem.item.Content, html2text.Options{PrettyTables: true})
returnValue = feedItem.item.Title + "\n" + strings.TrimSpace(text) returnValue = strings.TrimSpace(feedItem.item.Title + "\n" + strings.TrimSpace(text))
} }
return returnValue return returnValue
} }
@ -192,7 +192,9 @@ func (widget *Widget) content() (string, string, bool) {
// feedItems are sorted by published date // feedItems are sorted by published date
func (widget *Widget) sort(feedItems []*FeedItem) []*FeedItem { func (widget *Widget) sort(feedItems []*FeedItem) []*FeedItem {
sort.Slice(feedItems, func(i, j int) bool { sort.Slice(feedItems, func(i, j int) bool {
return feedItems[i].item.PublishedParsed.After(*feedItems[j].item.PublishedParsed) return feedItems[i].item.PublishedParsed != nil &&
feedItems[j].item.PublishedParsed != nil &&
feedItems[i].item.PublishedParsed.After(*feedItems[j].item.PublishedParsed)
}) })
return feedItems return feedItems

4
view/text_widget.go
View File

@ -1,6 +1,8 @@
package view package view
import ( import (
"strings"
"github.com/rivo/tview" "github.com/rivo/tview"
"github.com/wtfutil/wtf/cfg" "github.com/wtfutil/wtf/cfg"
"github.com/wtfutil/wtf/wtf" "github.com/wtfutil/wtf/wtf"
@ -36,7 +38,7 @@ func (widget *TextWidget) Redraw(data func() (string, string, bool)) {
widget.View.Clear() widget.View.Clear()
widget.View.SetWrap(wrap) widget.View.SetWrap(wrap)
widget.View.SetTitle(widget.ContextualTitle(title)) widget.View.SetTitle(widget.ContextualTitle(title))
widget.View.SetText(content) widget.View.SetText(strings.TrimSpace(content))
}) })
} }