Pass around country code as pointer

Author: devgianlu

cmd/daemon/main.go

@@ -68,7 +68,7 @@ func NewApp(cfg *Config) (app *App, err error) {
 
 func (app *App) newSession(creds SessionCredentials) (*Session, error) {
 	// connect new session
-	sess := &Session{app: app}
+	sess := &Session{app: app, countryCode: new(string)}
 	if err := sess.Connect(creds); err != nil {
 		return nil, err
 	}

cmd/daemon/session.go

@@ -36,7 +36,7 @@ type Session struct {
 
 	// TODO: can this be factored better?
 	prodInfo    *ProductInfo
-	countryCode string
+	countryCode *string
 
 	// TODO: consider not locking this if we are modifying it always from the same routine
 	state     *State
@@ -61,7 +61,7 @@ func (s *Session) handleAccesspointPacket(pktType ap.PacketType, payload []byte)
 		s.prodInfo = &prod
 		return nil
 	case ap.PacketTypeCountryCode:
-		s.countryCode = string(payload)
+		*s.countryCode = string(payload)
 		return nil
 	default:
 		return nil

player/player.go

@@ -19,7 +19,7 @@ const Channels = 2
 const MaxStateVolume = 65535
 
 type Player struct {
-	countryCode string
+	countryCode *string
 
 	sp       *spclient.Spclient
 	audioKey *audio.KeyProvider
@@ -58,7 +58,7 @@ type playerCmdDataSet struct {
 	paused bool
 }
 
-func NewPlayer(sp *spclient.Spclient, audioKey *audio.KeyProvider, countryCode string, device string, volumeSteps uint32) (*Player, error) {
+func NewPlayer(sp *spclient.Spclient, audioKey *audio.KeyProvider, countryCode *string, device string, volumeSteps uint32) (*Player, error) {
 	p := &Player{
 		sp:          sp,
 		audioKey:    audioKey,
@@ -215,7 +215,7 @@ func (p *Player) NewStream(tid librespot.TrackId, bitrate int, trackPosition int
 		return nil, fmt.Errorf("failed getting track metadata: %w", err)
 	}
 
-	if isTrackRestricted(trackMeta, p.countryCode) {
+	if isTrackRestricted(trackMeta, *p.countryCode) {
 		return nil, librespot.ErrTrackRestricted
 	}
 

player/restriction.go

@@ -1,14 +1,13 @@
 package player
 
 import (
-	"fmt"
 	metadatapb "go-librespot/proto/spotify/metadata"
 	"strings"
 )
 
 func isTrackRestricted(track *metadatapb.Track, country string) bool {
 	if len(country) != 2 {
-		panic(fmt.Sprintf("invalid country code: %s", country))
+		return false
 	}
 
 	contains := func(list string) bool {