junior/HomeAudio
junior/HomeAudio
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch get jukebox response to be json and parse appropriately

Browse Source
This commit is contained in:
Junior 2025-04-18 11:33:39 -04:00
parent 70886bacba
commit 426d2680f7
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ajax/ajax_getjukebox.php
View File

@ -6,21 +6,22 @@ $query = "SELECT id, songid FROM " . INSTANTQTABLE . " ORDER BY id";
$sth = $globaldbh->prepare($query); $sth = $globaldbh->prepare($query);
$sth->execute(); $sth->execute();
$data = array(); $data = array();
$firstsong = true; $data["jukebox"] = array();
while ( $row = $sth->fetch() ) { while ( $row = $sth->fetch() ) {
$id = $row['id']; $id = $row['id'];
$song = new Song($row['songid']); $song = new Song($row['songid']);
echo "<div id='juke_{$id}' class='songlist_song_container' onClick='dropJukeboxSong({$id});'>\n"; $curdata = array();
echo " <div class='songlist_img_container'><img class='songlist_img' src='{$song->getArtFile(ARTURL)}'></div>\n"; $curdata["id"] = $song->getID();
echo " <div class='songlist_details_container'>\n"; $curdata["arturl"] = $song->getArtFile(ARTURL);
echo " <p class='nomargin'><span class='playing_label'>Song:</span> {$song->getTitle(HTMLSAFE)}</p>\n"; $curdata["title"] = $song->getTitle(HTMLSAFE);
echo " <p class='nomargin'><span class='playing_label'>Artist:</span> {$song->getArtist(HTMLSAFE)}</p>\n"; $curdata["artist"] = $song->getArtist(HTMLSAFE);
echo " <p class='nomargin'><span class='playing_label'>Album:</span> {$song->getAlbum(HTMLSAFE)}</p>\n"; $curdata["album"] = $song->getAlbum(HTMLSAFE);
echo " </div>\n"; $curdata["year"] = $song->getYear(HTMLSAFE);
echo "</div>\n"; $data['jukebox'][] = $curdata;
echo "<hr class='songlist'>\n";
} }
header('Content-Type: application/json');
echo json_encode($data);
exit(); exit();
// vim: sw=3 ts=3 ai mouse-=a:
?>

4
js/minimal.js
View File

@ -247,9 +247,9 @@ function getJukeboxList() {
gettingJukeboxList = true; gettingJukeboxList = true;
$.ajax({ $.ajax({
url: 'ajax/ajax_getjukebox.php', url: 'ajax/ajax_getjukebox.php',
dataType: 'html', dataType: 'json',
success: function(data, stat, jqo) { success: function(data, stat, jqo) {
$('#jukebox_contents').html(data); $('#jukebox_contents').html(generateSongListHTML("juke", data.jukebox));
gettingSongList = false; gettingSongList = false;
gettingJukeboxList = false; gettingJukeboxList = false;
} }