Improved finding errorounus songs, and fix error with embedded player

server/handlers/list_change.js

@@ -89,11 +89,11 @@ function add_function(arr, coll, guid, offline, socket) {
                                             db.collection(coll).update({views:{$exists:true}}, {$set:{startTime: Functions.get_time()}});
                                             List.send_play(coll, undefined);
                                             Frontpage.update_frontpage(coll, id, title);
-                                            Search.get_correct_info(new_song, coll, false);
+                                            if(!full_list) Search.get_correct_info(new_song, coll, false);
                                         } else {
                                             var new_song = {"_id": "asd", "added":added,"guids":guids,"id":id,"now_playing":np,"title":title,"votes":votes, "duration":duration};
                                             io.to(coll).emit("channel", {type: "added", value: new_song});
-                                            Search.get_correct_info(new_song, coll, true);
+                                            if(!full_list) Search.get_correct_info(new_song, coll, true);
                                         }
                                         db.collection("frontpage_lists").update({_id:coll}, {$inc:{count:1}, $set:{accessed: Functions.get_time()}}, {upsert:true}, function(err, docs){});
                                         List.getNextSong(coll);

server/handlers/search.js

@@ -8,6 +8,7 @@ function get_correct_info(song_generated, channel, broadcast) {
             url: "https://www.googleapis.com/youtube/v3/videos?part=contentDetails,snippet,id&key="+key+"&id=" + song_generated.id,
 
     }, function(error, response, body) {
+        try {
             var resp = JSON.parse(body);
             if(resp.items.length == 1) {
                 var duration = parseInt(durationToSeconds(resp.items[0].contentDetails.duration));
@@ -36,7 +37,9 @@ function get_correct_info(song_generated, channel, broadcast) {
                     });
                 }
             }
-
+        catch(e){
+            console.log(e);
+        }
     });
 }
 
@@ -51,6 +54,7 @@ function check_error_video(msg, channel) {
             url: "https://www.googleapis.com/youtube/v3/videos?part=id&key="+key+"&id=" + msg.id,
 
     }, function(error, response, body) {
+        try {
             var resp = JSON.parse(body);
             if(resp.pageInfo.totalResults == 0) {
                 var yt_url = "https://www.googleapis.com/youtube/v3/search?key="+key+"&videoEmbeddable=true&part=id&type=video&order=viewCount&safeSearch=none&maxResults=5&q=" + encodeURIComponent(msg.title);
@@ -99,6 +103,9 @@ function check_error_video(msg, channel) {
                     }
                 });
             }
+        catch(e){
+            console.log(e);
+        }
     });
 }
 

server/public/assets/html/embed.html

@@ -7,10 +7,10 @@
 		<meta charset="UTF-8"/>
 		<link type="text/css" rel="stylesheet" href="/assets/css/materialize.min.css" />
 		<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-		<script type="text/javascript" src="/assets/dist/lib/jquery-2.1.3.min.js"></script>
+        <script type="text/javascript" src="https://code.jquery.com/jquery-2.2.4.min.js"></script>
-		<script type="text/javascript" src="/assets/dist/lib/materialize.min.js"></script>
+		<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-		<script type="text/javascript" src="/assets/dist/lib/jquery-ui-1.10.3.min.js"></script>
+		<script type="text/javascript" src="/assets/dist/lib/jquery-ui.min.js"></script>
-		<script type="text/javascript" src="/assets/dist/lib/socket.io.min.js"></script>
+		<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.3/socket.io.js"></script>
 		<link type="text/css" rel="stylesheet" href="/assets/css/embed.css" />
 		<script src="/assets/dist/embed.min.js"></script>
 	</head>

server/public/assets/js/embed.js

@@ -1,4 +1,6 @@
-
+var slider_type = "horizontal";
+var timed_remove_check;
+var gotten_np = false;
 var song_title = "";
 var paused = false;
 var player_ready = false;

server/public/assets/js/list.js

@@ -153,7 +153,7 @@ var List = {
 
     changedValues: function(song) {
         var i = List.getIndexOfSong(song.id);
-        if(i >= 0) {
+        if(i >= 0 && window.location.pathname != "/") {
             full_playlist[i].title = song.title;
             full_playlist[i].duration = song.duration;
             full_playlist[i].start = song.start;
@@ -289,26 +289,34 @@ var List = {
         $("#settings").css("opacity", "1");
         $("#wrapper").css("opacity", "1");
 
+        if(!embed) {
             clearTimeout(timed_remove_check);
             timed_remove_check = setTimeout(function() {
-            $.each(full_playlist, function(j, _current_song) {
+                if(full_playlist.length > 0) {
-                $.getJSON('https://www.googleapis.com/youtube/v3/videos?id=' + _current_song.id
+                    List.check_error_videos(0);
+                }
+            }, 1500);
+        }
+    },
+
+    check_error_videos: function(i) {
+        console.log(i);
+            $.getJSON('https://www.googleapis.com/youtube/v3/videos?id=' + full_playlist[i].id
                        + "&key=" + api_key + "&part=snippet",
               function (data, status, xhr) {
                 if (data.items.length == 0) {
-                        setTimeout(function() {
+                    socket.emit("error_video", {channel: chan.toLowerCase(), id: full_playlist[i].id, title: full_playlist[i].title});
-                            socket.emit("error_video", {channel: chan.toLowerCase(), id: _current_song.id, title: _current_song.title});
+                }
-                        }, 500);
+                if(full_playlist.length > i + 1 && window.location.pathname != "/") {
+                    List.check_error_videos(i + 1);
                 }
 
             }).error(function (xhr, errorType, exception) {
-                    //var errorMessage = exception || xhr.statusText || xhr.responseText;
+                socket.emit("error_video", {channel: chan.toLowerCase(), id: full_playlist[i].id, title: full_playlist[i].title});
-                    setTimeout(function() {
+                if(full_playlist.length > i + 1 && window.location.pathname != "/") {
-                        socket.emit("error_video", {channel: chan.toLowerCase(), id: _current_song.id, title: _current_song.title});
+                    List.check_error_videos(i + 1);
-                    }, 500);
+                }
             });
-            });
-        }, 1500);
     },
 
     dynamicContentPageJumpTo: function(page) {

server/public/assets/js/player.js

@@ -594,6 +594,12 @@ var Player = {
                 //currDurr = currDurr - Player.np.start;
                 minutes = Math.floor(currDurr / 60);
                 seconds = currDurr - (minutes * 60);
+                /*if(isNan(minutes)) {
+                    minutes = 0;
+                }
+                if(isNan(seconds)) {
+                    seconds = 0;
+                }*/
                 document.getElementById("duration").innerHTML = Helper.pad(minutes)+":"+Helper.pad(seconds)+" <span id='dash'>/</span> "+Helper.pad(dMinutes)+":"+Helper.pad(dSeconds);
                 per = (100 / duration) * currDurr;
                 if(per >= 100) {