abs3nt/gospt
1
2
Fork 0
Code Issues 2 Pull Requests 10 Packages Projects Releases 20 Wiki Activity

add deps to makefile fix gitignore remove deprecated ioutil #3

Merged
abs3nt merged 8 commits from a into main 2023-01-19 05:26:32 +00:00
Conversation 1 Commits 8 Files Changed 4 +28 -26
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ae30971b50 - Show all commits

26
src/commands/commands.go
View File

@ -2,8 +2,9 @@ package commands
import ( import (
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"io/ioutil" "io"
"math" "math"
"math/rand" "math/rand"
"net/url" "net/url"
@ -728,7 +729,7 @@ func SetDevice(ctx *gctx.Context, client *spotify.Client, device spotify.PlayerD
return err return err
} }
configDir, _ := os.UserConfigDir() configDir, _ := os.UserConfigDir()
err = ioutil.WriteFile(filepath.Join(configDir, "gospt/device.json"), out, 0o644) err = os.WriteFile(filepath.Join(configDir, "gospt/device.json"), out, 0o644)
if err != nil { if err != nil {
return err return err
} }
@ -915,7 +916,7 @@ func activateDevice(ctx *gctx.Context, client *spotify.Client) error {
return err return err
} }
defer deviceFile.Close() defer deviceFile.Close()
deviceValue, err := ioutil.ReadAll(deviceFile) deviceValue, err := io.ReadAll(deviceFile)
if err != nil { if err != nil {
return err return err
} }
@ -936,35 +937,36 @@ func activateDevice(ctx *gctx.Context, client *spotify.Client) error {
func GetRadioPlaylist(ctx *gctx.Context, client *spotify.Client) (*spotify.FullPlaylist, error) { func GetRadioPlaylist(ctx *gctx.Context, client *spotify.Client) (*spotify.FullPlaylist, error) {
configDir, _ := os.UserConfigDir() configDir, _ := os.UserConfigDir()
if _, err := os.Stat(filepath.Join(configDir, "gospt/radio.json")); err == nil { playlistFile, err := os.ReadFile(filepath.Join(configDir, "gospt/radio.json"))
playlistFile, err := os.Open(filepath.Join(configDir, "gospt/radio.json")) if errors.Is(err, os.ErrNotExist) {
if err != nil { return CreateRadioPlaylist(ctx, client)
return nil, err
} }
defer playlistFile.Close()
playlistValue, err := ioutil.ReadAll(playlistFile)
if err != nil { if err != nil {
return nil, err return nil, err
} }
var playlist *spotify.FullPlaylist var playlist *spotify.FullPlaylist
err = json.Unmarshal(playlistValue, &playlist) err = json.Unmarshal(playlistFile, &playlist)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return playlist, nil return playlist, nil
} }
func CreateRadioPlaylist(ctx *gctx.Context, client *spotify.Client) (*spotify.FullPlaylist, error) {
// private flag doesnt work // private flag doesnt work
configDir, _ := os.UserConfigDir()
playlist, err := client.CreatePlaylistForUser(ctx, ctx.UserId, "autoradio", "Automanaged radio playlist", false, false) playlist, err := client.CreatePlaylistForUser(ctx, ctx.UserId, "autoradio", "Automanaged radio playlist", false, false)
if err != nil { if err != nil {
return nil, err return nil, err
} }
out, err := json.MarshalIndent(playlist, "", " ") raw, err := json.MarshalIndent(playlist, "", " ")
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = ioutil.WriteFile(filepath.Join(configDir, "gospt/radio.json"), out, 0o644) err = os.WriteFile(filepath.Join(configDir, "gospt/radio.json"), raw, 0o644)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return playlist, nil return playlist, nil
} }