From f9efad01ea24e1496956f0673c247e22fd34dd68 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Sun, 5 May 2013 18:52:16 -0500
Subject: [PATCH] Improve/fix youtube search results

---
 get-info.js  | 8 +++++---
 package.json | 2 +-
 server.js    | 3 +--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/get-info.js b/get-info.js
index 573274b3..6e4bfdf7 100644
--- a/get-info.js
+++ b/get-info.js
@@ -92,11 +92,11 @@ exports.searchYT = function(terms, callback) {
     for(var i = 0; i < terms.length; i++) {
         terms[i] = escape(terms[i]);
     }
-    var query = terms.join("/");
+    var query = terms.join("+");
     getJSON({
         host: "gdata.youtube.com",
         port: 80,
-        path: "/feeds/api/videos/-/" + query + "?v=2&alt=json",
+        path: "/feeds/api/videos/?q=" + query + "&v=2&alt=json",
         method: "GET",
         dataType: "jsonp",
         timeout: 1000}, callback);
@@ -110,7 +110,9 @@ exports.getYTSearchResults = function(query, callback) {
 
         var vids = [];
         try {
-
+            if(data.feed.entry.length === undefined) {
+                return;
+            }
             for(var i = 0; i < data.feed.entry.length; i++) {
                 try {
                     var item = data.feed.entry[i];
diff --git a/package.json b/package.json
index 067399cc..427b51f3 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "author": "Calvin Montgomery",
     "name": "CyTube",
     "description": "Online media synchronizer and chat",
-    "version": "1.6.0",
+    "version": "1.6.1",
     "repository": {
         "url": "http://github.com/calzoneman/sync"
     },
diff --git a/server.js b/server.js
index 63d20c59..a1ccbcad 100644
--- a/server.js
+++ b/server.js
@@ -9,7 +9,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-const VERSION = "1.6.0";
+const VERSION = "1.6.1";
 
 var fs = require("fs");
 var Logger = require("./logger.js");
@@ -107,7 +107,6 @@ exports.io.sockets.on("connection", function(socket) {
     Logger.syslog.log("Accepted connection from /" + user.ip);
 });
 
-
 process.on("uncaughtException", function(err) {
     Logger.errlog.log("[SEVERE] Uncaught Exception: " + err);
 });