diff --git a/README.md b/README.md index 24b8f92..ccd935c 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ Please see [the wiki](https://github.com/makeworld-the-better-one/amfora/wiki) f ## Libraries Amfora ❤️ open source! -- [cview](https://gitlab.com/tslocum/cview/) for the TUI +- [cview](https://code.rocketnine.space/tslocum/cview) for the TUI - It's a fork of [tview](https://github.com/rivo/tview) with PRs merged and active support - It uses [tcell](https://github.com/gdamore/tcell) for low level terminal operations - [Viper](https://github.com/spf13/viper) for configuration and TOFU storing diff --git a/config/config.go b/config/config.go index 6f9c9c7..c0af3ea 100644 --- a/config/config.go +++ b/config/config.go @@ -17,7 +17,7 @@ import ( "github.com/rkoesters/xdg/basedir" "github.com/rkoesters/xdg/userdirs" "github.com/spf13/viper" - "gitlab.com/tslocum/cview" + "code.rocketnine.space/tslocum/cview" ) var amforaAppData string // Where amfora files are stored on Windows - cached here diff --git a/display/bookmarks.go b/display/bookmarks.go index 116bbe3..d3083cf 100644 --- a/display/bookmarks.go +++ b/display/bookmarks.go @@ -9,7 +9,7 @@ import ( "github.com/makeworld-the-better-one/amfora/renderer" "github.com/makeworld-the-better-one/amfora/structs" "github.com/spf13/viper" - "gitlab.com/tslocum/cview" + "code.rocketnine.space/tslocum/cview" ) // For adding and removing bookmarks, basically a clone of the input modal. diff --git a/display/display.go b/display/display.go index 268b5b4..36f3262 100644 --- a/display/display.go +++ b/display/display.go @@ -15,7 +15,7 @@ import ( "github.com/makeworld-the-better-one/amfora/structs" "github.com/makeworld-the-better-one/go-gemini" "github.com/spf13/viper" - "gitlab.com/tslocum/cview" + "code.rocketnine.space/tslocum/cview" ) var tabs []*tab // Slice of all the current browser tabs diff --git a/display/download.go b/display/download.go index 5b8ff3c..b5dbc93 100644 --- a/display/download.go +++ b/display/download.go @@ -21,7 +21,7 @@ import ( "github.com/makeworld-the-better-one/go-gemini" "github.com/schollz/progressbar/v3" "github.com/spf13/viper" - "gitlab.com/tslocum/cview" + "code.rocketnine.space/tslocum/cview" ) // For choosing between download and the portal - copy of YesNo basically diff --git a/display/help.go b/display/help.go index 4c76572..aa77021 100644 --- a/display/help.go +++ b/display/help.go @@ -7,7 +7,7 @@ import ( "github.com/gdamore/tcell/v2" "github.com/makeworld-the-better-one/amfora/config" - "gitlab.com/tslocum/cview" + "code.rocketnine.space/tslocum/cview" ) var helpCells = strings.TrimSpace( diff --git a/display/modals.go b/display/modals.go index 30747c5..2dcc5d1 100644 --- a/display/modals.go +++ b/display/modals.go @@ -9,7 +9,7 @@ import ( "github.com/gdamore/tcell/v2" "github.com/makeworld-the-better-one/amfora/config" "github.com/spf13/viper" - "gitlab.com/tslocum/cview" + "code.rocketnine.space/tslocum/cview" ) // This file contains code for the popups / modals used in the display. diff --git a/display/tab.go b/display/tab.go index 030a821..893af21 100644 --- a/display/tab.go +++ b/display/tab.go @@ -7,7 +7,7 @@ import ( "github.com/gdamore/tcell/v2" "github.com/makeworld-the-better-one/amfora/config" "github.com/makeworld-the-better-one/amfora/structs" - "gitlab.com/tslocum/cview" + "code.rocketnine.space/tslocum/cview" ) type tabMode int diff --git a/display/util.go b/display/util.go index 788fd43..6e00101 100644 --- a/display/util.go +++ b/display/util.go @@ -7,7 +7,7 @@ import ( "github.com/makeworld-the-better-one/go-gemini" "github.com/spf13/viper" - "gitlab.com/tslocum/cview" + "code.rocketnine.space/tslocum/cview" "golang.org/x/text/unicode/norm" ) diff --git a/go.mod b/go.mod index 17bf570..faa2132 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/makeworld-the-better-one/amfora go 1.14 require ( + code.rocketnine.space/tslocum/cview v1.5.4 github.com/dustin/go-humanize v1.0.0 github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/gdamore/tcell/v2 v2.2.1-0.20210305060500-f4d402906fa3 @@ -20,7 +21,6 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.6.1 - gitlab.com/tslocum/cview v1.5.4-0.20210402003506-bb362496b2fa golang.org/x/text v0.3.6 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect gopkg.in/ini.v1 v1.62.0 // indirect diff --git a/go.sum b/go.sum index 1009ee7..3ff736d 100644 --- a/go.sum +++ b/go.sum @@ -12,6 +12,8 @@ cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2k cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= code.rocketnine.space/tslocum/cbind v0.1.5 h1:i6NkeLLNPNMS4NWNi3302Ay3zSU6MrqOT+yJskiodxE= code.rocketnine.space/tslocum/cbind v0.1.5/go.mod h1:LtfqJTzM7qhg88nAvNhx+VnTjZ0SXBJtxBObbfBWo/M= +code.rocketnine.space/tslocum/cview v1.5.4 h1:zBUFAanViudrAw8ZCqNxaufqrYL6a7F1AkkIClXIzYo= +code.rocketnine.space/tslocum/cview v1.5.4/go.mod h1:JjgoZi3b528SaV923oQq14PGUCTE/g/6iggnDUxsChE= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -233,8 +235,6 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/urfave/cli v1.22.3/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -gitlab.com/tslocum/cview v1.5.4-0.20210402003506-bb362496b2fa h1:aGjXr+xAej0daOQQrrVO7F8Obm06hcGHGn5VFURac5k= -gitlab.com/tslocum/cview v1.5.4-0.20210402003506-bb362496b2fa/go.mod h1:sP8xz8jkpoKq7rdil8xUNX4NLyXQ78Kbb5DPvZ+4XLo= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= diff --git a/renderer/renderer.go b/renderer/renderer.go index 858818e..9d80961 100644 --- a/renderer/renderer.go +++ b/renderer/renderer.go @@ -13,7 +13,7 @@ import ( "github.com/makeworld-the-better-one/amfora/config" "github.com/spf13/viper" - "gitlab.com/tslocum/cview" + "code.rocketnine.space/tslocum/cview" ) // Regex for identifying ANSI color codes