From 060532015c9914de5cea40dcbb9c7078ac2b4da3 Mon Sep 17 00:00:00 2001
From: abs3nt <abs3nt@asdf.cafe>
Date: Fri, 13 Jan 2023 22:27:38 -0800
Subject: [PATCH] slow

---
 main.go                                |  4 ++-
 {internal => src}/auth/auth.go         |  4 +--
 {cmd => src/cmd}/clearradio.go         |  2 +-
 {cmd => src/cmd}/completion.go         |  0
 {cmd => src/cmd}/devices.go            |  2 +-
 {cmd => src/cmd}/like.go               |  2 +-
 {cmd => src/cmd}/link.go               |  2 +-
 {cmd => src/cmd}/nowplaying.go         |  2 +-
 {cmd => src/cmd}/pause.go              |  2 +-
 {cmd => src/cmd}/play.go               |  2 +-
 {cmd => src/cmd}/playurl.go            |  2 +-
 {cmd => src/cmd}/previous.go           |  2 +-
 {cmd => src/cmd}/radio.go              |  2 +-
 {cmd => src/cmd}/refillradio.go        |  2 +-
 {cmd => src/cmd}/repeat.go             |  2 +-
 {cmd => src/cmd}/root.go               | 37 +++++++++++++-------------
 {cmd => src/cmd}/setdevice.go          |  2 +-
 {cmd => src/cmd}/shuffle.go            |  2 +-
 {cmd => src/cmd}/skip.go               |  2 +-
 {cmd => src/cmd}/status.go             |  2 +-
 {cmd => src/cmd}/toggleplay.go         |  2 +-
 {cmd => src/cmd}/tracks.go             |  4 +--
 {cmd => src/cmd}/tui.go                |  4 +--
 {cmd => src/cmd}/unlike.go             |  2 +-
 {internal => src}/commands/commands.go |  2 +-
 {internal => src}/config/config.go     |  0
 {internal => src}/gctx/context.go      |  0
 {internal => src}/tui/handlers.go      |  4 +--
 {internal => src}/tui/loader.go        |  2 +-
 {internal => src}/tui/main.go          |  2 +-
 {internal => src}/tui/tui.go           |  2 +-
 {internal => src}/tui/views.go         |  4 +--
 32 files changed, 54 insertions(+), 51 deletions(-)
 rename {internal => src}/auth/auth.go (98%)
 rename {cmd => src/cmd}/clearradio.go (93%)
 rename {cmd => src/cmd}/completion.go (100%)
 rename {cmd => src/cmd}/devices.go (91%)
 rename {cmd => src/cmd}/like.go (90%)
 rename {cmd => src/cmd}/link.go (94%)
 rename {cmd => src/cmd}/nowplaying.go (93%)
 rename {cmd => src/cmd}/pause.go (91%)
 rename {cmd => src/cmd}/play.go (92%)
 rename {cmd => src/cmd}/playurl.go (93%)
 rename {cmd => src/cmd}/previous.go (93%)
 rename {cmd => src/cmd}/radio.go (91%)
 rename {cmd => src/cmd}/refillradio.go (93%)
 rename {cmd => src/cmd}/repeat.go (93%)
 rename {cmd => src/cmd}/root.go (81%)
 rename {cmd => src/cmd}/setdevice.go (94%)
 rename {cmd => src/cmd}/shuffle.go (93%)
 rename {cmd => src/cmd}/skip.go (91%)
 rename {cmd => src/cmd}/status.go (92%)
 rename {cmd => src/cmd}/toggleplay.go (93%)
 rename {cmd => src/cmd}/tracks.go (92%)
 rename {cmd => src/cmd}/tui.go (93%)
 rename {cmd => src/cmd}/unlike.go (91%)
 rename {internal => src}/commands/commands.go (99%)
 rename {internal => src}/config/config.go (100%)
 rename {internal => src}/gctx/context.go (100%)
 rename {internal => src}/tui/handlers.go (96%)
 rename {internal => src}/tui/loader.go (99%)
 rename {internal => src}/tui/main.go (99%)
 rename {internal => src}/tui/tui.go (95%)
 rename {internal => src}/tui/views.go (99%)

diff --git a/main.go b/main.go
index 5eee5c9..1d369c3 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,8 @@
 package main
 
-import "gospt/cmd"
+import (
+	"gospt/src/cmd"
+)
 
 func main() {
 	defCmd := "tui"
diff --git a/internal/auth/auth.go b/src/auth/auth.go
similarity index 98%
rename from internal/auth/auth.go
rename to src/auth/auth.go
index 6f1c437..07ce019 100644
--- a/internal/auth/auth.go
+++ b/src/auth/auth.go
@@ -10,8 +10,8 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"gospt/internal/config"
-	"gospt/internal/gctx"
+	"gospt/src/config"
+	"gospt/src/gctx"
 
 	"github.com/zmb3/spotify/v2"
 	spotifyauth "github.com/zmb3/spotify/v2/auth"
diff --git a/cmd/clearradio.go b/src/cmd/clearradio.go
similarity index 93%
rename from cmd/clearradio.go
rename to src/cmd/clearradio.go
index 12c47e0..556f2de 100644
--- a/cmd/clearradio.go
+++ b/src/cmd/clearradio.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/completion.go b/src/cmd/completion.go
similarity index 100%
rename from cmd/completion.go
rename to src/cmd/completion.go
diff --git a/cmd/devices.go b/src/cmd/devices.go
similarity index 91%
rename from cmd/devices.go
rename to src/cmd/devices.go
index fab659a..63f1c2a 100644
--- a/cmd/devices.go
+++ b/src/cmd/devices.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/like.go b/src/cmd/like.go
similarity index 90%
rename from cmd/like.go
rename to src/cmd/like.go
index 3f00bca..f8391cc 100644
--- a/cmd/like.go
+++ b/src/cmd/like.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/link.go b/src/cmd/link.go
similarity index 94%
rename from cmd/link.go
rename to src/cmd/link.go
index a188e90..5df8765 100644
--- a/cmd/link.go
+++ b/src/cmd/link.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/nowplaying.go b/src/cmd/nowplaying.go
similarity index 93%
rename from cmd/nowplaying.go
rename to src/cmd/nowplaying.go
index 5bf2204..ef4b910 100644
--- a/cmd/nowplaying.go
+++ b/src/cmd/nowplaying.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/pause.go b/src/cmd/pause.go
similarity index 91%
rename from cmd/pause.go
rename to src/cmd/pause.go
index afd0d02..13209f1 100644
--- a/cmd/pause.go
+++ b/src/cmd/pause.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/play.go b/src/cmd/play.go
similarity index 92%
rename from cmd/play.go
rename to src/cmd/play.go
index 1707011..7e94132 100644
--- a/cmd/play.go
+++ b/src/cmd/play.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/playurl.go b/src/cmd/playurl.go
similarity index 93%
rename from cmd/playurl.go
rename to src/cmd/playurl.go
index 51ec6d2..4cf2947 100644
--- a/cmd/playurl.go
+++ b/src/cmd/playurl.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/previous.go b/src/cmd/previous.go
similarity index 93%
rename from cmd/previous.go
rename to src/cmd/previous.go
index 5ad20e8..ab15e84 100644
--- a/cmd/previous.go
+++ b/src/cmd/previous.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/radio.go b/src/cmd/radio.go
similarity index 91%
rename from cmd/radio.go
rename to src/cmd/radio.go
index 870472c..495cecb 100644
--- a/cmd/radio.go
+++ b/src/cmd/radio.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/refillradio.go b/src/cmd/refillradio.go
similarity index 93%
rename from cmd/refillradio.go
rename to src/cmd/refillradio.go
index 1833202..aa0563d 100644
--- a/cmd/refillradio.go
+++ b/src/cmd/refillradio.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/repeat.go b/src/cmd/repeat.go
similarity index 93%
rename from cmd/repeat.go
rename to src/cmd/repeat.go
index 50a964e..fb62023 100644
--- a/cmd/repeat.go
+++ b/src/cmd/repeat.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/root.go b/src/cmd/root.go
similarity index 81%
rename from cmd/root.go
rename to src/cmd/root.go
index b6540d8..58c3348 100644
--- a/cmd/root.go
+++ b/src/cmd/root.go
@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"gospt/internal/auth"
-	"gospt/internal/config"
-	"gospt/internal/gctx"
+	"gospt/src/auth"
+	"gospt/src/config"
+	"gospt/src/gctx"
 
 	"github.com/cristalhq/aconfig"
 	"github.com/cristalhq/aconfig/aconfigyaml"
@@ -45,26 +45,27 @@ func Execute(defCmd string) {
 }
 
 func init() {
-	configDir, _ := os.UserConfigDir()
-	cfgFile = filepath.Join(configDir, "gospt/client.yml")
 	cobra.OnInitialize(initConfig)
-	if !(len(os.Args) > 1) || os.Args[1] != "completion" {
-		initConfig()
-		var err error
-		ctx = gctx.NewContext(context.Background())
-		client, err = auth.GetClient(ctx)
-		if err != nil {
-			panic(err)
-		}
-		currentUser, err := client.CurrentUser(ctx)
-		if err != nil {
-			panic(err)
-		}
-		ctx.UserId = currentUser.ID
+	cobra.OnInitialize(initClient)
+}
+
+func initClient() {
+	var err error
+	ctx = gctx.NewContext(context.Background())
+	client, err = auth.GetClient(ctx)
+	if err != nil {
+		panic(err)
 	}
+	currentUser, err := client.CurrentUser(ctx)
+	if err != nil {
+		panic(err)
+	}
+	ctx.UserId = currentUser.ID
 }
 
 func initConfig() {
+	configDir, _ := os.UserConfigDir()
+	cfgFile = filepath.Join(configDir, "gospt/client.yml")
 	yamlDecoder := aconfigyaml.New()
 
 	loader := aconfig.LoaderFor(&config.Values, aconfig.Config{
diff --git a/cmd/setdevice.go b/src/cmd/setdevice.go
similarity index 94%
rename from cmd/setdevice.go
rename to src/cmd/setdevice.go
index d2330ce..bbb1fb4 100644
--- a/cmd/setdevice.go
+++ b/src/cmd/setdevice.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/tui"
+	"gospt/src/tui"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/shuffle.go b/src/cmd/shuffle.go
similarity index 93%
rename from cmd/shuffle.go
rename to src/cmd/shuffle.go
index e8401a9..61fe202 100644
--- a/cmd/shuffle.go
+++ b/src/cmd/shuffle.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/skip.go b/src/cmd/skip.go
similarity index 91%
rename from cmd/skip.go
rename to src/cmd/skip.go
index 44c9d0c..02ebe45 100644
--- a/cmd/skip.go
+++ b/src/cmd/skip.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/status.go b/src/cmd/status.go
similarity index 92%
rename from cmd/status.go
rename to src/cmd/status.go
index 6a053ec..c8147a8 100644
--- a/cmd/status.go
+++ b/src/cmd/status.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/toggleplay.go b/src/cmd/toggleplay.go
similarity index 93%
rename from cmd/toggleplay.go
rename to src/cmd/toggleplay.go
index 4df1129..ad31bdc 100644
--- a/cmd/toggleplay.go
+++ b/src/cmd/toggleplay.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/tracks.go b/src/cmd/tracks.go
similarity index 92%
rename from cmd/tracks.go
rename to src/cmd/tracks.go
index ca16d96..7b64815 100644
--- a/cmd/tracks.go
+++ b/src/cmd/tracks.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"gospt/internal/commands"
-	"gospt/internal/tui"
+	"gospt/src/commands"
+	"gospt/src/tui"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/tui.go b/src/cmd/tui.go
similarity index 93%
rename from cmd/tui.go
rename to src/cmd/tui.go
index c97da54..8b2b030 100644
--- a/cmd/tui.go
+++ b/src/cmd/tui.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"gospt/internal/commands"
-	"gospt/internal/tui"
+	"gospt/src/commands"
+	"gospt/src/tui"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/unlike.go b/src/cmd/unlike.go
similarity index 91%
rename from cmd/unlike.go
rename to src/cmd/unlike.go
index 859a0aa..38c34c6 100644
--- a/cmd/unlike.go
+++ b/src/cmd/unlike.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )
diff --git a/internal/commands/commands.go b/src/commands/commands.go
similarity index 99%
rename from internal/commands/commands.go
rename to src/commands/commands.go
index 50c3fff..3a24ab4 100644
--- a/internal/commands/commands.go
+++ b/src/commands/commands.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"gospt/internal/gctx"
+	"gospt/src/gctx"
 
 	"github.com/zmb3/spotify/v2"
 )
diff --git a/internal/config/config.go b/src/config/config.go
similarity index 100%
rename from internal/config/config.go
rename to src/config/config.go
diff --git a/internal/gctx/context.go b/src/gctx/context.go
similarity index 100%
rename from internal/gctx/context.go
rename to src/gctx/context.go
diff --git a/internal/tui/handlers.go b/src/tui/handlers.go
similarity index 96%
rename from internal/tui/handlers.go
rename to src/tui/handlers.go
index d6a5fc6..213237f 100644
--- a/internal/tui/handlers.go
+++ b/src/tui/handlers.go
@@ -3,8 +3,8 @@ package tui
 import (
 	"fmt"
 
-	"gospt/internal/commands"
-	"gospt/internal/gctx"
+	"gospt/src/commands"
+	"gospt/src/gctx"
 
 	"github.com/zmb3/spotify/v2"
 )
diff --git a/internal/tui/loader.go b/src/tui/loader.go
similarity index 99%
rename from internal/tui/loader.go
rename to src/tui/loader.go
index 88f5e15..b2aae8c 100644
--- a/internal/tui/loader.go
+++ b/src/tui/loader.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/charmbracelet/bubbles/list"
 )
diff --git a/internal/tui/main.go b/src/tui/main.go
similarity index 99%
rename from internal/tui/main.go
rename to src/tui/main.go
index c285e30..6cbc22f 100644
--- a/internal/tui/main.go
+++ b/src/tui/main.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"gospt/internal/gctx"
+	"gospt/src/gctx"
 
 	"github.com/charmbracelet/bubbles/key"
 	"github.com/charmbracelet/bubbles/list"
diff --git a/internal/tui/tui.go b/src/tui/tui.go
similarity index 95%
rename from internal/tui/tui.go
rename to src/tui/tui.go
index 1edfc01..4d248a1 100644
--- a/internal/tui/tui.go
+++ b/src/tui/tui.go
@@ -3,7 +3,7 @@ package tui
 import (
 	"fmt"
 
-	"gospt/internal/gctx"
+	"gospt/src/gctx"
 
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/zmb3/spotify/v2"
diff --git a/internal/tui/views.go b/src/tui/views.go
similarity index 99%
rename from internal/tui/views.go
rename to src/tui/views.go
index 9f2fa00..2831979 100644
--- a/internal/tui/views.go
+++ b/src/tui/views.go
@@ -5,8 +5,8 @@ import (
 	"sync"
 	"time"
 
-	"gospt/internal/commands"
-	"gospt/internal/gctx"
+	"gospt/src/commands"
+	"gospt/src/gctx"
 
 	"github.com/charmbracelet/bubbles/list"
 	"github.com/zmb3/spotify/v2"