").parent().html()),$("#main-row").append("
"),$("#player").removeClass("player_bottom"),$("#main-row").removeClass("frontpage_modified_heights"),$("#main_section_frontpage").remove(),$("#closePlayer").remove(),$("#player_bottom_overlay").remove()}$("#search").attr("placeholder","Find song on YouTube..."),$(".page-footer").addClass("padding-bottom-novideo"),1==$("#alreadychannel").length?e():(xe=!0,e()),0===$("#alreadyfp").length&&$("head").append("
")}})}};String.prototype.capitalizeFirstLetter=function(){return this.charAt(0).toUpperCase()+this.slice(1)};var ze={loaded:!0,before_load:"",after_load:"",ytplayer:"",stopInterval:!1,youtube_listener:function(e){if(ze.loaded=!1,"true"===localStorage.debug){console.log("--------youtube_listener--------"),console.log("Received: "),console.log(e),console.log("paused variable: "+G),console.log("mobile_beginning variable: "+me);try{console.log("getVideoUrl(): "+ze.ytplayer.getVideoUrl().split("v=")[1])}catch(e){}console.log("video_id variable: "+we),console.log("---------------------------------")}if(0===e.length){document.getElementById("song-title").innerHTML="Empty channel. Add some songs!",$("#player_overlay").height($("#player").height()),window.MSStream||$("#player_overlay").toggleClass("hide");try{ze.ytplayer.stopVideo()}catch(e){}}else{void 0===Se?Se=e[0][0].id:Se!=we&&(Se=we),we=e[0][0].id,R=e[1][0],time=e[2],ke=time-R.startTime,Ce=e[0][0].title,duration=e[0][0].duration,me&&T.mobilecheck()&&0===ke&&(ke=1);try{ye[0].id==we&&B.song_change(ye[0].added),Ve.fetchYoutubeSuggests(we)}catch(e){}if(ze.getTitle(Ce,J),ze.setBGimage(we),F&&!window.MSStream)try{ze.ytplayer.getVideoUrl().split("v=")[1]!=we&&(ze.ytplayer.loadVideoById(we),ze.notifyUser(we,Ce),ze.ytplayer.seekTo(ke),G&&ze.ytplayer.pauseVideo()),G||(me||ze.ytplayer.playVideo(),ne||ze.durationSetter()),(ze.ytplayer.getDuration()>ke||0===ze.ytplayer.getDuration())&&ze.ytplayer.seekTo(ke),ze.after_load=we,ze.loaded||setTimeout(function(){ze.loaded=!0},500)}catch(e){ne||ze.durationSetter()}else ze.getTitle(Ce,J)}},onPlayerStateChange:function(e){if("true"===localStorage.debug){console.log("-------onPlayerStateChange------"),console.log("New state\nState: "),console.log(e);try{console.log("Duration: "+ze.ytplayer.getDuration(),"Current time: "+ze.ytplayer.getCurrentTime()),console.log("getVideoUrl(): "+ze.ytplayer.getVideoUrl().split("v=")[1])}catch(e){}console.log("video_id variable: "+we),console.log("---------------------------------")}switch(e.data){case-1:break;case 0:W=!1,G=!1,Ie.emit("end",{id:we,channel:L.toLowerCase()});break;case 1:W=!0,beginning&&T.mobilecheck()&&(ze.ytplayer.pauseVideo(),beginning=!1,me=!1),te||"/"==window.location.pathname||T.addClass("#player_overlay","hide"),"/"!=window.location.pathname&&(1==document.getElementById("play").className.split(" ").length&&$("#play").toggleClass("hide"),2==document.getElementById("pause").className.split(" ").length&&$("#pause").toggleClass("hide")),G&&(Ie.emit("pos",{channel:L.toLowerCase()}),G=!1);break;case 2:G=!0,"/"!=window.location.pathname&&Ae.play_pause_show(),me=!0;break;case 3:}},getTitle:function(e,t){var o=t>1?"viewers":"viewer",n=decodeURIComponent(e);if("/"!=window.location.pathname){var a=document.getElementById("song-title"),i=document.getElementById("viewers");a.innerHTML=n,i.innerHTML=t+" "+o,a.title=n+" • "+t+" "+o}document.title=n+" • Zöff / "+L},errorHandler:function(e){5==e.data||100==e.data||101==e.data||150==e.data?(curr_playing=ze.ytplayer.getVideoUrl().replace("https://www.youtube.com/watch?v=",""),Ie.emit("skip",{error:e.data,id:we,pass:H,channel:L.toLowerCase})):void 0!==we&&ze.ytplayer.loadVideoById(we)},onPlayerReady:function(e){$("#channel-load").css("display","none");try{beginning=!0,F=!0,window.MSStream||($("#player").css("opacity","1"),$("#controls").css("opacity","1"),$(".playlist").css("opacity","1"),ze.ytplayer.loadVideoById(we),oe&&!T.mobilecheck()&&ze.ytplayer.playVideo(),ne||ze.durationSetter(),te?setTimeout(function(){ze.ytplayer.seekTo(ke),oe||(ze.ytplayer.pauseVideo(),Ae.play_pause_show())},1e3):ze.ytplayer.seekTo(ke)),ze.readyLooks(),Ae.initYoutubeControls(ze.ytplayer),Ae.initSlider(),ze.ytplayer.setVolume(I.get_volume()),$(".video-container").removeClass("no-opacity")}catch(e){}},readyLooks:function(){ze.setBGimage(we)},setBGimage:function(e){if(void 0!==e&&!te){var t=new Image;t.onload=function(){var e=new ColorThief,o=e.getColor(t);"/"!=window.location.pathname&&(document.getElementsByTagName("body")[0].style.backgroundColor=T.rgbToHsl(o,!0),$("meta[name=theme-color]").attr("content",T.rgbToHex(o[0],o[1],o[2])))},t.crossOrigin="Anonymous",t.src="https://zoff.no:8080/https://img.youtube.com/vi/"+e+"/mqdefault.jpg"}},set_width:function(e){$(".video-container").width(e)},notifyUser:function(e,t){if(t=t.replace(/\\\'/g,"'").replace(/"/g,"'").replace(/&/g,"&"),"granted"===Notification.permission&&document.hidden){var o=new Notification("Now Playing",{body:t,icon:"http://i.ytimg.com/vi/"+e+"/mqdefault.jpg",iconUrl:"http://i.ytimg.com/vi/"+e+"/mqdefault.jpg"});o.onclick=function(e){window.focus(),this.cancel()},setTimeout(function(){o.close()},5e3)}},setup_all_listeners:function(){n(),o(),s(),l(),c()},onYouTubeIframeAPIReady:function(){ze.ytplayer=new YT.Player("player",{videoId:we,playerVars:{rel:"0",wmode:"transparent",controls:"0",iv_load_policy:"3",theme:"light",color:"white",showinfo:0},events:{onReady:ze.onPlayerReady,onStateChange:ze.onPlayerStateChange,onError:ze.errorHandler}})},durationSetter:function(){if(void 0!==duration)try{ze.stopInterval||(ne=!0),dMinutes=Math.floor(duration/60),dSeconds=duration-60*dMinutes,currDurr=void 0!==ze.ytplayer.getCurrentTime()?Math.floor(ze.ytplayer.getCurrentTime()):ke,currDurr>duration&&(currDurr=duration),minutes=Math.floor(currDurr/60),seconds=currDurr-60*minutes,document.getElementById("duration").innerHTML=T.pad(minutes)+":"+T.pad(seconds)+"
/ "+T.pad(dMinutes)+":"+T.pad(dSeconds),per=100/duration*currDurr,per>=100?per=100:0===duration&&(per=0),$("#bar").width(per+"%")}catch(e){}ze.stopInterval||setTimeout(ze.durationSetter,1e3)},loadPlayer:function(){1==$("script[src='https://www.youtube.com/iframe_api']").length?ze.onYouTubeIframeAPIReady():(ve=document.createElement("script"),ve.src="https://www.youtube.com/iframe_api",$e=document.getElementsByTagName("script")[0],$e.parentNode.insertBefore(ve,$e))}},Ae={stopInterval:!1,initYoutubeControls:function(){!T.mobilecheck()||/iPad|iPhone|iPod/.test(navigator.userAgent)||window.MSStream||$("#controls").appendTo("#playbar"),Ae.initControls()},initControls:function(){document.getElementById("volume-button").addEventListener("click",Ae.mute_video),document.getElementById("playpause").addEventListener("click",Ae.play_pause),document.getElementById("fullscreen").addEventListener("click",Ae.fullscreen)},initSlider:function(){try{vol=I.get_volume()}catch(e){}$("#volume").slider({min:0,max:100,value:vol,range:"min",animate:!0,slide:function(e,t){Ae.setVolume(t.value);try{I.set_volume(t.value)}catch(e){}}}),Ae.choose_button(vol,!1)},fullscreen:function(){var e=document.getElementById("player"),t=e.requestFullScreen||e.mozRequestFullScreen||e.webkitRequestFullScreen;t&&t.bind(e)()},play_pause:function(){1==ze.ytplayer.getPlayerState()?(ze.ytplayer.pauseVideo(),!T.mobilecheck()||/iPad|iPhone|iPod/.test(navigator.userAgent)||window.MSStream||(document.getElementById("player").style.display="none",$(".video-container").toggleClass("click-through"),$(".page-footer").toggleClass("padding-bottom-extra"))):2!=ze.ytplayer.getPlayerState()&&0!==ze.ytplayer.getPlayerState()||(ze.ytplayer.playVideo(),!T.mobilecheck()||/iPad|iPhone|iPod/.test(navigator.userAgent)||window.MSStream||(document.getElementById("player").style.display="block",$(".video-container").toggleClass("click-through"),$(".page-footer").toggleClass("padding-bottom-extra")))},play_pause_show:function(){1==document.getElementById("pause").className.split(" ").length&&$("#pause").toggleClass("hide"),2==document.getElementById("play").className.split(" ").length&&$("#play").toggleClass("hide")},settings:function(){$("#qS").toggleClass("hide")},changeQuality:function(e){ze.ytplayer.getPlaybackQuality!=e&&(ze.ytplayer.setPlaybackQuality(e),ze.ytplayer.getPlaybackQuality()),$("#qS").toggleClass("hide")},mute_video:function(){ze.ytplayer.isMuted()?(ze.ytplayer.unMute(),Ae.choose_button(ze.ytplayer.getVolume(),!1)):(Ae.choose_button(0,!0),ze.ytplayer.mute())},setVolume:function(e){ze.ytplayer.setVolume(e),Ae.choose_button(e,!1),ze.ytplayer.isMuted()&&ze.ytplayer.unMute()},choose_button:function(e,t){t?(1==document.getElementById("v-full").className.split(" ").length&&$("#v-full").toggleClass("hide"),1==document.getElementById("v-medium").className.split(" ").length&&$("#v-medium").toggleClass("hide"),1==document.getElementById("v-low").className.split(" ").length&&$("#v-low").toggleClass("hide"),2==document.getElementById("v-mute").className.split(" ").length&&$("#v-mute").toggleClass("hide")):e>=0&&e<=33?(1==document.getElementById("v-full").className.split(" ").length&&$("#v-full").toggleClass("hide"),1==document.getElementById("v-medium").className.split(" ").length&&$("#v-medium").toggleClass("hide"),2==document.getElementById("v-low").className.split(" ").length&&$("#v-low").toggleClass("hide"),1==document.getElementById("v-mute").className.split(" ").length&&$("#v-mute").toggleClass("hide")):e>=34&&e<=66?(1==document.getElementById("v-full").className.split(" ").length&&$("#v-full").toggleClass("hide"),2==document.getElementById("v-medium").className.split(" ").length&&$("#v-medium").toggleClass("hide"),1==document.getElementById("v-low").className.split(" ").length&&$("#v-low").toggleClass("hide"),1==document.getElementById("v-mute").className.split(" ").length&&$("#v-mute").toggleClass("hide")):e>=67&&e<=100&&(2==document.getElementById("v-full").className.split(" ").length&&$("#v-full").toggleClass("hide"),1==document.getElementById("v-medium").className.split(" ").length&&$("#v-medium").toggleClass("hide"),1==document.getElementById("v-low").className.split(" ").length&&$("#v-low").toggleClass("hide"),1==document.getElementById("v-mute").className.split(" ").length&&$("#v-mute").toggleClass("hide"))},playPause:function(){state=ze.ytplayer.getPlayerState(),button=document.getElementById("playpause"),1==state?ze.ytplayer.pauseVideo():2==state&&ze.ytplayer.playVideo()},volumeOptions:function(){ze.ytplayer.isMuted()?(ze.ytplayer.unMute(),vol=ze.ytplayer.getVolume(),$("#volume").slider("value",ze.ytplayer.getVolume())):(ze.ytplayer.mute(),$("#volume").slider("value",0))},hoverMute:function(e){vol=ze.ytplayer.getVolume()}},De={showSearch:function(){$("#search-wrapper").toggleClass("hide"),T.mobilecheck()&&$(".search_input").focus(),$("#song-title").toggleClass("hide"),$("#results").toggleClass("hide"),$("#results").empty(),$("#search-btn i").toggleClass("mdi-navigation-close"),$("#search-btn i").toggleClass("mdi-action-search"),$("#search").focus()},search:function(e){if(void 0!==pe&&void 0!==ue||(pe=$("#temp-results-container"),ue=$("#empty-results-container").html()),$(".search_results").html(""),""!==e){j=!0;var t=encodeURIComponent(e),o="https://www.googleapis.com/youtube/v3/search?key="+V+"&videoEmbeddable=true&part=id&fields=items(id)&type=video&order=viewCount&safeSearch=none&maxResults=25";o+="&q="+t,Y&&(o+="&videoCategoryId=10");var n="https://www.googleapis.com/youtube/v3/videos?part=contentDetails,snippet,id&key="+V+"&id=";T.contains($("#search_loader").attr("class").split(" "),"hide")&&$("#search_loader").removeClass("hide"),T.contains($("#results").attr("class").split(" "),"hide")&&$("#results").removeClass("hide"),$.ajax({type:"GET",url:o,dataType:"jsonp",success:function(e){0===e.items.length?($("
"+ue+"
").appendTo($("#results")).show("blind",83.33),T.contains($("#search_loader").attr("class").split(" "),"hide")||$("#search_loader").addClass("hide")):e.items&&($.each(e.items,function(e,t){n+=t.id.videoId+","}),$.ajax({type:"GET",url:n,dataType:"jsonp",success:function(e){var t="",o=$(pe);$.each(e.items,function(e,n){var a=n.contentDetails.duration;if(secs=De.durationToSeconds(a),!longsongs||secs<720){be=n.snippet.title,enc_title=be,he=n.id,a=a.replace("PT","").replace("H","h ").replace("M","m ").replace("S","s"),thumb=n.snippet.thumbnails.medium.url;var i=o;i.find(".search-title").text(be),i.find(".result_info").text(a),i.find(".thumb").attr("data-original",thumb),i.find("#add-many").attr("data-video-id",he),i.find("#add-many").attr("data-video-title",enc_title),i.find("#add-many").attr("data-video-length",secs),i.find("#temp-results").attr("data-video-id",he),i.find("#temp-results").attr("data-video-title",enc_title),i.find("#temp-results").attr("data-video-length",secs),t+=i.html()}}),$("
"+t+"
").appendTo($("#results")).show("blind",83.33*(e.items.length-1)),setTimeout(function(){$(".thumb").lazyload({container:$("#results")})},250),T.contains($("#search_loader").attr("class").split(" "),"hide")||$("#search_loader").addClass("hide"),$(".add-many").click(function(e){return e.preventDefault(),e.stopPropagation(),!1})}}))}})}else $(".main").removeClass("blurT"),$("#controls").removeClass("blurT"),$(".main").removeClass("clickthrough")},backgroundSearch:function(e,t,o,n,a){var i=encodeURIComponent(e+" "+t),s="https://www.googleapis.com/youtube/v3/search?key="+V+"&videoEmbeddable=true&part=id,snippet&fields=items(id,snippet)&type=video&order=relevance&safeSearch=none&maxResults=5";s+="&q="+i;var l="https://www.googleapis.com/youtube/v3/videos?part=contentDetails,snippet,id&key="+V+"&id=";t=t.split(" ");var r=e.split("-");r=r.join(" ").split(" "),$.ajax({type:"GET",url:s,dataType:"jsonp",success:function(i){i.items.length>0&&($.each(i.items,function(o,n){var a=!0;return n.snippet.title.toLowerCase().indexOf(t[0].toLowerCase())==-1&&n.snippet.channelTitle.toLowerCase().indexOf(t[0].toLowerCase())==-1&&n.snippet.channelTitle.toLowerCase().indexOf("vevo")==-1?(a=!1,!1):void(n.snippet.title.toLowerCase().indexOf("cover")==-1&&a&&e.toLowerCase().indexOf("cover")==-1&&(l+=n.id.videoId+","))}),$.ajax({type:"GET",url:l,dataType:"jsonp",success:function(i){if(i.items.length>0){var s=!1;if($.each(i.items,function(e,t){var o=De.durationToSeconds(t.contentDetails.duration),i=!1;if($.each(r,function(e,o){return t.snippet.title.toLowerCase().indexOf(o.toLowerCase())==-1&&(i=!0),!1}),!i)return s=!0,De.submit(t.id,t.snippet.title,o,!0,a,n),!1}),!s){"true"===localStorage.debug&&(console.log("------------------------------"),console.log("NO MATCH FOR:"),console.log("Spotify title: "+e+" "+t.join(" ")),console.log("Spotify length: "+o),console.log("------------------------------"));var l=$("
"+ce+"
");l.find(".extra-add-text").text(e+" - "+t.join(" ")),l.find(".extra-add-text").attr("title",e+" - "+t.join(" ")),l.find(".extra-button-search").attr("data-text",e+" - "+t.join(" ")),$(".not-imported-container").append(l.html()),$(".not-imported").removeClass("hide")}}}}))}}),a==n-1&&(document.getElementById("import_spotify").disabled=!1,$("#import_spotify").removeClass("hide"),$("#playlist_loader_spotify").addClass("hide"))},submitAndClose:function(e,t,o){De.submit(e,t,o,!1,0,1),$("#results").html(""),De.showSearch(),document.getElementById("search").value="",$("#results").html="",$(".main").removeClass("blurT"),$("#controls").removeClass("blurT"),$(".main").removeClass("clickthrough")},importPlaylist:function(e,t){token="",void 0!==t&&(token="&pageToken="+t),playlist_url="https://www.googleapis.com/youtube/v3/playlistItems?part=contentDetails&maxResults=49&key="+V+"&playlistId="+e+token,
+$.ajax({type:"GET",url:playlist_url,dataType:"jsonp",success:function(t){var o="";$.each(t.items,function(e,t){o+=t.contentDetails.videoId+","}),De.addVideos(o,!0),t.nextPageToken&&De.importPlaylist(e,t.nextPageToken),document.getElementById("import").value=""}})},importSpotifyPlaylist:function(e){$.ajax({url:e,headers:{Authorization:"Bearer "+le.access_token},success:function(e){console.log(e),$.each(e.items,function(t,o){De.backgroundSearch(o.track.name,o.track.artists.map(function(e){return e.name}).join(" "),Math.floor(o.track.duration_ms/1e3),e.total,t+e.offset)}),e.next&&De.importSpotifyPlaylist(e.next)}})},addVideos:function(e,t){var o="https://www.googleapis.com/youtube/v3/videos?part=contentDetails,snippet,id&key=***REMOVED***&id=";o+=e,$.ajax({type:"POST",url:o,dataType:"jsonp",success:function(e){var o=0,n=[];$.each(e.items,function(e,a){var i=De.durationToSeconds(a.contentDetails.duration);(!longsongs||i<720)&&(enc_title=a.snippet.title,o+=1,n.push({id:a.id,enc_title:enc_title,duration:i,playlist:t}))}),$.each(n,function(e,t){De.submit(t.id,t.enc_title,t.duration,t.playlist,e,o)})}})},submit:function(e,t,o,n,a,i){Ie.emit("add",{id:e,title:decodeURIComponent(t),adminpass:H,list:L.toLowerCase(),duration:o,playlist:n,num:a,total:i})},durationToSeconds:function(e){var t=e.match(O);return hours=parseInt(t[12])||0,minutes=parseInt(t[14])||0,seconds=parseInt(t[16])||0,60*hours*60+60*minutes+seconds}},Ve={catchUserSuggests:function(e,t){if(t)Ve.createSuggested(e);else for(var o in e)Ve.createSuggested(e[o]);Ve.checkUserEmpty()},createSuggested:function(e){var t=e.duration,o=e.id,n=e.title,a=Math.floor(t/60),i=t-60*a;duration=a+"m "+i+"s";var s=B.generateSong({id:o,title:n,length:t,duration:duration},!1,!1,!1,!0);$("#user-suggest-html").append(s)},fetchYoutubeSuggests:function(e){var t="https://www.googleapis.com/youtube/v3/search?part=snippet&relatedToVideoId="+e+"&type=video&key="+V,o="https://www.googleapis.com/youtube/v3/videos?part=contentDetails,snippet,id&key="+V+"&id=";$.ajax({type:"GET",url:t,dataType:"jsonp",success:function(e){$.each(e.items.slice(0,5),function(e,t){o+=t.id.videoId+","}),$.ajax({type:"GET",url:o,dataType:"jsonp",success:function(e){$("#suggest-song-html").empty(),$.each(e.items,function(e,t){var o=t.contentDetails.duration,n=De.durationToSeconds(o),a=t.id,i=t.snippet.title;o=o.replace("PT","").replace("H","h ").replace("M","m ").replace("S","s"),$("#suggest-song-html").append(B.generateSong({id:a,title:i,length:n,duration:o},!1,!1,!1))})}})}})},checkUserEmpty:function(){var e=$("#user-suggest-html").children().length;0===e?T.contains($("#user_suggests").attr("class").split(" "),"hide")||$("#user_suggests").addClass("hide"):$("#user_suggests").removeClass("hide")}}}();
\ No newline at end of file
diff --git a/static/js/admin.js b/static/js/admin.js
index 6d1d3e9e..a3b7b7ce 100755
--- a/static/js/admin.js
+++ b/static/js/admin.js
@@ -9,7 +9,7 @@ var Admin = {
msg=Helper.rnd(["I added your song", "Your song has been added", "Yay, more songs!", "Thats a cool song!", "I added that song for you", "I see you like adding songs..."]);
break;
case "addedplaylist":
- msg=Helper.rnd(["I added the playlist", "Your playlist has been added", "Yay, many more songes!", "Thats a cool playlist!", "I added all the songs for you", "I see you like adding songs.."]);
+ msg=Helper.rnd(["I added the playlist", "Your playlist has been added", "Yay, many more songs!", "Thats a cool playlist!", "I added all the songs for you", "I see you like adding songs.."]);
document.getElementById("import").disabled = false;
$("#playlist_loader").addClass("hide");
$("#import").removeClass("hide");
diff --git a/static/js/listeners.js b/static/js/listeners.js
index 3df38d99..b853fa07 100755
--- a/static/js/listeners.js
+++ b/static/js/listeners.js
@@ -30,6 +30,7 @@ var chat_unseen = false;
var blinking = false;
var access_token_data = {};
var spotify_authenticated = false;
+var not_import_html = "";
if(localStorage.debug === undefined){
var debug = false;
@@ -132,8 +133,9 @@ function init(){
result_html = $("#temp-results-container");
empty_results_html = $("#empty-results-container").html();
+ not_import_html = $(".not-imported-container").html();
+ $(".not-imported-container").empty();
- //awdwad
$(".video-container").resizable({
start: function(event, ui) {
$('iframe').css('pointer-events','none');
@@ -331,6 +333,20 @@ $(document).on('click', '#cookieok', function() {
});
});
+$(document).on("click", ".extra-button-search", function(e){
+ e.preventDefault();
+ $("#search").val($(this).attr("data-text"));
+ Search.search($(this).attr("data-text"));
+});
+
+$(document).on("click", ".extra-button-delete", function(e){
+ e.preventDefault();
+ $(this).parent().remove();
+ if($(".not-imported-container").children().length == 0){
+ $(".not-imported").toggleClass("hide");
+ }
+})
+
$(document).on("click", "#closePlayer", function(e){
e.preventDefault();
socket.emit("change_channel");
diff --git a/static/js/search.js b/static/js/search.js
index 3a750106..a7db70d4 100755
--- a/static/js/search.js
+++ b/static/js/search.js
@@ -21,9 +21,9 @@ var Search = {
empty_results_html = $("#empty-results-container").html();
}
$(".search_results").html('');
- if(window.search_input !== ""){
+ if(search_input !== ""){
searching = true;
- var keyword= encodeURIComponent(window.search_input);
+ var keyword= encodeURIComponent(search_input);
//response= x
var yt_url = "https://www.googleapis.com/youtube/v3/search?key="+api_key+"&videoEmbeddable=true&part=id&fields=items(id)&type=video&order=viewCount&safeSearch=none&maxResults=25";
yt_url+="&q="+keyword;
@@ -129,8 +129,8 @@ var Search = {
yt_url+="&q="+keyword;
var vid_url = "https://www.googleapis.com/youtube/v3/videos?part=contentDetails,snippet,id&key="+api_key+"&id=";
artist = artist.split(" ");
- var temptitle = title.toLowerCase().replace(" the ", "").replace(" a ", "").replace("the ", "");
- temptitle = temptitle.split(" ");
+ var temptitle = title.split("-");
+ temptitle = temptitle.join(" ").split(" ");
$.ajax({
type: "GET",
url: yt_url,
@@ -142,13 +142,15 @@ var Search = {
{
var acceptable_track = true;
//console.log(data.snippet.title.toLowerCase().indexOf("cover"));
- $.each(artist, function(i, data_artist){
- if(data.snippet.title.toLowerCase().indexOf(data_artist.toLowerCase()) == -1){
+ //$.each(artist, function(i, data_artist){
+ if(data.snippet.title.toLowerCase().indexOf(artist[0].toLowerCase()) == -1 &&
+ (data.snippet.channelTitle.toLowerCase().indexOf(artist[0].toLowerCase()) == -1 &&
+ data.snippet.channelTitle.toLowerCase().indexOf("vevo") == -1)){
acceptable_track = false;
return false;
}
- });
- if(data.snippet.title.toLowerCase().indexOf("cover") == -1 && acceptable_track) {
+ //});
+ if(data.snippet.title.toLowerCase().indexOf("cover") == -1 && acceptable_track && title.toLowerCase().indexOf("cover") == -1) {
vid_url += data.id.videoId+",";
}
});
@@ -164,21 +166,28 @@ var Search = {
//console.log(data);
//var title = data.snippet.title;
var duration = Search.durationToSeconds(data.contentDetails.duration);
- var not_matched = 0;
+ var not_matched = false;
$.each(temptitle, function(i, data_title){
if(data.snippet.title.toLowerCase().indexOf(data_title.toLowerCase()) == -1)
- not_matched += 1;
- });
- if(((data.snippet.title.toLowerCase() == artist.join(" ").toLowerCase() + " - " + title.toLowerCase()) ||
- (data.snippet.title.toLowerCase() == artist.join(" ").toLowerCase() + "-" + title.toLowerCase()) ||
- (data.snippet.title.toLowerCase() == title.toLowerCase() + " - " + artist.join(" ").toLowerCase()) ||
- (data.snippet.title.toLowerCase() == title.toLowerCase() + "-" + artist.join(" ").toLowerCase())) ||
- (duration == length) ||
- ((data.snippet.title.toLowerCase().indexOf("lyric") > -1) ||
- (data.snippet.title.toLowerCase().indexOf("music video") > -1) ||
- (data.snippet.title.toLowerCase().indexOf("official video"))) && not_matched != temptitle.length - 1) {
- matched = true;
+ not_matched = true;
+ return false;
+ });
+
+ if(
+ (!not_matched //&&
+ //(duration + 1 > length && duration - 1 < length)
+ )
+ ){
+ matched = true;
+ /*console.log("------------------------------");
+ console.log("MATCH FOR:");
+ console.log("YouTube title: " + data.snippet.title);
+ console.log("YouTube Channel: " + data.snippet.channelTitle);
+ console.log("YouTube duration: " + duration);
+ console.log("Spotify title: " + title + " " + artist.join(" "));
+ console.log("Spotify length: " + length);
+ console.log("------------------------------");*/
Search.submit(data.id,data.snippet.title, duration, true, current, totalNumber);
return false;
}
@@ -191,6 +200,12 @@ var Search = {
console.log("Spotify length: " + length);
console.log("------------------------------");
}
+ var not_added_song = $("
" + not_import_html + "
");
+ not_added_song.find(".extra-add-text").text(title + " - " + artist.join(" "));
+ not_added_song.find(".extra-add-text").attr("title", title + " - " + artist.join(" "));
+ not_added_song.find(".extra-button-search").attr("data-text", title + " - " + artist.join(" "));
+ $(".not-imported-container").append(not_added_song.html());
+ $(".not-imported").removeClass("hide");
}
}
}