Merge branch 'unicode'

Officially add UTF-8 support go podbit, along with fixes for rune
splitting and corrupted text encodings at table edges.

Podbit now depends on libncursesw and the ncursesw wrapper for Go. Your
system must support POSIX locales in order to use this support
correctly. You must also have the wide character version of libncurses
installed (-lncursesw).

Author: ejv2

README.md

@@ -22,7 +22,7 @@ Podbit runs on Linux and the BSDs.
 
 Podbit is written in Go. So, to build, you will need a copy of the Go command line tool. In addition, you will need:
 
-* *ncurses* development libraries and headers
+* *ncurses* development libraries and headers, including wide character support (*libncusesw*)
 * A normal install of ``mpv``
 * A copy of GNU Make
 * Newsboat to enqueue podcasts - *(optional)*

colors/colors.go

@@ -1,7 +1,7 @@
 package colors
 
 import (
-	"github.com/rthornton128/goncurses"
+	"github.com/vit1251/go-ncursesw"
 )
 
 // Color pair ID definitions.

data/cache.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/dhowden/tag"
-	"github.com/ethanv2/podbit/data/escape"
+
 	ev "github.com/ethanv2/podbit/event"
 )
 
@@ -139,9 +139,9 @@ func (c *Cache) loadFile(path string, startup bool) {
 
 	ep := Episode{
 		Queued: !startup,
-		Title:  escape.Escape(data.Title()),
+		Title:  data.Title(),
 		Date:   data.Year(),
-		Host:   escape.Escape(host),
+		Host:   host,
 	}
 
 	c.episodes.Store(path, ep)

data/data.go

@@ -122,6 +122,21 @@ func IsURL(check string) bool {
 	return err == nil && u.Scheme != "" && u.Host != ""
 }
 
+// LimitString limits a UTF-8 string to max visible runes, showing the full
+// string if it is shorter than max. If max is negative or zero, an empty
+// string is returned.
+func LimitString(in string, max int) string {
+	r := []rune(in)
+	if max <= 0 {
+		return ""
+	}
+	if max > len(r) {
+		return in
+	}
+
+	return string(r[:max])
+}
+
 // FormatTime formats a time measured in seconds.
 func FormatTime(seconds float64) string {
 	round := int(seconds)

data/escape/escape.go

@@ -13,6 +13,9 @@
 // valid UTF-8.
 //
 // Data sourced from http://homoglyphs.net/
+//
+// Deprecated: This library is not for use. You should really just support
+// UTF-8 instead.
 package escape
 
 // Convertibles are runes which should be converted from the map key to the map

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/blang/mpv v0.0.0-20160810175505-d56d7352e068
 	github.com/dhowden/tag v0.0.0-20201120070457-d52dcb253c63
 	github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b
-	github.com/rthornton128/goncurses v0.0.0-20210908011339-931b33a34c71
+	github.com/vit1251/go-ncursesw v0.0.0-20211216195139-e61a3c4242a5
 	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
 )
 

go.sum

@@ -9,8 +9,8 @@ github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/rthornton128/goncurses v0.0.0-20210908011339-931b33a34c71 h1:1lA/ljJAwqsNo7HHUG7M4XY9dkp6aYnnW5Tglh7bEgA=
-github.com/rthornton128/goncurses v0.0.0-20210908011339-931b33a34c71/go.mod h1:AHlKFomPTwmO7H2vL8d7VNrQNQmhMi/DBhDnHRhjbCo=
+github.com/vit1251/go-ncursesw v0.0.0-20211216195139-e61a3c4242a5 h1:38QNnaytR3Mhq0YO05IBNMImfFYQB2Tk5Ct/V1MWOwI=
+github.com/vit1251/go-ncursesw v0.0.0-20211216195139-e61a3c4242a5/go.mod h1:gTXTX4x80o63QC2qsY+NdlLgj+eiWKMwsY2YMZe6e44=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

main.go

@@ -13,7 +13,7 @@ import (
 	"github.com/ethanv2/podbit/ui"
 
 	"github.com/juju/fslock"
-	"github.com/rthornton128/goncurses"
+	"github.com/vit1251/go-ncursesw"
 )
 
 const (

ui/components/menu.go

@@ -2,7 +2,7 @@ package components
 
 import (
 	"github.com/ethanv2/podbit/colors"
-	"github.com/rthornton128/goncurses"
+	"github.com/vit1251/go-ncursesw"
 )
 
 // Menu represents a vertical panel menu of cellular entries
@@ -48,14 +48,13 @@ func (m *Menu) Render() {
 			break
 		}
 
-		var capped string
-		capped = elem
-		if len(capped) > m.W {
-			capped = capped[len(capped)-m.W:]
+		capped, decode := elem, []rune(elem)
+		if len(decode) > m.W {
+			capped = string(decode[len(decode)-m.W:])
 			capped = "<" + capped
 		} else {
 			// Pad out to fill row
-			for i := len(capped); i <= m.W; i++ {
+			for i := len(decode); i <= m.W; i++ {
 				capped += " "
 			}
 		}

ui/components/table.go

@@ -2,8 +2,9 @@ package components
 
 import (
 	"github.com/ethanv2/podbit/colors"
+	"github.com/ethanv2/podbit/data"
 
-	"github.com/rthornton128/goncurses"
+	"github.com/vit1251/go-ncursesw"
 )
 
 // A Column is a vertical section of a table, defined by a
@@ -71,9 +72,7 @@ func (t *Table) Render() {
 			panic("invalid table header: impossible column width")
 		}
 
-		if len(elem.Label) > colw {
-			elem.Label = elem.Label[:colw]
-		}
+		elem.Label = data.LimitString(elem.Label, colw)
 
 		t.Win.AttrOn(goncurses.A_BOLD)
 		t.Win.MovePrint(t.Y, t.X+off, elem.Label)
@@ -90,13 +89,11 @@ func (t *Table) Render() {
 			capped := entry[i]
 			sel := c == t.sel
 
-			if len(capped) > colw {
-				// Trim to fit row
-				capped = capped[:colw-1]
-			}
+			capped = data.LimitString(capped, colw-1)
+			decode := []rune(capped)
 
 			// Pad out to fill row
-			for i := len(capped); i <= colw && off+len(capped) < t.W; i++ {
+			for i := len(decode); i < colw && off+len(decode) < t.W; i++ {
 				capped += " "
 			}