KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added functionality for setting start and end on a song

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-11-08 15:33:50 +01:00
parent 605468e891
commit 47a1668cd5
9 changed files with 227 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/public/assets/js/list.js
View File

@@ -220,9 +220,10 @@ var List = {
Helper.log("---------FULL PLAYLIST-----");
Helper.log(full_playlist);
Helper.log("---------------------------");
if(full_playlist.length > 1){
$.each(full_playlist, function(j, _current_song){
if(!_current_song.hasOwnProperty("start")) full_playlist[j].start = 0;
if(!_current_song.hasOwnProperty("end")) full_playlist[j].end = full_playlist[j].duration;
if(!_current_song.now_playing){ //check that the song isnt playing
var generated = List.generateSong(_current_song, false, lazy_load, true, false, "", true)
$("#wrapper").append(generated);
@@ -478,7 +479,6 @@ var List = {
Player.sendNext({title: full_playlist[0].title, videoId: full_playlist[0].id});
}
}
if(full_playlist.length <= 2){
List.empty = true;
$("#wrapper").html("<span id='empty-channel-message'>The playlist is empty.</span>");
@@ -920,7 +920,9 @@ var List = {
var video_thumb = "background-image:url('//img.youtube.com/vi/"+video_id+"/mqdefault.jpg');";
var song = $("<div>"+list_html+"</div>");
var image_attr = "style";
if(_song_info.hasOwnProperty("start") && _song_info.hasOwnProperty("end")) {
_song_info.duration = _song_info.end - _song_info.start;
}
var attr;
var del_attr;
//song.find(".list-song");

49
server/public/assets/js/listeners.js
View File

@@ -1700,11 +1700,27 @@ $(document).on( "click", ".result-object", function(e){
var $html = $(e.target);
var substr = $html.prop('outerHTML').substring(0,4);
if(substr != "<i c" && $html.prop('class').indexOf("waves-effect") == -1){
if(substr != "<i c" && $html.prop('class').indexOf("waves-effect") == -1 && $html.attr("class") != "result-start" && $html.attr("class") != "result-end"){
var id = $(this).attr("data-video-id");
var title = $(this).attr("data-video-title");
var length = $(this).attr("data-video-length");
Search.submitAndClose(id, title, length);
var original_length = $(this).attr("data-video-length");
var start = parseInt($(this).find(".result-start").val());
var end = parseInt($(this).find(".result-end").val());
if(end > original_length) {
end = original_length;
}
if(start > end) {
Materialize.toast("Start can't be before the end..", 3000, "red lighten");
} else if(start < 0) {
Materialize.toast("Start can't be less than 0..", 3000, "red lighten");
} else {
try {
var length = parseInt(end) - parseInt(start);
Search.submitAndClose(id, title, length, start, end);
} catch(e) {
Materialize.toast("Only numbers are accepted as song start and end parameters..", 3000, "red lighten");
}
}
}
});
@@ -1725,9 +1741,28 @@ $(document).on('submit', '#contact-form', function(e){
$(document).on( "click", "#add-many", function(e){
var id = $(this).attr("data-video-id");
var title = $(this).attr("data-video-title");
var length = $(this).attr("data-video-length");
$(this).parent().parent().remove();
Search.submit(id, title, length);
var original_length = $(this).attr("data-video-length");
var parent = $(this).parent().parent();
var start = parseInt($(parent).find(".result-start").val());
var end = parseInt($(parent).find(".result-end").val());
if(end > original_length) {
end = original_length;
}
if(start > end) {
Materialize.toast("Start can't be before the end..", 3000, "red lighten");
} else if(start < 0) {
Materialize.toast("Start can't be less than 0..", 3000, "red lighten");
} else {
try {
var length = parseInt(end) - parseInt(start);
$(this).parent().parent().remove();
Search.submit(id, title, length, false, 0, 1, start, end);
} catch(e) {
Materialize.toast("Only numbers are accepted as song start and end parameters..", 3000, "red lighten");
}
}
});
$(document).on( "click", ".vote-container", function(e){
@@ -1747,7 +1782,7 @@ $(document).on( "click", ".add-suggested", function(e){
var title = $(this).attr("data-video-title");
var length = $(this).attr("data-video-length");
var added_by = $(this).attr("data-added-by");
Search.submit(id, title, length);
Search.submit(id, title, length, false, 0, 1, 0, length);
if(added_by == "user") {
number_suggested = number_suggested - 1;
if(number_suggested < 0) number_suggested = 0;

59
server/public/assets/js/player.js
View File

@@ -6,6 +6,7 @@ var Player = {
player: "",
stopInterval: false,
fireplace: "",
np: {},
youtube_listener: function(obj) {
var state;
@@ -68,9 +69,15 @@ var Player = {
Player.stopVideo();
}
video_id = obj.np[0].id;
Player.np = {
id: video_id,
start: obj.np[0].start,
end: obj.np[0].end,
duration: obj.np[0].duration,
};
conf = obj.conf[0];
time = obj.time;
seekTo = time - conf.startTime;
seekTo = (time - conf.startTime) + Player.np.start;
song_title = obj.np[0].title;
duration = obj.np[0].duration;
Player.setBGimage(video_id);
@@ -83,14 +90,20 @@ var Player = {
}
video_id = obj.np[0].id;
Player.np = {
id: video_id,
start: obj.np[0].start,
end: obj.np[0].end,
duration: obj.np[0].duration,
};
conf = obj.conf[0];
time = obj.time;
seekTo = time - conf.startTime;
seekTo = (time - conf.startTime) + Player.np.start;
song_title = obj.np[0].title;
duration = obj.np[0].duration;
if(mobile_beginning && Helper.mobilecheck() && seekTo === 0 && !chromecastAvailable) {
seekTo = 1;
seekTo = 1 + Player.np.start;
}
try{
@@ -273,17 +286,23 @@ var Player = {
} else if(!offline){
Player.player.seekTo(_seekTo);
} else {
Player.player.seekTo(0);
Player.player.seekTo(0 + Player.np.start);
}
},
loadVideoById: function(id, this_duration){
loadVideoById: function(id, this_duration, start, end){
if(chromecastAvailable){
castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", videoId: id, channel: chan.toLowerCase()});
chrome.cast.media.GenericMediaMetadata({metadataType: "GENERIC", title:song_title, image: 'https://img.youtube.com/vi/'+id+'/mqdefault.jpg'});
chrome.cast.Image('https://img.youtube.com/vi/'+id+'/mqdefault.jpg');
} else {
Player.player.loadVideoById({'videoId': id, 'startSeconds': 0, 'endSeconds': this_duration});
var s;
var e;
if(start) s = start;
else s = Player.np.start;
if(end) e = end;
else e = Player.np.end;
Player.player.loadVideoById({'videoId': id, 'startSeconds': s, 'endSeconds': e});
}
},
@@ -311,14 +330,20 @@ var Player = {
time = (new Date()).getTime();
song_title = next_song.title;
duration = next_song.duration;
var start;
var end;
if(next_song.hasOwnProperty("start")) start = next_song.start;
else start = 0;
if(next_song.hasOwnProperty("end")) end = next_song.end;
else end = duration;
Player.getTitle(song_title, viewers);
Player.setBGimage(video_id);
if(chromecastAvailable){
castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", videoId: video_id, channel: chan.toLowerCase()});
castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", videoId: video_id, channel: chan.toLowerCase(), start: start, end:end});
chrome.cast.media.GenericMediaMetadata({metadataType: "GENERIC", title:song_title, image: 'https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg'});
chrome.cast.Image('https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg');
} else {
Player.loadVideoById(video_id, duration);
Player.loadVideoById(video_id, duration, start, end);
}
List.channel_function({type:"song_change", time: time});
},
@@ -333,15 +358,21 @@ var Player = {
time = (new Date()).getTime();
song_title = next_song.title;
duration = next_song.duration;
var start;
var end;
if(next_song.hasOwnProperty("start")) start = next_song.start;
else start = 0;
if(next_song.hasOwnProperty("end")) end = next_song.end;
else end = duration;
Player.getTitle(song_title, viewers);
Player.setBGimage(video_id);
if(chromecastAvailable){
castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", videoId: video_id, channel: chan.toLowerCase()});
castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", videoId: video_id, channel: chan.toLowerCase(), start: start, end: end});
chrome.cast.media.GenericMediaMetadata({metadataType: "GENERIC", title:song_title, image: 'https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg'});
chrome.cast.Image('https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg');
} else {
Player.loadVideoById(video_id, duration);
Player.loadVideoById(video_id, duration, start, end);
}
List.channel_function({type:"song_change_prev", time: time});
@@ -543,9 +574,11 @@ var Player = {
dMinutes = Math.floor(duration / 60);
dSeconds = duration - dMinutes * 60;
currDurr = Player.player.getCurrentTime() !== undefined ? Math.floor(Player.player.getCurrentTime()) : seekTo;
if(currDurr > duration) {
currDurr = duration;
if(currDurr - Player.np.start > duration) {
currDurr = duration - Player.np.start;
}
currDurr = currDurr - Player.np.start;
//currDurr = currDurr - Player.np.start;
minutes = Math.floor(currDurr / 60);
seconds = currDurr - (minutes * 60);
document.getElementById("duration").innerHTML = Helper.pad(minutes)+":"+Helper.pad(seconds)+" <span id='dash'>/</span> "+Helper.pad(dMinutes)+":"+Helper.pad(dSeconds);
@@ -558,7 +591,7 @@ var Player = {
if(embed) {
if(window.parentWindow && window.parentOrigin) {
window.parentWindow.postMessage({type: "duration", duration: Player.player.getCurrentTime(), full_duration: Player.player.getDuration(), percent: per}, window.parentOrigin);
window.parentWindow.postMessage({type: "duration", duration: Player.player.getCurrentTime() - Player.np.start, full_duration: Player.player.getDuration() - Player.np.end, percent: per}, window.parentOrigin);
}
}

19
server/public/assets/js/search.js
View File

@@ -87,6 +87,7 @@ var Search = {
{
var duration=song.contentDetails.duration;
secs=Search.durationToSeconds(duration);
var _temp_duration = Helper.secondsToOther(secs);
if(!longsongs || secs<720){
title=song.snippet.title;
enc_title=title;//encodeURIComponent(title).replace(/'/g, "\\\'");
@@ -96,9 +97,8 @@ var Search = {
//$("#results").append(result_html);
var songs = pre_result;
songs.find(".search-title").text(title);
songs.find(".result_info").text(duration);
songs.find(".result_info").text(Helper.pad(_temp_duration[0]) + ":" + Helper.pad(_temp_duration[1]));
songs.find(".thumb").attr("src", thumb);
//songs.find(".add-many").attr("onclick", "submit('"+id+"','"+enc_title+"',"+secs+");");
songs.find("#add-many").attr("data-video-id", id);
@@ -109,6 +109,7 @@ var Search = {
songs.find("#temp-results").attr("data-video-title", enc_title);
songs.find("#temp-results").attr("data-video-length", secs);
songs.find(".open-externally").attr("href", "https://www.youtube.com/watch?v=" + id);
$(songs.find(".result-end")).attr("value", secs);
//$($(songs).find("div")[0]).attr("id", id)
//output += undefined;
if(songs.html() != undefined) {
@@ -276,7 +277,7 @@ var Search = {
}
if((Search.submitArray.length - 1) == Search.submitArrayExpected) {
$.each(Search.submitArray, function(i, data){
Search.submit(data.id, data.title, data.duration, true, i, Search.submitArray.length - 1);
Search.submit(data.id, data.title, data.duration, true, i, Search.submitArray.length - 1, 0, data.duration);
});
document.getElementById("import_spotify").disabled = false;
$("#import_spotify").removeClass("hide");
@@ -286,8 +287,8 @@ var Search = {
}
},
submitAndClose: function(id,title,duration){
Search.submit(id,title, duration, false, 0, 1);
submitAndClose: function(id,title,duration, start, end){
Search.submit(id,title, duration, false, 0, 1, start, end);
$("#results").html('');
Search.showSearch();
document.getElementById("search").value = "";
@@ -418,14 +419,14 @@ var Search = {
}
});
$.each(to_add, function(i, item){
Search.submit(item.id, item.enc_title, item.duration, item.playlist, i, x);
Search.submit(item.id, item.enc_title, item.duration, item.playlist, i, x, 0, item.duration);
});
}
});
},
submit: function(id,title,duration, playlist, num, full_num){
submit: function(id,title,duration, playlist, num, full_num, start, end){
if(offline && document.getElementsByName("addsongs")[0].checked && document.getElementsByName("addsongs")[0].disabled){
var found_array = [];
found_array = $.map(full_playlist, function(obj, index) {
@@ -434,12 +435,12 @@ var Search = {
}
});
if(found_array.length == 0){
List.channel_function({type: "added", value: {added: (new Date).getTime()/1000, guids: [1], id: id, title: title, duration: duration, playlist: false, now_playing: false, votes: 1}});
List.channel_function({type: "added", start: start, end: end, value: {added: (new Date).getTime()/1000, guids: [1], id: id, title: title, duration: duration, playlist: false, now_playing: false, votes: 1}});
} else {
List.vote(id, "pos");
}
} else {
socket.emit("add", {id: id, title: title, adminpass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), list: chan.toLowerCase(), duration: duration, playlist: playlist, num: num, total: full_num, pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
socket.emit("add", {id: id, start: start, end: end, title: title, adminpass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), list: chan.toLowerCase(), duration: duration, playlist: playlist, num: num, total: full_num, pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
}//[id, decodeURIComponent(title), adminpass, duration, playlist]);
},