From b1199e9b1c0658250fda22e05cb65536a3901fdb Mon Sep 17 00:00:00 2001 From: aditya-K2 Date: Mon, 15 Nov 2021 21:48:17 +0530 Subject: [PATCH] Using My Fork Of tview Things that I needed are not included in rivo's tview version and waiting for them to be merged will take time. So using My Fork. --- client.go | 2 +- go.mod | 9 +++------ go.sum | 6 ++++-- notification.go | 2 +- progressBar.go | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/client.go b/client.go index 6343e22..9b3ef6d 100644 --- a/client.go +++ b/client.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/rivo/tview" + "github.com/aditya-K2/tview" ) func getFormattedString(s string, width int) string { diff --git a/go.mod b/go.mod index 6c394f5..e8d1e43 100644 --- a/go.mod +++ b/go.mod @@ -1,20 +1,17 @@ module github.com/aditya-K2/goMP -go 1.17 +go 1.16 require ( + github.com/aditya-K2/tview v0.0.0-20211115161300-6b99c2c2658c github.com/bogem/id3v2 v1.2.0 github.com/fhs/gompd v1.0.1 github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1 github.com/mewkiz/flac v1.0.7 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 - github.com/rivo/tview v0.0.0-20211001102648-5508f4b00266 + github.com/shkh/lastfm-go v0.0.0-20191215035245-89a801c244e0 github.com/spf13/viper v1.9.0 gitlab.com/diamondburned/ueberzug-go v0.0.0-20190521043425-7c15a5f63b06 -) - -require ( - github.com/shkh/lastfm-go v0.0.0-20191215035245-89a801c244e0 golang.org/x/sys v0.0.0-20211113001501-0c823b97ae02 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect diff --git a/go.sum b/go.sum index e742d46..e9e97a2 100644 --- a/go.sum +++ b/go.sum @@ -52,6 +52,10 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/BurntSushi/xgbutil v0.0.0-20160919175755-f7c97cef3b4e h1:4ZrkT/RzpnROylmoQL57iVUL57wGKTR5O6KpVnbm2tA= github.com/BurntSushi/xgbutil v0.0.0-20160919175755-f7c97cef3b4e/go.mod h1:uw9h2sd4WWHOPdJ13MQpwK5qYWKYDumDqxWWIknEQ+k= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/aditya-K2/tview v0.0.0-20211115155623-217bcbdc952c h1:HE/P4zSd5GE7wdCicacdo5m2vZk6E7BSS5NOY00gaPM= +github.com/aditya-K2/tview v0.0.0-20211115155623-217bcbdc952c/go.mod h1:nPfBlFYx4SBcLlONif45KWw2mvEbRgP/nNCkH/dMhIQ= +github.com/aditya-K2/tview v0.0.0-20211115161300-6b99c2c2658c h1:UG9OxyXccanOiC83FEonB3+iLYvA3aAYgiX1N7Vurm0= +github.com/aditya-K2/tview v0.0.0-20211115161300-6b99c2c2658c/go.mod h1:nPfBlFYx4SBcLlONif45KWw2mvEbRgP/nNCkH/dMhIQ= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= @@ -255,8 +259,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/rivo/tview v0.0.0-20211001102648-5508f4b00266 h1:UrmGSzDIp4gfkDuMLdXk1Tx4FjS8GTWrWJjHfnS6GmY= -github.com/rivo/tview v0.0.0-20211001102648-5508f4b00266/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 v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= diff --git a/notification.go b/notification.go index 9c0cd63..15fa3e1 100644 --- a/notification.go +++ b/notification.go @@ -3,8 +3,8 @@ package main import ( "time" + "github.com/aditya-K2/tview" "github.com/gdamore/tcell/v2" - "github.com/rivo/tview" ) /* Notification Primitive */ diff --git a/progressBar.go b/progressBar.go index 630c9da..1dd4fb3 100644 --- a/progressBar.go +++ b/progressBar.go @@ -4,8 +4,8 @@ import ( "fmt" "strconv" + "github.com/aditya-K2/tview" "github.com/gdamore/tcell/v2" - "github.com/rivo/tview" ) var CurrentSong string