diff --git a/app/wtf_app.go b/app/wtf_app.go index 39e0c50d3..6d1f1cb94 100644 --- a/app/wtf_app.go +++ b/app/wtf_app.go @@ -6,8 +6,8 @@ import ( "os" "time" - "github.com/gdamore/tcell" _ "github.com/gdamore/tcell/terminfo/extended" + "github.com/gdamore/tcell/v2" "github.com/logrusorgru/aurora" "github.com/olebedev/config" "github.com/radovskyb/watcher" diff --git a/go.mod b/go.mod index 883361874..ccff46af1 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,6 @@ require ( github.com/Azure/go-autorest v11.1.2+incompatible // indirect github.com/Microsoft/go-winio v0.4.14 // indirect github.com/PagerDuty/go-pagerduty v0.0.0-20191002190746-f60f4fc45222 - github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect github.com/VictorAvelar/devto-api-go v1.0.0 github.com/adlio/trello v1.9.0 github.com/alecthomas/chroma v0.10.0 @@ -25,7 +24,7 @@ require ( github.com/docker/go-units v0.4.0 // indirect github.com/dustin/go-humanize v1.0.0 github.com/gdamore/tcell v1.4.0 - github.com/go-ole/go-ole v1.2.4 // indirect + github.com/go-ole/go-ole v1.2.6 // indirect github.com/godbus/dbus v4.1.0+incompatible // indirect github.com/google/go-github/v32 v32.1.0 github.com/gophercloud/gophercloud v0.5.0 // indirect @@ -48,8 +47,8 @@ require ( github.com/pkg/errors v0.9.1 github.com/pkg/profile v1.6.0 github.com/radovskyb/watcher v1.0.7 - github.com/rivo/tview v0.0.0-20200108161608-1316ea7a4b35 - github.com/shirou/gopsutil v2.20.9+incompatible + github.com/rivo/tview v0.0.0-20220307222120-9994674d60a8 + github.com/shirou/gopsutil v2.21.11+incompatible github.com/shopspring/decimal v1.2.0 // indirect github.com/shurcooL/githubv4 v0.0.0-20200802174311-f27d2ca7f6d5 github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect @@ -76,6 +75,8 @@ require ( k8s.io/client-go v10.0.0+incompatible ) +require github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1 + require ( cloud.google.com/go/compute v1.5.0 // indirect contrib.go.opencensus.io/exporter/jaeger v0.1.0 // indirect @@ -144,9 +145,13 @@ require ( github.com/sirupsen/logrus v1.6.0 // indirect github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect github.com/spf13/afero v1.2.2 // indirect + github.com/tklauser/go-sysconf v0.3.10 // indirect + github.com/tklauser/numcpus v0.4.0 // indirect + github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.23.0 // indirect golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 // indirect golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8 // indirect diff --git a/go.sum b/go.sum index 8a3099e59..af3a1a2d6 100644 --- a/go.sum +++ b/go.sum @@ -65,7 +65,6 @@ github.com/Azure/go-autorest v11.1.2+incompatible h1:viZ3tV5l4gE2Sw0xrasFHytCGtz github.com/Azure/go-autorest v11.1.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/Microsoft/go-winio v0.4.7/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= @@ -81,8 +80,6 @@ github.com/SSSaaS/sssa-golang v0.0.0-20170502204618-d37d7782d752/go.mod h1:PbJ8S github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/sarama v1.27.0/go.mod h1:aCdj6ymI8uyPEux1JJ9gcaDT6cinjGhNCAhs54taSUo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk= -github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VictorAvelar/devto-api-go v1.0.0 h1:oXmzye3xYvlgBX18vX4+v6LVbjoihgIokpeOpzeJzqU= github.com/VictorAvelar/devto-api-go v1.0.0/go.mod h1:gX13cqzMdpo49qP8VtBR2uCnzW7d76LFrAVSX2eLifY= github.com/adlio/trello v1.9.0 h1:b8R1oic2yksok5McAd+kcfsvTq5sX+Fv8rMTSpBBRq8= @@ -208,9 +205,10 @@ github.com/fujiwara/shapeio v0.0.0-20170602072123-c073257dd745/go.mod h1:/WpqsrS github.com/gambol99/go-marathon v0.0.0-20170922093320-ec4a50170df7/go.mod h1:GLyXJD41gBO/NPKVPGQbhyyC06eugGy15QEZyUkE2/s= github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= -github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM= github.com/gdamore/tcell v1.4.0 h1:vUnHwJRvcPQa3tzi+0QI4U9JINXYJlOz9yiaiPQ2wMU= github.com/gdamore/tcell v1.4.0/go.mod h1:vxEiSDZdW3L+Uhjii9c3375IlDmR05bzxY404ZVSMo0= +github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1 h1:QqwPZCwh/k1uYqq6uXSb9TRDhTkfQbO80v8zhnIe5zM= +github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1/go.mod h1:Az6Jt+M5idSED2YPGtwnfJV0kXohgdCBPmHGSYc1r04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y= @@ -223,8 +221,8 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= -github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-redis/redis v6.15.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -442,7 +440,6 @@ github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/logrusorgru/aurora v0.0.0-20190803045625-94edacc10f9b h1:PMbSa9CgaiQR9NLlUTwKi+7aeLl3GG5JX5ERJxfQ3IE= github.com/logrusorgru/aurora v0.0.0-20190803045625-94edacc10f9b/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= -github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s= github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= @@ -462,7 +459,6 @@ github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.1/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= @@ -598,9 +594,8 @@ github.com/radovskyb/watcher v1.0.7 h1:AYePLih6dpmS32vlHfhCeli8127LzkIgwJGcwwe8t github.com/radovskyb/watcher v1.0.7/go.mod h1:78okwvY5wPdzcb1UYnip1pvrZNIVEIh/Cm+ZuvsUYIg= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rivo/tview v0.0.0-20200108161608-1316ea7a4b35 h1:iSQ9CjsvareuUUlmHAQKpn4+ZjZjMtldyygiOH3G3+s= -github.com/rivo/tview v0.0.0-20200108161608-1316ea7a4b35/go.mod h1:/rBeY22VG2QprWnEqG57IBC8biVu3i0DOIjRLc9I8H0= -github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/tview v0.0.0-20220307222120-9994674d60a8 h1:xe+mmCnDN82KhC010l3NfYlA8ZbOuzbXAzSYBa6wbMc= +github.com/rivo/tview v0.0.0-20220307222120-9994674d60a8/go.mod h1:WIfMkQNY+oq/mWwtsjOYHIZBuwthioY2srOmljJkTnk= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= @@ -617,8 +612,8 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh github.com/sguiheux/go-coverage v0.0.0-20190710153556-287b082a7197 h1:qu90yDtRE5WEfRT5mn9v0Xz9RaopLguhbPwZKx4dHq8= github.com/sguiheux/go-coverage v0.0.0-20190710153556-287b082a7197/go.mod h1:0hhKrsUsoT7yvxwNGKa+TSYNA26DNWMqReeZEQq/9FI= github.com/shirou/gopsutil v0.0.0-20170406131756-e49a95f3d5f8/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shirou/gopsutil v2.20.9+incompatible h1:msXs2frUV+O/JLva9EDLpuJ84PrFsdCTCQex8PUdtkQ= -github.com/shirou/gopsutil v2.20.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/shirou/gopsutil v2.21.11+incompatible h1:lOGOyCG67a5dv2hq5Z1BLDUqqKp3HkbjPcz5j6XMS0U= +github.com/shirou/gopsutil v2.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/githubv4 v0.0.0-20200802174311-f27d2ca7f6d5 h1:CA6Mjshr+g5YHENwllpQNR0UaYO7VGKo6TzJLM64WJQ= @@ -672,6 +667,10 @@ github.com/studio-b12/gowebdav v0.0.0-20200303150724-9380631c29a1/go.mod h1:gCcf github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tevino/abool v0.0.0-20170917061928-9b9efcf221b5/go.mod h1:f1SCnEOt6sc3fOJfPQDRDzHOtSXuTtnz0ImG9kPRDV0= +github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= +github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= +github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= @@ -702,6 +701,8 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/gopher-lua v0.0.0-20170901023928-8c2befcd3908/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU= +github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= +github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= github.com/zmb3/spotify v0.0.0-20191010212056-e12fb981aacb h1:uWB0RGxBo7AToSJ3rvoCZhXtLw4U7XISXSezPewmfic= @@ -873,8 +874,8 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191018095205-727590c5006e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -901,6 +902,7 @@ golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -922,6 +924,9 @@ golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 h1:nhht2DYV/Sn3qOayu8lM+cU1ii9sTLUeBQwQQfUHtrs= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/modules/airbrake/keyboard.go b/modules/airbrake/keyboard.go index 62db48cc3..2993c4df4 100644 --- a/modules/airbrake/keyboard.go +++ b/modules/airbrake/keyboard.go @@ -1,6 +1,6 @@ package airbrake -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/asana/keyboard.go b/modules/asana/keyboard.go index 8b4bbd23a..2531fec05 100644 --- a/modules/asana/keyboard.go +++ b/modules/asana/keyboard.go @@ -1,6 +1,6 @@ package asana -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/cds/favorites/keyboard.go b/modules/cds/favorites/keyboard.go index d00a41826..3e4a47ba2 100644 --- a/modules/cds/favorites/keyboard.go +++ b/modules/cds/favorites/keyboard.go @@ -1,7 +1,7 @@ package cdsfavorites import ( - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) func (widget *Widget) initializeKeyboardControls() { diff --git a/modules/cds/queue/keyboard.go b/modules/cds/queue/keyboard.go index 073eac34f..42382aa78 100644 --- a/modules/cds/queue/keyboard.go +++ b/modules/cds/queue/keyboard.go @@ -1,7 +1,7 @@ package cdsqueue import ( - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) func (widget *Widget) initializeKeyboardControls() { diff --git a/modules/cds/status/keyboard.go b/modules/cds/status/keyboard.go index ef73235ae..5ddeb71c6 100644 --- a/modules/cds/status/keyboard.go +++ b/modules/cds/status/keyboard.go @@ -1,7 +1,7 @@ package cdsstatus import ( - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) func (widget *Widget) initializeKeyboardControls() { diff --git a/modules/datadog/keyboard.go b/modules/datadog/keyboard.go index 4be979968..44e2bd1fd 100644 --- a/modules/datadog/keyboard.go +++ b/modules/datadog/keyboard.go @@ -1,7 +1,7 @@ package datadog import ( - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) func (widget *Widget) initializeKeyboardControls() { diff --git a/modules/devto/keyboard.go b/modules/devto/keyboard.go index e31c0b20f..0cbd5d732 100644 --- a/modules/devto/keyboard.go +++ b/modules/devto/keyboard.go @@ -1,6 +1,6 @@ package devto -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/digitalocean/keyboard.go b/modules/digitalocean/keyboard.go index afc6be6dc..d7d2322f0 100644 --- a/modules/digitalocean/keyboard.go +++ b/modules/digitalocean/keyboard.go @@ -1,6 +1,6 @@ package digitalocean -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/feedreader/keyboard.go b/modules/feedreader/keyboard.go index b7628efc9..3f86b8c77 100644 --- a/modules/feedreader/keyboard.go +++ b/modules/feedreader/keyboard.go @@ -1,6 +1,6 @@ package feedreader -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/gerrit/keyboard.go b/modules/gerrit/keyboard.go index ffc22b51b..9b87e4b61 100644 --- a/modules/gerrit/keyboard.go +++ b/modules/gerrit/keyboard.go @@ -1,7 +1,7 @@ package gerrit import ( - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) func (widget *Widget) initializeKeyboardControls() { diff --git a/modules/git/keyboard.go b/modules/git/keyboard.go index 74d7158ee..8ba183cde 100644 --- a/modules/git/keyboard.go +++ b/modules/git/keyboard.go @@ -1,6 +1,6 @@ package git -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/git/widget.go b/modules/git/widget.go index 8ae755f05..9697d3559 100644 --- a/modules/git/widget.go +++ b/modules/git/widget.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rivo/tview" "github.com/wtfutil/wtf/utils" "github.com/wtfutil/wtf/view" diff --git a/modules/github/keyboard.go b/modules/github/keyboard.go index 4df85459b..1ece45996 100644 --- a/modules/github/keyboard.go +++ b/modules/github/keyboard.go @@ -1,7 +1,7 @@ package github import ( - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) func (widget *Widget) initializeKeyboardControls() { diff --git a/modules/gitlab/gitlab_project.go b/modules/gitlab/gitlab_project.go index a478f0c69..6668a0383 100644 --- a/modules/gitlab/gitlab_project.go +++ b/modules/gitlab/gitlab_project.go @@ -122,7 +122,7 @@ func (project *GitlabProject) loadAssignedMergeRequests() ([]*glb.MergeRequest, state := "opened" opts := glb.ListProjectMergeRequestsOptions{ State: &state, - AssigneeID: &project.context.user.ID, + AssigneeID: glb.AssigneeID(project.context.user.ID), } mrs, _, err := project.context.client.MergeRequests.ListProjectMergeRequests(project.path, &opts) @@ -154,7 +154,7 @@ func (project *GitlabProject) loadAssignedIssues() ([]*glb.Issue, error) { state := "opened" opts := glb.ListProjectIssuesOptions{ State: &state, - AssigneeID: &project.context.user.ID, + AssigneeID: glb.AssigneeID(project.context.user.ID), } issues, _, err := project.context.client.Issues.ListProjectIssues(project.path, &opts) diff --git a/modules/gitlab/keyboard.go b/modules/gitlab/keyboard.go index 08d88d3a6..a38e3309d 100644 --- a/modules/gitlab/keyboard.go +++ b/modules/gitlab/keyboard.go @@ -1,7 +1,7 @@ package gitlab import ( - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) func (widget *Widget) initializeKeyboardControls() { diff --git a/modules/gitlabtodo/keyboard.go b/modules/gitlabtodo/keyboard.go index fe14deff4..481206731 100644 --- a/modules/gitlabtodo/keyboard.go +++ b/modules/gitlabtodo/keyboard.go @@ -1,6 +1,6 @@ package gitlabtodo -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/gitter/keyboard.go b/modules/gitter/keyboard.go index 93e9544a4..f542a6279 100644 --- a/modules/gitter/keyboard.go +++ b/modules/gitter/keyboard.go @@ -1,6 +1,6 @@ package gitter -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/grafana/keyboard.go b/modules/grafana/keyboard.go index 438469599..c7889ade5 100644 --- a/modules/grafana/keyboard.go +++ b/modules/grafana/keyboard.go @@ -1,6 +1,6 @@ package grafana -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.SetKeyboardKey(tcell.KeyUp, widget.Prev, "Select previous alert") diff --git a/modules/hackernews/keyboard.go b/modules/hackernews/keyboard.go index 7dfc554e3..e4372ca40 100644 --- a/modules/hackernews/keyboard.go +++ b/modules/hackernews/keyboard.go @@ -1,6 +1,6 @@ package hackernews -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/jenkins/keyboard.go b/modules/jenkins/keyboard.go index 61a44ed03..9c724d3ce 100644 --- a/modules/jenkins/keyboard.go +++ b/modules/jenkins/keyboard.go @@ -1,6 +1,6 @@ package jenkins -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/jira/keyboard.go b/modules/jira/keyboard.go index 016617f1d..3a6a083da 100644 --- a/modules/jira/keyboard.go +++ b/modules/jira/keyboard.go @@ -1,7 +1,7 @@ package jira import ( - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) func (widget *Widget) initializeKeyboardControls() { diff --git a/modules/mercurial/keyboard.go b/modules/mercurial/keyboard.go index 19d7d836d..319f4ccea 100644 --- a/modules/mercurial/keyboard.go +++ b/modules/mercurial/keyboard.go @@ -1,6 +1,6 @@ package mercurial -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/mercurial/widget.go b/modules/mercurial/widget.go index 0dd1acdf9..b214ccc17 100644 --- a/modules/mercurial/widget.go +++ b/modules/mercurial/widget.go @@ -1,7 +1,7 @@ package mercurial import ( - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rivo/tview" "github.com/wtfutil/wtf/utils" "github.com/wtfutil/wtf/view" diff --git a/modules/nbascore/keyboard.go b/modules/nbascore/keyboard.go index 9e8c7b031..8e0d1e52c 100644 --- a/modules/nbascore/keyboard.go +++ b/modules/nbascore/keyboard.go @@ -1,6 +1,6 @@ package nbascore -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/newrelic/keyboard.go b/modules/newrelic/keyboard.go index 798bcd11a..28a085f47 100644 --- a/modules/newrelic/keyboard.go +++ b/modules/newrelic/keyboard.go @@ -1,6 +1,6 @@ package newrelic -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.SetKeyboardKey(tcell.KeyLeft, widget.PrevSource, "Select previous application") diff --git a/modules/pocket/keyboard.go b/modules/pocket/keyboard.go index 4c8af5906..20055ee06 100644 --- a/modules/pocket/keyboard.go +++ b/modules/pocket/keyboard.go @@ -1,6 +1,6 @@ package pocket -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/rollbar/keyboard.go b/modules/rollbar/keyboard.go index 409c12c18..33253e547 100644 --- a/modules/rollbar/keyboard.go +++ b/modules/rollbar/keyboard.go @@ -1,6 +1,6 @@ package rollbar -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/spotify/keyboard.go b/modules/spotify/keyboard.go index d7db4d0c2..4a25a15a6 100644 --- a/modules/spotify/keyboard.go +++ b/modules/spotify/keyboard.go @@ -3,7 +3,7 @@ package spotify import ( "time" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) func (widget *Widget) initializeKeyboardControls() { diff --git a/modules/spotifyweb/keyboard.go b/modules/spotifyweb/keyboard.go index dd31066df..84976f821 100644 --- a/modules/spotifyweb/keyboard.go +++ b/modules/spotifyweb/keyboard.go @@ -3,7 +3,7 @@ package spotifyweb import ( "time" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) func (widget *Widget) initializeKeyboardControls() { diff --git a/modules/subreddit/keyboard.go b/modules/subreddit/keyboard.go index e31601aa1..a7670d4f5 100644 --- a/modules/subreddit/keyboard.go +++ b/modules/subreddit/keyboard.go @@ -1,6 +1,6 @@ package subreddit -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/textfile/keyboard.go b/modules/textfile/keyboard.go index 70d537ffb..97fb1fbd6 100644 --- a/modules/textfile/keyboard.go +++ b/modules/textfile/keyboard.go @@ -1,7 +1,7 @@ package textfile import ( - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/wtfutil/wtf/utils" ) diff --git a/modules/todo/keyboard.go b/modules/todo/keyboard.go index 3dbd471c3..377153a28 100644 --- a/modules/todo/keyboard.go +++ b/modules/todo/keyboard.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/wtfutil/wtf/cfg" "github.com/wtfutil/wtf/utils" ) diff --git a/modules/todo/widget.go b/modules/todo/widget.go index a4efe6401..8663b3c90 100644 --- a/modules/todo/widget.go +++ b/modules/todo/widget.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rivo/tview" "github.com/wtfutil/wtf/cfg" "github.com/wtfutil/wtf/checklist" diff --git a/modules/todo_plus/keyboard.go b/modules/todo_plus/keyboard.go index 66ab00591..529a3f7d5 100644 --- a/modules/todo_plus/keyboard.go +++ b/modules/todo_plus/keyboard.go @@ -1,6 +1,6 @@ package todo_plus -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/transmission/keyboard.go b/modules/transmission/keyboard.go index 1690b526e..ed1316a15 100644 --- a/modules/transmission/keyboard.go +++ b/modules/transmission/keyboard.go @@ -1,6 +1,6 @@ package transmission -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/travisci/keyboard.go b/modules/travisci/keyboard.go index 0a9e735e3..666de0900 100644 --- a/modules/travisci/keyboard.go +++ b/modules/travisci/keyboard.go @@ -1,6 +1,6 @@ package travisci -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/twitch/keyboard.go b/modules/twitch/keyboard.go index 36a2d88a3..c0fb0c673 100644 --- a/modules/twitch/keyboard.go +++ b/modules/twitch/keyboard.go @@ -1,6 +1,6 @@ package twitch -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/twitter/keyboard.go b/modules/twitter/keyboard.go index 908be09ed..995147844 100644 --- a/modules/twitter/keyboard.go +++ b/modules/twitter/keyboard.go @@ -1,7 +1,7 @@ package twitter import ( - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/wtfutil/wtf/utils" ) diff --git a/modules/weatherservices/weather/keyboard.go b/modules/weatherservices/weather/keyboard.go index 0dcfb4631..e0e1c5d40 100644 --- a/modules/weatherservices/weather/keyboard.go +++ b/modules/weatherservices/weather/keyboard.go @@ -1,6 +1,6 @@ package weather -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/modules/zendesk/keyboard.go b/modules/zendesk/keyboard.go index 5ab699629..1c0c84071 100644 --- a/modules/zendesk/keyboard.go +++ b/modules/zendesk/keyboard.go @@ -1,6 +1,6 @@ package zendesk -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func (widget *Widget) initializeKeyboardControls() { widget.InitializeHelpTextKeyboardControl(widget.ShowHelp) diff --git a/utils/email_addresses.go b/utils/email_addresses.go index 70bfaec37..6b31181a7 100644 --- a/utils/email_addresses.go +++ b/utils/email_addresses.go @@ -2,6 +2,9 @@ package utils import ( "strings" + + "golang.org/x/text/cases" + "golang.org/x/text/language" ) // NameFromEmail takes an email address and returns the part that comes before the @ symbol @@ -13,7 +16,10 @@ import ( // func NameFromEmail(email string) string { parts := strings.Split(email, "@") - return strings.Title(strings.ReplaceAll(parts[0], ".", " ")) + name := strings.ReplaceAll(parts[0], ".", " ") + + c := cases.Title(language.English) + return c.String(name) } // NamesFromEmails takes a slice of email addresses and returns a slice of the parts that diff --git a/view/billboard_modal.go b/view/billboard_modal.go index 0f5624c2c..25591082a 100644 --- a/view/billboard_modal.go +++ b/view/billboard_modal.go @@ -1,7 +1,7 @@ package view import ( - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rivo/tview" ) diff --git a/view/keyboard_widget.go b/view/keyboard_widget.go index 1ba1bbfe7..53654d1c4 100644 --- a/view/keyboard_widget.go +++ b/view/keyboard_widget.go @@ -2,11 +2,12 @@ package view import ( "fmt" - "strings" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/wtfutil/wtf/cfg" "github.com/wtfutil/wtf/utils" + "golang.org/x/text/cases" + "golang.org/x/text/language" ) const helpKeyChar = "/" @@ -59,7 +60,8 @@ func (widget *KeyboardWidget) AssignedChars() []string { // HelpText returns the help text and keyboard command info for this widget func (widget *KeyboardWidget) HelpText() string { - str := " [green::b]Keyboard commands for " + strings.Title(widget.settings.Module.Type) + "[white]\n\n" + c := cases.Title(language.English) + str := " [green::b]Keyboard commands for " + c.String(widget.settings.Module.Type) + "[white]\n\n" for _, item := range widget.charHelp { str += fmt.Sprintf(" %s\t%s\n", item.Key, item.Text) diff --git a/view/keyboard_widget_test.go b/view/keyboard_widget_test.go index 6660a2ec7..e20f51c49 100644 --- a/view/keyboard_widget_test.go +++ b/view/keyboard_widget_test.go @@ -3,7 +3,7 @@ package view import ( "testing" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/stretchr/testify/assert" "github.com/wtfutil/wtf/cfg" ) diff --git a/wtf/colors.go b/wtf/colors.go index 44c8c2cb5..4ba36e992 100644 --- a/wtf/colors.go +++ b/wtf/colors.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) var colorMap = map[int]string{ diff --git a/wtf/colors_test.go b/wtf/colors_test.go index 820ae941a..acb3fde04 100644 --- a/wtf/colors_test.go +++ b/wtf/colors_test.go @@ -3,7 +3,7 @@ package wtf import ( "testing" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) func Test_ASCIItoTviewColors(t *testing.T) {