From cf2e1213a9d0741c812e0674f71c8ee10feb81b5 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Sun, 19 May 2013 13:06:39 -0400
Subject: [PATCH] Give feedback when a queue fails

---
 channel.js                 |  6 +++-
 get-info.js                | 56 ++++++++++++++++++++++++--------------
 www/assets/js/callbacks.js |  4 +++
 3 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/channel.js b/channel.js
index 4e255e59..1a71d36b 100644
--- a/channel.js
+++ b/channel.js
@@ -741,7 +741,11 @@ Channel.prototype.enqueue = function(data, user) {
             case "vi":
             case "dm":
             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 : "";
                     this.autoTemp(media, user);
                     this.queueAdd(media, idx);
diff --git a/get-info.js b/get-info.js
index 0d6ae74e..ec0af238 100644
--- a/get-info.js
+++ b/get-info.js
@@ -29,8 +29,10 @@ function getJSON(options, callback) {
             }
             catch(e) {
                 Logger.errlog.log("JSON fail: " + options.path);
-                return; }
-            callback(res.statusCode, data);
+                callback(true, res.statusCode, null);
+                return;
+            }
+            callback(false, res.statusCode, data);
         });
     });
 
@@ -51,9 +53,10 @@ function getJSONHTTPS(options, callback) {
             }
             catch(e) {
                 Logger.errlog.log("JSON fail: " + options.path);
+                callback(true, res.statusCode, null);
                 return;
             }
-            callback(res.statusCode, data);
+            callback(false, res.statusCode, data);
         });
     });
 
@@ -102,8 +105,9 @@ exports.searchYT = function(terms, callback) {
 }
 
 exports.getYTSearchResults = function(query, callback) {
-    var cback = function(res, data) {
-        if(res != 200) {
+    var cback = function(err, res, data) {
+        if(err || res != 200) {
+            callback(true, null);
             return;
         }
 
@@ -134,7 +138,7 @@ exports.getYTSearchResults = function(query, callback) {
             Logger.errlog.log("getYTSearchResults failed: ");
             Logger.errlog.log(e);
         }
-        callback(vids);
+        callback(false, vids);
     }
 
     exports.searchYT(query.split(" "), cback);
@@ -223,8 +227,9 @@ exports.getUstream = function(name, callback) {
 exports.getMedia = function(id, type, callback) {
     switch(type) {
         case "yt":
-            exports.getYTInfo(id, function(res, data) {
-                if(res != 200) {
+            exports.getYTInfo(id, function(err, res, data) {
+                if(err || res != 200) {
+                    callback(true, null);
                     return;
                 }
 
@@ -233,17 +238,19 @@ exports.getMedia = function(id, type, callback) {
                     var seconds = data.entry.media$group.yt$duration.seconds;
                     var title = data.entry.title.$t;
                     var media = new Media(id, title, seconds, "yt");
-                    callback(media);
+                    callback(false, media);
                 }
                 catch(e) {
                     Logger.errlog.log("getMedia failed: ");
                     Logger.errlog.log(e);
+                    callback(true, null);
                 }
             });
             break;
         case "vi":
-            exports.getVIInfo(id, function(res, data) {
-                if(res != 200) {
+            exports.getVIInfo(id, function(err, res, data) {
+                if(err || res != 200) {
+                    callback(true, null);
                     return;
                 }
 
@@ -252,17 +259,19 @@ exports.getMedia = function(id, type, callback) {
                     var seconds = data.duration;
                     var title = data.title;
                     var media = new Media(id, title, seconds, "vi");
-                    callback(media);
+                    callback(false, media);
                 }
                 catch(e) {
                     Logger.errlog.log("getMedia failed: ");
                     Logger.errlog.log(e);
+                    callback(true, null);
                 }
             });
             break;
         case "dm":
-            exports.getDMInfo(id, function(res, data) {
-                if(res != 200) {
+            exports.getDMInfo(id, function(err, res, data) {
+                if(err || res != 200) {
+                    callback(true, null);
                     return;
                 }
 
@@ -270,17 +279,19 @@ exports.getMedia = function(id, type, callback) {
                     var seconds = data.duration;
                     var title = data.title;
                     var media = new Media(id, title, seconds, "dm");
-                    callback(media);
+                    callback(false, media);
                 }
                 catch(e) {
                     Logger.errlog.log("getMedia failed: ");
                     Logger.errlog.log(e);
+                    callback(true, null);
                 }
             });
             break;
         case "sc":
-            exports.getSCInfo(id, function(res, data) {
-                if(res != 200) {
+            exports.getSCInfo(id, function(err, res, data) {
+                if(err || res != 200) {
+                    callback(true, null);
                     return;
                 }
 
@@ -289,17 +300,19 @@ exports.getMedia = function(id, type, callback) {
                     var seconds = data.duration / 1000;
                     var title = data.title;
                     var media = new Media(id, title, seconds, "sc");
-                    callback(media);
+                    callback(false, media);
                 }
                 catch(e) {
                     Logger.errlog.log("getMedia failed: ");
                     Logger.errlog.log(e);
+                    callback(true, null);
                 }
             });
             break;
         case "yp":
-            var cback = function(res, data) {
-                if(res != 200) {
+            var cback = function(err, res, data) {
+                if(err || res != 200) {
+                    callback(true, null);
                     return;
                 }
 
@@ -313,7 +326,7 @@ exports.getMedia = function(id, type, callback) {
                             var title = item.title.$t;
                             var seconds = item.media$group.yt$duration.seconds;
                             var media = new Media(id, title, seconds, "yt");
-                            callback(media);
+                            callback(false, media);
                         }
                         catch(e) {
                             Logger.errlog.log("getMedia failed: ");
@@ -331,6 +344,7 @@ exports.getMedia = function(id, type, callback) {
                 catch(e) {
                     Logger.errlog.log("getMedia failed: ");
                     Logger.errlog.log(e);
+                    callback(true, null);
                 }
             }
             exports.getYTPlaylist(id, cback);
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index b3e89455..2d7da358 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -549,6 +549,10 @@ Callbacks = {
         $(li).show("blind");
     },
 
+    queueFail: function() {
+        alert("Queue failed.  Double check your link to make sure the video exists.");
+    },
+
     setTemp: function(data) {
         var li = $("#queue").children()[data.idx];
         var buttons = $(li).find(".qe_btn");