Upgraded Go version and the version of all dependencies. Fixed som more bugs.

This commit is contained in:
2024-05-18 13:11:15 +02:00
parent a863702b22
commit 59f1e2c75c
11 changed files with 227 additions and 1111 deletions

View File

@@ -1,15 +1,12 @@
package server
import (
"io/ioutil"
"log"
"math/rand"
"music-server/pkg/db"
"music-server/pkg/helpers"
"music-server/pkg/models"
"os"
"strconv"
"time"
)
var currentSong = -1
@@ -18,7 +15,7 @@ var songQue []models.SongData
var lastFetched models.SongData
func GetSoundCheckSong() string {
files, err := ioutil.ReadDir("songs")
files, err := os.ReadDir("songs")
if err != nil {
log.Fatal(err)
}
@@ -50,13 +47,8 @@ func GetRandomSong() string {
if games == nil || len(games) == 0 {
games = db.FindAllGames()
}
songExists := false
var song models.SongData
for !songExists {
song = getSongFromList(games)
songExists = helpers.CheckIfSongExists(song)
}
song := getSongFromList(games)
lastFetched = song
return song.Path
}
@@ -78,12 +70,7 @@ func GetRandomSongLowChance() string {
}
}
}
songExists := false
var song models.SongData
for !songExists {
song = getSongFromList(listOfGames)
songExists = helpers.CheckIfSongExists(song)
}
song := getSongFromList(games)
lastFetched = song
return song.Path
@@ -157,7 +144,6 @@ func GetAllGamesRandom() []string {
for _, game := range games {
jsonArray = append(jsonArray, game.GameName)
}
rand.Seed(time.Now().UnixNano())
rand.Shuffle(len(jsonArray), func(i, j int) { jsonArray[i], jsonArray[j] = jsonArray[j], jsonArray[i] })
return jsonArray
}
@@ -212,7 +198,7 @@ func getSongFromList(games []models.GameData) models.SongData {
if err != nil {
//File not found
db.RemoveBrokenSong(song)
log.Fatal("Song not found, song '" + song.SongName + "' deleted from game '" + game.GameName + "' songPath: " + song.Path)
log.Println("Song not found, song '" + song.SongName + "' deleted from game '" + game.GameName + "' songPath: " + song.Path)
} else {
songFound = true
}