slow

main.go

@@ -1,6 +1,8 @@
 package main
 
-import "gospt/cmd"
+import (
+	"gospt/src/cmd"
+)
 
 func main() {
 	defCmd := "tui"

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"

src/cmd/clearradio.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )

src/cmd/devices.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )

src/cmd/like.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )

src/cmd/link.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )

src/cmd/nowplaying.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )

src/cmd/pause.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )

src/cmd/play.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )

src/cmd/playurl.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )

src/cmd/previous.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )

src/cmd/radio.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )

src/cmd/refillradio.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )

src/cmd/repeat.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )

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{

src/cmd/setdevice.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/tui"
+	"gospt/src/tui"
 
 	"github.com/spf13/cobra"
 )

src/cmd/shuffle.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )

src/cmd/skip.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )

src/cmd/status.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )

src/cmd/toggleplay.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )

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"
 )

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"
 )

src/cmd/unlike.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/spf13/cobra"
 )

src/commands/commands.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"gospt/internal/gctx"
+	"gospt/src/gctx"
 
 	"github.com/zmb3/spotify/v2"
 )

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"
 )

src/tui/loader.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"gospt/internal/commands"
+	"gospt/src/commands"
 
 	"github.com/charmbracelet/bubbles/list"
 )

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"

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"

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"