bump to Go 1.20 and rm deprecated rand.Seed

This commit is contained in:
Drew Weymouth
2023-12-19 17:59:24 -08:00
parent a16e687c02
commit 81dde8ee2e
3 changed files with 3 additions and 9 deletions
+2 -1
View File
@@ -3,6 +3,7 @@ package backend
import ( import (
"context" "context"
"log" "log"
"math/rand"
"time" "time"
"github.com/dweymouth/supersonic/backend/mediaprovider" "github.com/dweymouth/supersonic/backend/mediaprovider"
@@ -180,7 +181,7 @@ func (p *PlaybackManager) LoadTracks(tracks []*mediaprovider.Track, appendToQueu
} }
nums := util.Range(len(tracks)) nums := util.Range(len(tracks))
if shuffle { if shuffle {
util.ShuffleSlice(nums) rand.Shuffle(len(nums), func(i, j int) { nums[i], nums[j] = nums[j], nums[i] })
} }
for _, i := range nums { for _, i := range nums {
url, err := p.sm.Server.GetStreamURL(tracks[i].ID, p.transcodeCfg.ForceRawFile) url, err := p.sm.Server.GetStreamURL(tracks[i].ID, p.transcodeCfg.ForceRawFile)
-7
View File
@@ -2,9 +2,7 @@ package util
import ( import (
"io" "io"
"math/rand"
"os" "os"
"time"
) )
// Return a slice of range [0, n) // Return a slice of range [0, n)
@@ -16,11 +14,6 @@ func Range(n int) []int {
return s return s
} }
func ShuffleSlice(a []int) {
rand.Seed(time.Now().UnixNano())
rand.Shuffle(len(a), func(i, j int) { a[i], a[j] = a[j], a[i] })
}
func CopyFile(srcPath, dstPath string) error { func CopyFile(srcPath, dstPath string) error {
fin, err := os.Open(srcPath) fin, err := os.Open(srcPath)
if err != nil { if err != nil {
+1 -1
View File
@@ -1,6 +1,6 @@
module github.com/dweymouth/supersonic module github.com/dweymouth/supersonic
go 1.19 go 1.20
require ( require (
fyne.io/fyne/v2 v2.4.1 fyne.io/fyne/v2 v2.4.1