From b776925122e403ab2b973c20c86eda03ec487522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Sun, 12 Apr 2015 19:00:11 +0200 Subject: [PATCH] Added number of songs in list support on frontpage --- server/server.js | 12 +++++++----- static/js/nochan.js | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/server/server.js b/server/server.js index 725c26af..d2b0e0f6 100755 --- a/server/server.js +++ b/server/server.js @@ -37,15 +37,17 @@ io.on('connection', function(socket){ colNames.forEach(function(name){ if(name != "system.indexes") { - db.collection(name).find({now_playing:true}, function(err, np){ - complete(np, i, colNames.length-2, name); - i++; + db.collection(name).count(function(err, num){ + db.collection(name).find({now_playing:true}, function(err, np){ + complete(np, i, colNames.length-2, name, num-1); + i++; + }); }); } }); }); - var complete = function(list, curr, tot, name) + var complete = function(list, curr, tot, name, count) { if(list.length > 0) { @@ -54,7 +56,7 @@ io.on('connection', function(socket){ try{ var viewers = lists[name].length; }catch(err){var viewers = 0;} - var to_push = [viewers, id, title, name]; + var to_push = [viewers, id, title, name, count]; playlists_to_send.push(to_push); } if(curr == tot) diff --git a/static/js/nochan.js b/static/js/nochan.js index 8aae3e4a..c62d56e6 100644 --- a/static/js/nochan.js +++ b/static/js/nochan.js @@ -25,12 +25,13 @@ function populate_channels(lists) var chan = lists[x][3]; var viewers = lists[x][0]; var img = "background-image:url('http://img.youtube.com/vi/"+id+"/hqdefault.jpg');"; + var song_count = lists[x][4]; $("#channels").append(list_html); var card = $("#chan-card"); card.find(".chan-name").text(chan); card.find(".chan-views").text(viewers); - card.find(".chan-songs").text("666"); + card.find(".chan-songs").text(song_count); card.find(".chan-bg").attr("style", img); card.find(".chan-link").attr("href", chan);