rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Actions Packages Projects Releases Wiki Activity

Give feedback when a queue fails

Browse source
This commit is contained in:
calzoneman 2013-05-19 13:06:39 -04:00
parent 01fc746334
commit cf2e1213a9
3 changed files with 44 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
channel.js
View file

@ -741,7 +741,11 @@ Channel.prototype.enqueue = function(data, user) {
case "vi": case "vi":
case "dm": case "dm":
case "sc": case "sc":
InfoGetter.getMedia(data.id, data.type, function(media) { InfoGetter.getMedia(data.id, data.type, function(err, media) {
if(err) {
user.socket.emit("queueFail");
return;
}
media.queueby = user ? user.name : ""; media.queueby = user ? user.name : "";
this.autoTemp(media, user); this.autoTemp(media, user);
this.queueAdd(media, idx); this.queueAdd(media, idx);

56
get-info.js
View file

@ -29,8 +29,10 @@ function getJSON(options, callback) {
} }
catch(e) { catch(e) {
Logger.errlog.log("JSON fail: " + options.path); Logger.errlog.log("JSON fail: " + options.path);
return; } callback(true, res.statusCode, null);
callback(res.statusCode, data); return;
}
callback(false, res.statusCode, data);
}); });
}); });
@ -51,9 +53,10 @@ function getJSONHTTPS(options, callback) {
} }
catch(e) { catch(e) {
Logger.errlog.log("JSON fail: " + options.path); Logger.errlog.log("JSON fail: " + options.path);
callback(true, res.statusCode, null);
return; return;
} }
callback(res.statusCode, data); callback(false, res.statusCode, data);
}); });
}); });
@ -102,8 +105,9 @@ exports.searchYT = function(terms, callback) {
} }
exports.getYTSearchResults = function(query, callback) { exports.getYTSearchResults = function(query, callback) {
var cback = function(res, data) { var cback = function(err, res, data) {
if(res != 200) { if(err || res != 200) {
callback(true, null);
return; return;
} }
@ -134,7 +138,7 @@ exports.getYTSearchResults = function(query, callback) {
Logger.errlog.log("getYTSearchResults failed: "); Logger.errlog.log("getYTSearchResults failed: ");
Logger.errlog.log(e); Logger.errlog.log(e);
} }
callback(vids); callback(false, vids);
} }
exports.searchYT(query.split(" "), cback); exports.searchYT(query.split(" "), cback);
@ -223,8 +227,9 @@ exports.getUstream = function(name, callback) {
exports.getMedia = function(id, type, callback) { exports.getMedia = function(id, type, callback) {
switch(type) { switch(type) {
case "yt": case "yt":
exports.getYTInfo(id, function(res, data) { exports.getYTInfo(id, function(err, res, data) {
if(res != 200) { if(err || res != 200) {
callback(true, null);
return; return;
} }
@ -233,17 +238,19 @@ exports.getMedia = function(id, type, callback) {
var seconds = data.entry.media$group.yt$duration.seconds; var seconds = data.entry.media$group.yt$duration.seconds;
var title = data.entry.title.$t; var title = data.entry.title.$t;
var media = new Media(id, title, seconds, "yt"); var media = new Media(id, title, seconds, "yt");
callback(media); callback(false, media);
} }
catch(e) { catch(e) {
Logger.errlog.log("getMedia failed: "); Logger.errlog.log("getMedia failed: ");
Logger.errlog.log(e); Logger.errlog.log(e);
callback(true, null);
} }
}); });
break; break;
case "vi": case "vi":
exports.getVIInfo(id, function(res, data) { exports.getVIInfo(id, function(err, res, data) {
if(res != 200) { if(err || res != 200) {
callback(true, null);
return; return;
} }
@ -252,17 +259,19 @@ exports.getMedia = function(id, type, callback) {
var seconds = data.duration; var seconds = data.duration;
var title = data.title; var title = data.title;
var media = new Media(id, title, seconds, "vi"); var media = new Media(id, title, seconds, "vi");
callback(media); callback(false, media);
} }
catch(e) { catch(e) {
Logger.errlog.log("getMedia failed: "); Logger.errlog.log("getMedia failed: ");
Logger.errlog.log(e); Logger.errlog.log(e);
callback(true, null);
} }
}); });
break; break;
case "dm": case "dm":
exports.getDMInfo(id, function(res, data) { exports.getDMInfo(id, function(err, res, data) {
if(res != 200) { if(err || res != 200) {
callback(true, null);
return; return;
} }
@ -270,17 +279,19 @@ exports.getMedia = function(id, type, callback) {
var seconds = data.duration; var seconds = data.duration;
var title = data.title; var title = data.title;
var media = new Media(id, title, seconds, "dm"); var media = new Media(id, title, seconds, "dm");
callback(media); callback(false, media);
} }
catch(e) { catch(e) {
Logger.errlog.log("getMedia failed: "); Logger.errlog.log("getMedia failed: ");
Logger.errlog.log(e); Logger.errlog.log(e);
callback(true, null);
} }
}); });
break; break;
case "sc": case "sc":
exports.getSCInfo(id, function(res, data) { exports.getSCInfo(id, function(err, res, data) {
if(res != 200) { if(err || res != 200) {
callback(true, null);
return; return;
} }
@ -289,17 +300,19 @@ exports.getMedia = function(id, type, callback) {
var seconds = data.duration / 1000; var seconds = data.duration / 1000;
var title = data.title; var title = data.title;
var media = new Media(id, title, seconds, "sc"); var media = new Media(id, title, seconds, "sc");
callback(media); callback(false, media);
} }
catch(e) { catch(e) {
Logger.errlog.log("getMedia failed: "); Logger.errlog.log("getMedia failed: ");
Logger.errlog.log(e); Logger.errlog.log(e);
callback(true, null);
} }
}); });
break; break;
case "yp": case "yp":
var cback = function(res, data) { var cback = function(err, res, data) {
if(res != 200) { if(err || res != 200) {
callback(true, null);
return; return;
} }
@ -313,7 +326,7 @@ exports.getMedia = function(id, type, callback) {
var title = item.title.$t; var title = item.title.$t;
var seconds = item.media$group.yt$duration.seconds; var seconds = item.media$group.yt$duration.seconds;
var media = new Media(id, title, seconds, "yt"); var media = new Media(id, title, seconds, "yt");
callback(media); callback(false, media);
} }
catch(e) { catch(e) {
Logger.errlog.log("getMedia failed: "); Logger.errlog.log("getMedia failed: ");
@ -331,6 +344,7 @@ exports.getMedia = function(id, type, callback) {
catch(e) { catch(e) {
Logger.errlog.log("getMedia failed: "); Logger.errlog.log("getMedia failed: ");
Logger.errlog.log(e); Logger.errlog.log(e);
callback(true, null);
} }
} }
exports.getYTPlaylist(id, cback); exports.getYTPlaylist(id, cback);

4
www/assets/js/callbacks.js
View file

@ -549,6 +549,10 @@ Callbacks = {
$(li).show("blind"); $(li).show("blind");
}, },
queueFail: function() {
alert("Queue failed. Double check your link to make sure the video exists.");
},
setTemp: function(data) { setTemp: function(data) {
var li = $("#queue").children()[data.idx]; var li = $("#queue").children()[data.idx];
var buttons = $(li).find(".qe_btn"); var buttons = $(li).find(".qe_btn");