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

http responses are entirely rewritten #6

Merged
kristy-fournier merged 6 commits from responseCodes into main 2026-01-26 12:31:24 -05:00
Conversation 0 Commits 6 Files changed 5 +46 -28
4 changed files with 46 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9bdac82f10 - Show all commits

3
Client/index.html
View file

@ -5,6 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<link rel="stylesheet" href="styles.css"> <link rel="stylesheet" href="styles.css">
<link rel="manifest" href="manifest.json" /> <link rel="manifest" href="manifest.json" />
<meta charset="utf-8">
</head> </head>
<body id="test-body"> <body id="test-body">
<!--Cookie Popup(does it matter if im not tracking them? i have no idea)--> <!--Cookie Popup(does it matter if im not tracking them? i have no idea)-->
@ -107,7 +108,7 @@ changes visibility with JS-->
<p class="italic" title="With PartyMode enabled, the second song will be added back randomly">Wipe the playlist, except the currently playing song*</p> <p class="italic" title="With PartyMode enabled, the second song will be added back randomly">Wipe the playlist, except the currently playing song*</p>
<button id="clear-button">Clear Playlist</button> <button id="clear-button">Clear Playlist</button>
</div> </div>
<p class="versionNumber">PartyJukebox is under an <a href="https://github.com/kristy-fournier/PartyJukebox/blob/main/LICENSE.md">AGPLV3</a> liscense. You can access the source code <a href=https://github.com/kristy-fournier/PartyJukebox>here</a>.</p> <p class="versionNumber">PartyJukebox is under an <a href="https://github.com/kristy-fournier/PartyJukebox/blob/main/LICENSE.md" target="_blank">AGPLV3</a> liscense. You can access the source code <a href=https://github.com/kristy-fournier/PartyJukebox target="_blank">here</a>.</p>
</div> </div>
</div> </div>
<!--All the buttons are down here but settings is just doing its own thing--> <!--All the buttons are down here but settings is just doing its own thing-->

31
Client/scripts.js
View file

@ -2,7 +2,7 @@
let ip; let ip;
let alertTime = 2; let alertTime = 2;
let adminPass = ""; let adminPass = "";
const ERR_NO_ADMIN = "401"; // gonna use this later to refactor const ERR_NO_ADMIN = 401; // gonna use this later to refactor
const VALID_FILE_EXT = ["mp3","flac","wav"]; const VALID_FILE_EXT = ["mp3","flac","wav"];
const params = new URLSearchParams(location.search); const params = new URLSearchParams(location.search);
@ -46,8 +46,9 @@ async function getFromServer(bodyInfo, source="",password=adminPass) {
"Content-type": "application/json; charset=UTF-8" "Content-type": "application/json; charset=UTF-8"
} }
}); });
const data = await response.json(); const data = await response.json();
if (data == ERR_NO_ADMIN) { if (response.status == ERR_NO_ADMIN) {
// im suprised i didn't comment on this already but this is kinda lame desing // im suprised i didn't comment on this already but this is kinda lame desing
// its not wrong but you know // its not wrong but you know
// it is easy which i like // it is easy which i like
@ -56,9 +57,11 @@ async function getFromServer(bodyInfo, source="",password=adminPass) {
} }
return await data; return await data;
} catch(e) { } catch(e) {
console.log("error print here:");
console.log(e);
if (e == "TypeError: Failed to fetch"){ if (e == "TypeError: Failed to fetch"){
alertText("Error: Can't Connect to Server (is the ip set?)") alertText("Error: Can't Connect to Server (is the ip set?)")
} else if(e == "") { } else if(e === "") {
} else { } else {
alertText("Error: " + e); alertText("Error: " + e);
@ -155,6 +158,13 @@ async function searchSongs(searchTerm){
newItem.appendChild(image); newItem.appendChild(image);
newItem.appendChild(head3); newItem.appendChild(head3);
newItem.appendChild(head4); newItem.appendChild(head4);
// I like this concept but i'm leaving it out for now
// if(currentSongInJSON.lossless === 1) {
// let losslesstag = document.createElement("p");
// losslesstag.textContent = "Ⓛ";
// losslesstag.classList.add("lossless-tag");
// newItem.appendChild(losslesstag);
// }
document.getElementById("songlist").appendChild(newItem); document.getElementById("songlist").appendChild(newItem);
} }
@ -301,7 +311,7 @@ async function generateVisualPlaylist(conditions="") {
let timeLeft =document.createElement("h5"); let timeLeft =document.createElement("h5");
timeLeft.style.fontWeight = 100; timeLeft.style.fontWeight = 100;
try { try {
if (i == 0) { if (i == 0) { // Only the first song in the loop gets a time
head5.innerHTML="Playing"; head5.innerHTML="Playing";
if ((conditions != "skip-button")) { if ((conditions != "skip-button")) {
let mins = Math.floor(playlist[i]["time"]/60); let mins = Math.floor(playlist[i]["time"]/60);
@ -313,7 +323,7 @@ async function generateVisualPlaylist(conditions="") {
} }
}catch(err){ }catch(err){
// i dont know why there's a try catch here but i'm leaving it i dont want to break something // i dont know why there's a try catch here but i'm leaving it i dont want to break something
console.log(err) console.error(err)
} }
let textdiv = document.createElement("div") let textdiv = document.createElement("div")
textdiv.className="text" textdiv.className="text"
@ -332,11 +342,9 @@ async function submitSong(songid) {
let returncode = await getFromServer({song: songid}, "songadd"); let returncode = await getFromServer({song: songid}, "songadd");
if(returncode == ERR_NO_ADMIN) { if(returncode == ERR_NO_ADMIN) {
// right now the error is alerted in getFromServer, maybe will change that // right now the error is alerted in getFromServer, maybe will change that
} } else if(returncode["error"]=="song-in-queue") {
else if(returncode["error"]=="song-in-queue") {
alertText("That song's about to play! Hang on!") alertText("That song's about to play! Hang on!")
} } else {
else {
alertText("Added to Queue"); alertText("Added to Queue");
} }
} }
@ -346,11 +354,10 @@ function checkWhatSongWasClicked(e) {
if ((itemId.length-itemId.lastIndexOf("image") == 5) && itemId.lastIndexOf("image")!=-1) { if ((itemId.length-itemId.lastIndexOf("image") == 5) && itemId.lastIndexOf("image")!=-1) {
itemId = itemId.slice(0,-6) itemId = itemId.slice(0,-6)
} }
let filenameSep = itemId.split('.')
//i feel like later kristy won't apreciate this //i feel like later kristy won't apreciate this
//one of my files was "file.MP3" so it didn't work //one of my files was "file.MP3" so it didn't work
//windows be like //windows be like
let filenameSep = itemId.split('.')
if (VALID_FILE_EXT.includes(filenameSep[filenameSep.length-1].toLowerCase())) { if (VALID_FILE_EXT.includes(filenameSep[filenameSep.length-1].toLowerCase())) {
submitSong(itemId); submitSong(itemId);
} }
@ -443,6 +450,8 @@ document.getElementById("volumerange").onchange = async function() {
if (returnValue == ERR_NO_ADMIN) { if (returnValue == ERR_NO_ADMIN) {
// alertText("Error: Admin restricted action"); // alertText("Error: Admin restricted action");
// there's an admin restrict alert built into getFromServer // there's an admin restrict alert built into getFromServer
// i wanna put the volume slider back to where it was but idk a good way to keep the previous volume
checkSettings(false);
} else if (returnValue["volumePassed"] !=0) { } else if (returnValue["volumePassed"] !=0) {
// i forgot about this, i had to do this because it confused the crap out of me one time // i forgot about this, i had to do this because it confused the crap out of me one time
// vlc doesn't let you change the volume of nothing, which makes sense if you think about it // vlc doesn't let you change the volume of nothing, which makes sense if you think about it

7
Client/styles.css
View file

@ -134,6 +134,7 @@ h4 {
.songlist > .item > h3, .songlist > .item > h4{ .songlist > .item > h3, .songlist > .item > h4{
margin-left: 2px; margin-left: 2px;
margin-right: 2px; margin-right: 2px;
margin: 5px;
word-wrap: break-word; word-wrap: break-word;
} }
@ -152,6 +153,12 @@ h4 {
width: 20%; width: 20%;
min-width: 50px; min-width: 50px;
} }
.lossless-tag {
width:16px;
padding: 1px;
margin-left: auto;
}
/* playlist mode stuff */ /* playlist mode stuff */
.playlist { .playlist {

33
Server/webbyBits.py
View file

@ -10,10 +10,9 @@ parser.add_argument('-a','--admin',help="Add an admin password to be used in the
args = parser.parse_args() args = parser.parse_args()
dotenv.load_dotenv() dotenv.load_dotenv()
portTheUserPicked=os.getenv("SERVER_PORT") portTheUserPicked=os.getenv("SERVER_PORT")
# Just a note that the return code "401" as of now is used to mean "you don't have the password"
# This is not great design, and the whole "returning string codes" thing is something to add to the todo list ERR_NO_ADMIN = ({"error":"no-admin"},401)
# I mean returning 200 when no return is necesary i think is fine but we'll see ERR_200 = ({"error":"OK"},200)
ERR_NO_ADMIN = "401"
if args.admin: if args.admin:
ADMIN_PASS = hashlib.sha256(bytes(args.admin,'utf-8')).hexdigest() ADMIN_PASS = hashlib.sha256(bytes(args.admin,'utf-8')).hexdigest()
else: else:
@ -99,7 +98,8 @@ def playQueuedSongs():
# the above 2 means this only applies if (a song is playing or paused) and (the queue is empty) # the above 2 means this only applies if (a song is playing or paused) and (the queue is empty)
playlist.append(result[0][0]) playlist.append(result[0][0])
# check for new songs every second # check for new songs every second
# I just didn't want to eat too much processing looping # I just didn't want to eat too much processing looping
# this also has another useful affect that skips get "queued" to only 1 per second, that way somebody usually can't skip twice accidentally
time.sleep(1) time.sleep(1)
@app.route("/controls", methods=['POST']) @app.route("/controls", methods=['POST'])
@ -112,26 +112,27 @@ def playerControls():
if recieveData["control"] == "play-pause": if recieveData["control"] == "play-pause":
if ADMIN_PASS == recieveData['password'] or controlPerms["PP"]: if ADMIN_PASS == recieveData['password'] or controlPerms["PP"]:
player.pause() player.pause()
return "200" return ERR_200
else: else:
return ERR_NO_ADMIN return ERR_NO_ADMIN
elif recieveData["control"] == "skip": elif recieveData["control"] == "skip":
if ADMIN_PASS == recieveData['password'] or controlPerms["SK"]: if ADMIN_PASS == recieveData['password'] or controlPerms["SK"]:
skipNow = True skipNow = True
return "200" return ERR_200
else: else:
return ERR_NO_ADMIN return ERR_NO_ADMIN
# Maybe i should have put this next one in the "settings" section
elif recieveData["control"] == "clear": elif recieveData["control"] == "clear":
if ADMIN_PASS == recieveData['password']: # this is only ever allowed with the adminpassword if ADMIN_PASS == recieveData['password']: # this is only ever allowed with the adminpassword
with playlistLock: with playlistLock:
playlist.clear() playlist.clear()
return "200" return ERR_200
else: else:
return ERR_NO_ADMIN return ERR_NO_ADMIN
else: else:
return "400" return {"error":"Not a valid control"},400
else: else:
return "400" return {"error":"No control sent"},400
@app.route("/settings", methods=['POST']) @app.route("/settings", methods=['POST'])
def settingsControl(): def settingsControl():
@ -149,14 +150,13 @@ def settingsControl():
elif recieveData["setting"] == "partymode-toggle": elif recieveData["setting"] == "partymode-toggle":
if ADMIN_PASS == recieveData['password'] or controlPerms["PM"]: if ADMIN_PASS == recieveData['password'] or controlPerms["PM"]:
partyMode = not(partyMode) partyMode = not(partyMode)
return "200" return ERR_200
else: else:
return ERR_NO_ADMIN return ERR_NO_ADMIN
elif recieveData["setting"] == "perms": elif recieveData["setting"] == "perms":
if ADMIN_PASS == recieveData["password"] and ADMIN_PASS: if ADMIN_PASS == recieveData["password"]:
#if an adminpass doesn't exist these perms can never be changed
controlPerms = recieveData["admin"] controlPerms = recieveData["admin"]
return "200" return ERR_200
else: else:
return ERR_NO_ADMIN return ERR_NO_ADMIN
elif recieveData["setting"] == "getsettings": elif recieveData["setting"] == "getsettings":
@ -184,7 +184,8 @@ def searchSongDB():
"title": i[1], "title": i[1],
"artist": i[2], "artist": i[2],
"art": i[3], "art": i[3],
"length": i[4] "length": i[4],
"lossless":i[5]
} }
fileofDB.close() fileofDB.close()
return tempdata return tempdata
@ -201,7 +202,7 @@ def songadd():
# probably with a checkbox like the other admin controls # probably with a checkbox like the other admin controls
if True: if True:
queueSong(recieveData['song']) queueSong(recieveData['song'])
return "200" return ERR_200
else: else:
# the password is incorrect (technically a password not existing falls into the above case because controlPerms is never changed) # the password is incorrect (technically a password not existing falls into the above case because controlPerms is never changed)
return ERR_NO_ADMIN return ERR_NO_ADMIN