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

radom

Browse Source
This commit is contained in:
abs3nt 2023-01-16 09:59:56 -08:00
parent 10e584a186
commit 7ec0ebb83b
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/commands/commands.go
View File

@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"math"
"math/rand" "math/rand"
"net/url" "net/url"
"os" "os"
@ -682,9 +683,9 @@ func RadioFromPlaylist(ctx *gctx.Context, client *spotify.Client, playlist spoti
if total == 0 { if total == 0 {
return fmt.Errorf("This playlist is empty") return fmt.Errorf("This playlist is empty")
} }
pages := (total / 50) pages := int(math.Ceil(float64(total) / 50))
randomPage := 1 randomPage := 1
if pages != 0 { if pages > 1 {
randomPage = rand.Intn(int(pages-1)) + 1 randomPage = rand.Intn(int(pages-1)) + 1
} }
playlistPage, err := client.GetPlaylistItems(ctx, playlist.ID, spotify.Limit(50), spotify.Offset((randomPage-1)*50)) playlistPage, err := client.GetPlaylistItems(ctx, playlist.ID, spotify.Limit(50), spotify.Offset((randomPage-1)*50))
@ -717,9 +718,9 @@ func RadioFromAlbum(ctx *gctx.Context, client *spotify.Client, album spotify.ID)
if total == 0 { if total == 0 {
return fmt.Errorf("This playlist is empty") return fmt.Errorf("This playlist is empty")
} }
pages := (total / 50) pages := int(math.Ceil(float64(total) / 50))
randomPage := 1 randomPage := 1
if pages != 0 { if pages > 1 {
randomPage = rand.Intn(int(pages-1)) + 1 randomPage = rand.Intn(int(pages-1)) + 1
} }
albumTrackPage, err := AlbumTracks(ctx, client, album, randomPage) albumTrackPage, err := AlbumTracks(ctx, client, album, randomPage)
@ -751,8 +752,11 @@ func RadioFromSavedTracks(ctx *gctx.Context, client *spotify.Client) error {
if savedSongs.Total == 0 { if savedSongs.Total == 0 {
return fmt.Errorf("You have no saved songs") return fmt.Errorf("You have no saved songs")
} }
pages := (savedSongs.Total / 50) pages := int(math.Ceil(float64(savedSongs.Total) / 50))
randomPage := rand.Intn(int(pages)) randomPage := 1
if pages > 1 {
randomPage = rand.Intn(int(pages-1)) + 1
}
trackPage, err := client.CurrentUsersTracks(ctx, spotify.Limit(50), spotify.Offset(randomPage*50)) trackPage, err := client.CurrentUsersTracks(ctx, spotify.Limit(50), spotify.Offset(randomPage*50))
if err != nil { if err != nil {
return err return err