restructure

internal/auth/auth.go

@@ -1,4 +1,4 @@
-package authmanager
+package auth
 
 import (
 	"encoding/json"
@@ -9,8 +9,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"gospt/config"
+	"gospt/internal/config"
-	"gospt/ctx"
+	"gospt/internal/ctx"
 
 	"github.com/zmb3/spotify/v2"
 	spotifyauth "github.com/zmb3/spotify/v2/auth"

internal/commands/commands.go

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

internal/runner/runner.go

@@ -3,9 +3,9 @@ package runner
 import (
 	"fmt"
 
-	"gospt/commands"
+	"gospt/internal/commands"
-	"gospt/ctx"
+	"gospt/internal/ctx"
-	"gospt/tui"
+	"gospt/internal/tui"
 
 	"github.com/zmb3/spotify/v2"
 )

internal/tui/list.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"time"
 
-	"gospt/commands"
+	"gospt/internal/commands"
-	"gospt/ctx"
+	"gospt/internal/ctx"
 
 	"github.com/charmbracelet/bubbles/list"
 	tea "github.com/charmbracelet/bubbletea"

main.go

@@ -7,19 +7,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"gospt/authmanager"
+	"gospt/internal/auth"
-	"gospt/config"
+	"gospt/internal/config"
-	"gospt/ctx"
+	"gospt/internal/ctx"
-	"gospt/runner"
+	"gospt/internal/runner"
-
-	"github.com/zmb3/spotify/v2"
-	spotifyauth "github.com/zmb3/spotify/v2/auth"
-)
-
-var (
-	auth  *spotifyauth.Authenticator
-	ch    = make(chan *spotify.Client)
-	state = "abc123"
 )
 
 func init() {
@@ -32,7 +23,7 @@ func main() {
 	var err error
 	log.New(os.Stdout, "LOG:", 0)
 	ctx := ctx.NewContext(context.Background())
-	client, err := authmanager.GetClient(ctx)
+	client, err := auth.GetClient(ctx)
 	if err != nil {
 		panic(err.Error())
 	}