From b9b8b4e9f0c687bc88721155d39f8f157b86e63f Mon Sep 17 00:00:00 2001 From: a Date: Thu, 9 Feb 2023 01:28:41 -0600 Subject: [PATCH 1/2] a --- .idea/.gitignore | 8 ++++++++ .idea/gospt.iml | 9 +++++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ go.mod | 2 +- main.go | 2 +- src/auth/auth.go | 4 ++-- src/cmd/clearradio.go | 2 +- src/cmd/devices.go | 2 +- src/cmd/like.go | 2 +- src/cmd/link.go | 2 +- src/cmd/linkcontext.go | 2 +- src/cmd/mute.go | 2 +- src/cmd/next.go | 2 +- src/cmd/nowplaying.go | 2 +- src/cmd/pause.go | 2 +- src/cmd/play.go | 2 +- src/cmd/playurl.go | 2 +- src/cmd/previous.go | 2 +- src/cmd/radio.go | 2 +- src/cmd/refillradio.go | 2 +- src/cmd/repeat.go | 2 +- src/cmd/root.go | 6 +++--- src/cmd/seek.go | 2 +- src/cmd/setdevice.go | 2 +- src/cmd/shuffle.go | 2 +- src/cmd/status.go | 2 +- src/cmd/toggleplay.go | 2 +- src/cmd/tracks.go | 4 ++-- src/cmd/tui.go | 4 ++-- src/cmd/unlike.go | 2 +- src/cmd/unmute.go | 2 +- src/cmd/volume.go | 2 +- src/commands/commands.go | 2 +- src/tui/handlers.go | 4 ++-- src/tui/loader.go | 2 +- src/tui/main.go | 2 +- src/tui/tui.go | 2 +- src/tui/views.go | 4 ++-- 39 files changed, 73 insertions(+), 42 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/gospt.iml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/gospt.iml b/.idea/gospt.iml new file mode 100644 index 0000000..5e764c4 --- /dev/null +++ b/.idea/gospt.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..90c08af --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/go.mod b/go.mod index 096791c..0a170a0 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gospt +module gitea.asdf.cafe/abs3nt/gospt go 1.19 diff --git a/main.go b/main.go index 1d369c3..26ed350 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "gospt/src/cmd" + "gitea.asdf.cafe/abs3nt/gospt/src/cmd" ) func main() { diff --git a/src/auth/auth.go b/src/auth/auth.go index 310d2c0..8c522eb 100644 --- a/src/auth/auth.go +++ b/src/auth/auth.go @@ -10,8 +10,8 @@ import ( "os/exec" "path/filepath" - "gospt/src/config" - "gospt/src/gctx" + "gitea.asdf.cafe/abs3nt/gospt/src/config" + "gitea.asdf.cafe/abs3nt/gospt/src/gctx" "github.com/zmb3/spotify/v2" spotifyauth "github.com/zmb3/spotify/v2/auth" diff --git a/src/cmd/clearradio.go b/src/cmd/clearradio.go index 556f2de..5110224 100644 --- a/src/cmd/clearradio.go +++ b/src/cmd/clearradio.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/devices.go b/src/cmd/devices.go index 63f1c2a..71c9677 100644 --- a/src/cmd/devices.go +++ b/src/cmd/devices.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/like.go b/src/cmd/like.go index 30c5d85..db42e3e 100644 --- a/src/cmd/like.go +++ b/src/cmd/like.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/link.go b/src/cmd/link.go index 1675be1..bd19458 100644 --- a/src/cmd/link.go +++ b/src/cmd/link.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/linkcontext.go b/src/cmd/linkcontext.go index 6b1c09c..e2992e6 100644 --- a/src/cmd/linkcontext.go +++ b/src/cmd/linkcontext.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/mute.go b/src/cmd/mute.go index 54bd1ff..ef999f9 100644 --- a/src/cmd/mute.go +++ b/src/cmd/mute.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/next.go b/src/cmd/next.go index c174438..792d8d3 100644 --- a/src/cmd/next.go +++ b/src/cmd/next.go @@ -3,7 +3,7 @@ package cmd import ( "strconv" - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/nowplaying.go b/src/cmd/nowplaying.go index 466ace5..85fb560 100644 --- a/src/cmd/nowplaying.go +++ b/src/cmd/nowplaying.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/pause.go b/src/cmd/pause.go index 1564f7d..63ae064 100644 --- a/src/cmd/pause.go +++ b/src/cmd/pause.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/play.go b/src/cmd/play.go index 4c3dd11..a3c1f3c 100644 --- a/src/cmd/play.go +++ b/src/cmd/play.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/playurl.go b/src/cmd/playurl.go index 4cf2947..d573533 100644 --- a/src/cmd/playurl.go +++ b/src/cmd/playurl.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/previous.go b/src/cmd/previous.go index f9e5e75..2756d05 100644 --- a/src/cmd/previous.go +++ b/src/cmd/previous.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/radio.go b/src/cmd/radio.go index 945e475..e28cc50 100644 --- a/src/cmd/radio.go +++ b/src/cmd/radio.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/refillradio.go b/src/cmd/refillradio.go index 0515ed0..e6bea38 100644 --- a/src/cmd/refillradio.go +++ b/src/cmd/refillradio.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/repeat.go b/src/cmd/repeat.go index fb62023..b9fd607 100644 --- a/src/cmd/repeat.go +++ b/src/cmd/repeat.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/root.go b/src/cmd/root.go index ee41619..24e0e36 100644 --- a/src/cmd/root.go +++ b/src/cmd/root.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - "gospt/src/auth" - "gospt/src/config" - "gospt/src/gctx" + "gitea.asdf.cafe/abs3nt/gospt/src/auth" + "gitea.asdf.cafe/abs3nt/gospt/src/config" + "gitea.asdf.cafe/abs3nt/gospt/src/gctx" "github.com/cristalhq/aconfig" "github.com/cristalhq/aconfig/aconfigyaml" diff --git a/src/cmd/seek.go b/src/cmd/seek.go index 13845f5..0238ac5 100644 --- a/src/cmd/seek.go +++ b/src/cmd/seek.go @@ -3,7 +3,7 @@ package cmd import ( "strconv" - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/setdevice.go b/src/cmd/setdevice.go index bbb1fb4..9a6fbe1 100644 --- a/src/cmd/setdevice.go +++ b/src/cmd/setdevice.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/tui" + "gitea.asdf.cafe/abs3nt/gospt/src/tui" "github.com/spf13/cobra" ) diff --git a/src/cmd/shuffle.go b/src/cmd/shuffle.go index 61fe202..047106f 100644 --- a/src/cmd/shuffle.go +++ b/src/cmd/shuffle.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/status.go b/src/cmd/status.go index c8147a8..f3a3a43 100644 --- a/src/cmd/status.go +++ b/src/cmd/status.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/toggleplay.go b/src/cmd/toggleplay.go index 423bad5..ada7d07 100644 --- a/src/cmd/toggleplay.go +++ b/src/cmd/toggleplay.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/tracks.go b/src/cmd/tracks.go index 7b64815..63aee24 100644 --- a/src/cmd/tracks.go +++ b/src/cmd/tracks.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "gospt/src/commands" - "gospt/src/tui" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/tui" "github.com/spf13/cobra" ) diff --git a/src/cmd/tui.go b/src/cmd/tui.go index 8b2b030..cadb6dc 100644 --- a/src/cmd/tui.go +++ b/src/cmd/tui.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "gospt/src/commands" - "gospt/src/tui" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/tui" "github.com/spf13/cobra" ) diff --git a/src/cmd/unlike.go b/src/cmd/unlike.go index fb14ff9..97b6665 100644 --- a/src/cmd/unlike.go +++ b/src/cmd/unlike.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/unmute.go b/src/cmd/unmute.go index da4bb13..2188bf2 100644 --- a/src/cmd/unmute.go +++ b/src/cmd/unmute.go @@ -1,7 +1,7 @@ package cmd import ( - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/cmd/volume.go b/src/cmd/volume.go index 4554833..bacdb69 100644 --- a/src/cmd/volume.go +++ b/src/cmd/volume.go @@ -3,7 +3,7 @@ package cmd import ( "strconv" - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/spf13/cobra" ) diff --git a/src/commands/commands.go b/src/commands/commands.go index 23cbefd..d287eef 100644 --- a/src/commands/commands.go +++ b/src/commands/commands.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "gospt/src/gctx" + "gitea.asdf.cafe/abs3nt/gospt/src/gctx" "github.com/zmb3/spotify/v2" _ "modernc.org/sqlite" diff --git a/src/tui/handlers.go b/src/tui/handlers.go index 2294c69..a10521c 100644 --- a/src/tui/handlers.go +++ b/src/tui/handlers.go @@ -1,8 +1,8 @@ package tui import ( - "gospt/src/commands" - "gospt/src/gctx" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/gctx" "github.com/zmb3/spotify/v2" ) diff --git a/src/tui/loader.go b/src/tui/loader.go index b2aae8c..d1127bb 100644 --- a/src/tui/loader.go +++ b/src/tui/loader.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" "github.com/charmbracelet/bubbles/list" ) diff --git a/src/tui/main.go b/src/tui/main.go index b22100e..753da2d 100644 --- a/src/tui/main.go +++ b/src/tui/main.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "gospt/src/gctx" + "gitea.asdf.cafe/abs3nt/gospt/src/gctx" "github.com/atotto/clipboard" "github.com/charmbracelet/bubbles/key" diff --git a/src/tui/tui.go b/src/tui/tui.go index 4d248a1..fbce6e8 100644 --- a/src/tui/tui.go +++ b/src/tui/tui.go @@ -3,7 +3,7 @@ package tui import ( "fmt" - "gospt/src/gctx" + "gitea.asdf.cafe/abs3nt/gospt/src/gctx" tea "github.com/charmbracelet/bubbletea" "github.com/zmb3/spotify/v2" diff --git a/src/tui/views.go b/src/tui/views.go index 0e6685e..7fd96b6 100644 --- a/src/tui/views.go +++ b/src/tui/views.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "gospt/src/commands" - "gospt/src/gctx" + "gitea.asdf.cafe/abs3nt/gospt/src/commands" + "gitea.asdf.cafe/abs3nt/gospt/src/gctx" "github.com/charmbracelet/bubbles/list" "github.com/zmb3/spotify/v2" From 9feea4440029ba0466bcf9a65e6910666d861ebe Mon Sep 17 00:00:00 2001 From: a Date: Thu, 9 Feb 2023 01:29:23 -0600 Subject: [PATCH 2/2] fix --- .gitignore | 8 ++++++++ .idea/.gitignore | 8 -------- .idea/gospt.iml | 9 --------- .idea/modules.xml | 8 -------- .idea/vcs.xml | 6 ------ 5 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/gospt.iml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index 7b5bab1..966e83c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,11 @@ bin/ bin/* /gospt + +.idea/* +.idea + +*.log +*.out + +*.tmp diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/gospt.iml b/.idea/gospt.iml deleted file mode 100644 index 5e764c4..0000000 --- a/.idea/gospt.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 90c08af..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file