resolve

go.mod

@@ -13,7 +13,8 @@ require (
 	github.com/spf13/cobra v1.6.1
 	github.com/zmb3/spotify/v2 v2.3.1
 	golang.org/x/oauth2 v0.0.0-20210810183815-faf39c7919d5
-	modernc.org/sqlite v1.20.3
+	modernc.org/sqlite v1.20.4
+	tuxpa.in/a/zlog v1.60.0
 )
 
 require (
@@ -27,6 +28,7 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
@@ -36,6 +38,7 @@ require (
 	github.com/muesli/termenv v0.13.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/rs/zerolog v1.28.0 // indirect
 	github.com/sahilm/fuzzy v0.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	golang.org/x/mod v0.3.0 // indirect

go.sum

@@ -59,6 +59,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
 github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
+github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/coreos/go-systemd/v22 v22.4.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/cristalhq/aconfig v0.17.0/go.mod h1:NXaRp+1e6bkO4dJn+wZ71xyaihMDYPtCSvEhMTm/H3E=
 github.com/cristalhq/aconfig v0.18.3 h1:Or12LIWIF+2mQpcGWA2PQnNc55+WiHFAqRjYh/pQNtM=
@@ -76,6 +78,7 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -149,6 +152,9 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
@@ -172,6 +178,7 @@ github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0/go.mod h1:Bd5NYQ
 github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs=
 github.com/muesli/termenv v0.13.0 h1:wK20DRpJdDX8b7Ek2QfhvqhRQFZ237RGRO0RQ/Iqdy0=
 github.com/muesli/termenv v0.13.0/go.mod h1:sP1+uffeLaEYpyOTb8pLCUctGcGLnoFjSn4YJK5e2bc=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -181,6 +188,9 @@ github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY=
+github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI=
 github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
@@ -315,9 +325,11 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -491,8 +503,8 @@ modernc.org/memory v1.4.0 h1:crykUfNSnMAXaOJnnxcSzbUGMqkLWjklJKkBK2nwZwk=
 modernc.org/memory v1.4.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
 modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
 modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sqlite v1.20.3 h1:SqGJMMxjj1PHusLxdYxeQSodg7Jxn9WWkaAQjKrntZs=
+modernc.org/sqlite v1.20.4 h1:J8+m2trkN+KKoE7jglyHYYYiaq5xmz2HoHJIiBlRzbE=
-modernc.org/sqlite v1.20.3/go.mod h1:zKcGyrICaxNTMEHSr1HQ2GUraP0j+845GYw37+EyT6A=
+modernc.org/sqlite v1.20.4/go.mod h1:zKcGyrICaxNTMEHSr1HQ2GUraP0j+845GYw37+EyT6A=
 modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY=
 modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
 modernc.org/tcl v1.15.0 h1:oY+JeD11qVVSgVvodMJsu7Edf8tr5E/7tuhF5cNYz34=
@@ -502,3 +514,5 @@ modernc.org/z v1.7.0 h1:xkDw/KepgEjeizO2sNco+hqYkU12taxQFqPEmgm1GWE=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+tuxpa.in/a/zlog v1.60.0 h1:bU4wJk6nwvaFsKIvKKxgGM0uO+Z2kaE8LzgRiQ4NCRw=
+tuxpa.in/a/zlog v1.60.0/go.mod h1:1t8SX1a4zLy+p6ylGn6m1ZXnssTPr/2ErdPjjSP+C2k=

src/cache/cache.go

@@ -0,0 +1,98 @@
+package cache
+
+import (
+	"encoding/json"
+	"os"
+	"path/filepath"
+	"time"
+
+	"tuxpa.in/a/zlog/log"
+)
+
+type Cache struct {
+	Root string
+}
+
+type CacheEntry struct {
+	Expire time.Time `json:"e"`
+	Value  string    `json:"v"`
+}
+
+func DefaultCache() *Cache {
+	return &Cache{
+		Root: filepath.Join(os.TempDir(), "gospt.cache"),
+	}
+}
+
+func (c *Cache) load() (map[string]CacheEntry, error) {
+	out := map[string]CacheEntry{}
+	cache, err := os.Open(c.Root)
+	if err != nil {
+		return nil, err
+	}
+	if err := json.NewDecoder(cache).Decode(&out); err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *Cache) save(m map[string]CacheEntry) error {
+	payload, err := json.Marshal(m)
+	if err != nil {
+		return err
+	}
+	log.Trace().Str("tosave", string(payload)).Msg("saving cache")
+	err = os.WriteFile(c.Root, payload, 0640)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (c *Cache) GetOrDo(key string, do func() (string, error), ttl time.Duration) (string, error) {
+	conf, err := c.load()
+	if err != nil {
+		log.Trace().Err(err).Msg("cache failed read")
+		return c.Do(key, do, ttl)
+	}
+	val, ok := conf[key]
+	if !ok {
+		return c.Do(key, do, ttl)
+	}
+	if time.Now().After(val.Expire) {
+		return c.Do(key, do, ttl)
+	}
+	return val.Value, nil
+}
+
+func (c *Cache) Do(key string, do func() (string, error), ttl time.Duration) (string, error) {
+	if do == nil {
+		return "", nil
+	}
+	res, err := do()
+	if err != nil {
+		return "", err
+	}
+	return c.Put(key, res, ttl)
+}
+
+func (c *Cache) Put(key string, value string, ttl time.Duration) (string, error) {
+	conf, err := c.load()
+	if err != nil {
+		conf = map[string]CacheEntry{}
+	}
+	conf[key] = CacheEntry{
+		Expire: time.Now().Add(ttl),
+		Value:  value,
+	}
+	log.Trace().Str("key", key).Str("val", value).Msg("saving new cache key")
+	err = c.save(conf)
+	if err != nil {
+		log.Trace().Err(err).Msg("cache failed save")
+	}
+	return value, nil
+}
+
+func (c *Cache) Clear() error {
+	return os.Remove(c.Root)
+}

src/cmd/root.go

@@ -9,6 +9,7 @@ import (
 
 	"gitea.asdf.cafe/abs3nt/gospt/src/config"
 	"gitea.asdf.cafe/abs3nt/gospt/src/gctx"
+	"tuxpa.in/a/zlog"
 
 	"github.com/cristalhq/aconfig"
 	"github.com/cristalhq/aconfig/aconfigyaml"
@@ -21,6 +22,7 @@ var (
 	commands    *commands.Commands
 	cfgFile     string
 	userLicense string
+	verbose     bool
 
 	rootCmd = &cobra.Command{
 		Use:   "gospt",
@@ -42,13 +44,21 @@ func Execute(defCmd string) {
 }
 
 func init() {
+	zlog.SetGlobalLevel(zlog.DebugLevel)
 	if len(os.Args) > 1 {
 		if os.Args[1] == "completion" || os.Args[1] == "__complete" {
 			return
 		}
 	}
-	cobra.OnInitialize(initConfig)
+	rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "enable verbose logging")
-	cobra.OnInitialize(initClient)
+
+	cobra.OnInitialize(func() {
+		if verbose {
+			zlog.SetGlobalLevel(zlog.TraceLevel)
+		}
+	})
+	cobra.OnInitialize(initConfig, initClient)
+
 }
 
 func initConfig() {

src/commands/commands.go

@@ -17,6 +17,7 @@ import (
 
 	"gfx.cafe/util/go/frand"
 	"gitea.asdf.cafe/abs3nt/gospt/src/auth"
+	"gitea.asdf.cafe/abs3nt/gospt/src/cache"
 	"gitea.asdf.cafe/abs3nt/gospt/src/gctx"
 
 	"github.com/zmb3/spotify/v2"
@@ -26,6 +27,8 @@ import (
 type Commands struct {
 	cl *spotify.Client
 	mu sync.RWMutex
+
+	user string
 }
 
 func (c *Commands) Client() *spotify.Client {
@@ -39,6 +42,11 @@ func (c *Commands) Client() *spotify.Client {
 	return c.cl
 }
 
+func (c *Commands) User() string {
+	c.Client()
+	return c.user
+}
+
 func (c *Commands) connectClient() *spotify.Client {
 	ctx := gctx.NewContext(context.Background())
 	client, err := auth.GetClient(ctx)
@@ -49,7 +57,7 @@ func (c *Commands) connectClient() *spotify.Client {
 	if err != nil {
 		panic(err)
 	}
-	ctx.UserId = currentUser.ID
+	c.user = currentUser.ID
 	return &spotify.Client{}
 }
 
@@ -736,7 +744,7 @@ func (c *Commands) Devices(ctx *gctx.Context) error {
 	if err != nil {
 		return err
 	}
-	return c.PrintDevices(devices)
+	return PrintDevices(devices)
 }
 
 func (c *Commands) Pause(ctx *gctx.Context) error {
@@ -901,11 +909,27 @@ func (c *Commands) LinkContext(ctx *gctx.Context) (string, error) {
 }
 
 func (c *Commands) NowPlaying(ctx *gctx.Context) error {
-	current, err := c.Client().PlayerCurrentlyPlaying(ctx)
+	song, err := cache.DefaultCache().GetOrDo("now_playing", func() (string, error) {
+		current, err := c.Client().PlayerCurrentlyPlaying(ctx)
+		if err != nil {
+			return "", err
+		}
+		str := FormatSong(current)
+		return str, nil
+	}, 5*time.Second)
 	if err != nil {
 		return err
 	}
-	return c.PrintPlaying(current)
+	fmt.Println(song)
+	return nil
+}
+
+func FormatSong(current *spotify.CurrentlyPlaying) string {
+	icon := "▶"
+	if !current.Playing {
+		icon = "⏸"
+	}
+	return fmt.Sprintf("%s %s - %s", icon, current.Item.Name, current.Item.Artists[0].Name)
 }
 
 func (c *Commands) Shuffle(ctx *gctx.Context) error {
@@ -975,7 +999,7 @@ func (c *Commands) PrintPlaying(current *spotify.CurrentlyPlaying) error {
 	return nil
 }
 
-func (c *Commands) PrintDevices(devices []spotify.PlayerDevice) error {
+func PrintDevices(devices []spotify.PlayerDevice) error {
 	out, err := json.MarshalIndent(devices, "", " ")
 	if err != nil {
 		return err
@@ -1264,7 +1288,7 @@ func (c *Commands) GetRadioPlaylist(ctx *gctx.Context, name string) (*spotify.Fu
 func (c *Commands) CreateRadioPlaylist(ctx *gctx.Context, name string) (*spotify.FullPlaylist, *sql.DB, error) {
 	// private flag doesnt work
 	configDir, _ := os.UserConfigDir()
-	playlist, err := c.Client().CreatePlaylistForUser(ctx, ctx.UserId, name+" - autoradio", "Automanaged radio playlist", false, false)
+	playlist, err := c.Client().CreatePlaylistForUser(ctx, c.User(), name+" - autoradio", "Automanaged radio playlist", false, false)
 	if err != nil {
 		return nil, nil, err
 	}

src/gctx/context.go

@@ -2,23 +2,22 @@ package gctx
 
 import (
 	"context"
-	"log"
 	"os"
+
+	"tuxpa.in/a/zlog"
 )
 
 type Context struct {
 	context.Context
-	*log.Logger
+	zlog.Logger
-	Debug  *log.Logger
+	Debug zlog.Logger
-	UserId string
 }
 
 func NewContext(ctx context.Context) *Context {
 	out := &Context{
-		ctx,
+		Context: ctx,
-		log.New(os.Stdout, "LOG:", 0),
+		Logger:  zlog.New(os.Stderr),
-		log.New(os.Stdout, "DEBUG:", 1),
+		Debug:   zlog.New(os.Stderr),
-		"",
 	}
 	return out
 }