KristyF/PartyJukebox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed the freaking bug in ordering

Browse source 
i went from array, to json, to realising json can't have duplicates, to now converting the json back to an array (with the help of chatgpt D: )
Its fine though it works now
This commit is contained in:
Kristy Fournier 2025-03-05 15:34:28 -05:00
parent cf8796a3a1
commit 03bb059558
1 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Client/scripts.js
View file

@ -205,34 +205,41 @@ async function checkSettings(skipServer=false) {
async function generateVisualPlaylist(conditions="") { async function generateVisualPlaylist(conditions="") {
document.getElementById("playlist").innerHTML = "<h1 id=\"playlist-alert\"></h1>"; document.getElementById("playlist").innerHTML = "<h1 id=\"playlist-alert\"></h1>";
playlist = await getFromServer(null, "playlist"); playlist = await getFromServer(null, "playlist");
playlist = Object.values(playlist).map(obj => {
const filename = Object.keys(obj)[0]; // Get the filename
const songData = obj[filename]; // Get the song metadata
return { filename, ...songData }; // Merge filename with song data
});
console.log(playlist)
if (playlist.length==0){ if (playlist.length==0){
document.getElementById("playlist-alert").innerHTML = "Nothing's Queued..." document.getElementById("playlist-alert").innerHTML = "Nothing's Queued..."
} else { } else {
if (conditions=="skip-button") { if (conditions=="skip-button") {
delete playlist[0] playlist.shift()
if (playlist.length==0){ if (playlist.length==0){
document.getElementById("playlist-alert").innerHTML = "Nothing's Queued..." document.getElementById("playlist-alert").innerHTML = "Nothing's Queued..."
} }
} }
for (let i in playlist) { for (let i in playlist) {
let fileName = Object.keys(playlist[i])[0] console.log(i)
let fileName = playlist[i]["filename"]
let newItem = document.createElement("div"); let newItem = document.createElement("div");
newItem.className = "item"; newItem.className = "item";
newItem.id = fileName; newItem.id = fileName;
let image = document.createElement("img"); let image = document.createElement("img");
try { try {
if (playlist[i][fileName]["art"] == null) { if (playlist[i]["art"] == null) {
throw "no image lolz" throw "no image lolz"
} }
image.src = playlist[i][fileName]["art"]; image.src = playlist[i]["art"];
} catch(err){ } catch(err){
image.src = "./images/placeholder.png"; image.src = "./images/placeholder.png";
} }
image.id = String(fileName)+" image"; image.id = String(fileName)+" image";
let head3 = document.createElement("h3"); let head3 = document.createElement("h3");
head3.innerText = playlist[i][fileName]["title"]; head3.innerText = playlist[i]["title"];
let head4 = document.createElement("h4"); let head4 = document.createElement("h4");
head4.innerText=playlist[i][fileName]["artist"]; head4.innerText=playlist[i]["artist"];
let head5 = document.createElement("h5"); let head5 = document.createElement("h5");
let timeLeft =document.createElement("h5"); let timeLeft =document.createElement("h5");
timeLeft.style.fontWeight = 100; timeLeft.style.fontWeight = 100;
@ -240,10 +247,10 @@ async function generateVisualPlaylist(conditions="") {
if (i == 0) { if (i == 0) {
head5.innerHTML="Playing"; head5.innerHTML="Playing";
if ((conditions != "skip-button")) { if ((conditions != "skip-button")) {
let mins = Math.floor(playlist[i][fileName]["time"]/60); let mins = Math.floor(playlist[i]["time"]/60);
let secs = Math.floor(playlist[i][fileName]["time"]%60); let secs = Math.floor(playlist[i]["time"]%60);
let durMins = Math.floor(playlist[i][fileName]["length"]/60); let durMins = Math.floor(playlist[i]["length"]/60);
let durSecs = Math.floor(playlist[i][fileName]["length"]%60); let durSecs = Math.floor(playlist[i]["length"]%60);
timeLeft.innerHTML = mins.toString() +":"+ secs.toLocaleString('en-US', {minimumIntegerDigits: 2,useGrouping: false}) + "/"+ durMins.toString()+":"+durSecs.toLocaleString('en-US', {minimumIntegerDigits: 2,useGrouping: false}); timeLeft.innerHTML = mins.toString() +":"+ secs.toLocaleString('en-US', {minimumIntegerDigits: 2,useGrouping: false}) + "/"+ durMins.toString()+":"+durSecs.toLocaleString('en-US', {minimumIntegerDigits: 2,useGrouping: false});
} }
} }