sebclem/ClaptrapBot
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'devel'

Browse Source
This commit is contained in:
BrokenFire 2018-02-26 16:44:56 +01:00
commit f89e5d73b9
4 changed files with 255 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/Broken/audio/TrackScheduler.java
View File

@ -126,7 +126,8 @@ public class TrackScheduler extends AudioEventAdapter {
// giving null to startTrack, which is a valid argument and will simply stop the player. // giving null to startTrack, which is a valid argument and will simply stop the player.
UserAudioTrack track = queue.poll(); UserAudioTrack track = queue.poll();
this.currentPlayingTrack = track; this.currentPlayingTrack = track;
player.startTrack(track.getAudioTrack(), false); if(track != null)
player.startTrack(track.getAudioTrack(), false);
} }
@Override @Override

423
src/main/resources/static/js/music.js
View File

@ -2,19 +2,40 @@ var savedPlaylist;
var error = false; var error = false;
var state; var state;
var disconected = false; var disconected = false;
var modal_loading;
var btn_play;
var btn_stop;
var btn_next;
var btn_info;
var btn_disconnect;
var btn_flush;
var btn_add;
$(document).ready(function() { $(document).ready(function() {
btn_play = $('#btn_play');
btn_stop = $('#btn_stop');
btn_next = $('#btn_next');
btn_info = $('#btn_info');
btn_disconnect = $('#btn_disconnect');
btn_flush = $('#flush_btn');
btn_add = $('#add_btn');
setInterval("getCurentMusic()",1000); setInterval("getCurentMusic()",1000);
// the "href" attribute of the modal trigger must specify the modal ID that wants to be triggered
$('#modalAdd').modal(); $('#modalAdd').modal();
$('#modal_current_info').modal(); $('#modal_current_info').modal();
$('#modalChanels').modal({ $('#modalChanels').modal({
dismissible: false // Modal can be dismissed by clicking outside of the modal dismissible: false // Modal can be dismissed by clicking outside of the modal
}); });
modal_loading = $('#modal_loading');
modal_loading.modal({
dismissible: false
});
$('.button-collapse-1').sideNav({ $('.button-collapse-1').sideNav({
menuWidth: 400, // Default is 300 menuWidth: 400, // Default is 300
@ -23,123 +44,25 @@ $(document).ready(function() {
draggable: true // Choose whether you can drag to open on touch screens, draggable: true // Choose whether you can drag to open on touch screens,
}); });
$('#btn_play').click(function () {
switch (state){
case "PLAYING":
sendCommand({ command: "PAUSE"})
break;
case "PAUSE":
sendCommand({ command: "PLAY"})
break;
default:
sendCommand({command: "PLAY"})
}
});
$('#btn_next').click(function () {
sendCommand({ command: "NEXT"});
});
$('#btn_stop').click(function () {
sendCommand({ command: "STOP"});
});
$('.dropdown-button').dropdown({ $('.dropdown-button').dropdown({
inDuration: 300, inDuration: 300,
outDuration: 225, outDuration: 225,
constrainWidth: false, // Does not change width of dropdown to that of the activator constrainWidth: false, // Does not change width of dropdown to that of the activator
hover: false, // Activate on hover hover: false, // Activate on hover
gutter: 0, // Spacing from edge gutter: 0, // Spacing from edge
belowOrigin: false, // Displays dropdown below the button belowOrigin: false, // Displays dropdown below the button
alignment: 'left', // Displays dropdown with edge aligned to the left of button alignment: 'left', // Displays dropdown with edge aligned to the left of button
stopPropagation: false // Stops event propagation stopPropagation: false // Stops event propagation
}
);
$('#input_link').on("input", function () {
if($('#input_link').val() == ""){
if (!$('#btn_add_bottom').hasClass("disabled")) {
$('#btn_add_bottom').addClass("disabled");
}
if (!$('#btn_add_top').hasClass("disabled")) {
$('#btn_add_top').addClass("disabled");
}
}
else{
if ($('#btn_add_bottom').hasClass("disabled")) {
$('#btn_add_bottom').removeClass("disabled");
}
if ($('#btn_add_top').hasClass("disabled")) {
$('#btn_add_top').removeClass("disabled");
}
}
}); });
$('#modalChanels').change(function () { listeners();
if ($('#btn_ok_channel').hasClass("disabled")) {
$('#btn_ok_channel').removeClass("disabled");
}
});
$('#flush_btn').click(function () {
var command = {
command: "FLUSH"
};
sendCommand(command);
});
$('#btn_add_top').click(function () {
var command = {
command: "ADD",
url: $('#input_link').val(),
playlistLimit: $('#limit_range').val(),
onHead: true
};
$('#input_link').val('');
sendCommand(command);
});
$('#btn_add_bottom').click(function () {
var command = {
command: "ADD",
url: $('#input_link').val(),
playlistLimit: $('#limit_range').val(),
onHead: false
};
$('#input_link').val('');
sendCommand(command);
});
$('#btn_ok_channel').click(function () {
var command = {
command: "CONNECT",
chanelId: $('input[name=vocalRadio]:checked').val()
};
sendCommand(command);
});
$('#btn_disconnect').click(function () {
sendCommand({command : "DISCONNECT"})
})
}); });
function getCurentMusic() { function getCurentMusic() {
$.get("api/music/currentMusicInfo", function (data) { $.get("api/music/currentMusicInfo", function (data) {
}).done(function (data) { }).done(function (data) {
// alert( "second success" );
// console.log(data);
state = data.state; state = data.state;
switch (data.state) { switch (data.state) {
case "STOP": case "STOP":
@ -152,69 +75,38 @@ function getCurentMusic() {
} }
$('#music_progress').width("0%"); $('#music_progress').width("0%");
if(Cookies.get('token') != undefined){ if(Cookies.get('token') != undefined){
if (!$('#btn_stop').hasClass("disabled")) { disableBtn(btn_stop);
$('#btn_stop').addClass("disabled"); disableBtn(btn_info);
} enableBtn(btn_add);
if (!$('#btn_info').hasClass("disabled")) { enableBtn(btn_flush);
$('#btn_info').addClass("disabled"); enableBtn(btn_play);
} enableBtn(btn_next);
if ($('#add_btn').hasClass("disabled")) { enableBtn(btn_disconnect);
$('#add_btn').removeClass("disabled");
}
if ($('#flush_btn').hasClass("disabled")) {
$('#flush_btn').removeClass("disabled");
}
if ($('#btn_play').hasClass("disabled")) {
$('#btn_play').removeClass("disabled");
}
if ($('#btn_next').hasClass("disabled")) {
$('#btn_next').removeClass("disabled");
}
if ($('#btn_disconnect').hasClass("disabled")) {
$('#btn_disconnect').removeClass("disabled");
}
} }
else{ else{
if (!$('#btn_stop').hasClass("disabled")) { disableBtn(btn_play);
$('#btn_stop').addClass("disabled"); disableBtn(btn_stop);
} disableBtn(btn_info);
if (!$('#btn_info').hasClass("disabled")) { disableBtn(btn_add);
$('#btn_info').addClass("disabled"); disableBtn(btn_flush);
} disableBtn(btn_next);
if (!$('#add_btn').hasClass("disabled")) { disableBtn(btn_disconnect);
$('#add_btn').addClass("disabled");
}
if (!$('#flush_btn').hasClass("disabled")) {
$('#flush_btn').addClass("disabled");
}
if (!$('#btn_play').hasClass("disabled")) {
$('#btn_play').addClass("disabled");
}
if (!$('#btn_next').hasClass("disabled")) {
$('#btn_next').addClass("disabled");
}
if (!$('#btn_disconnect').hasClass("disabled")) {
$('#btn_disconnect').addClass("disabled");
}
} }
$('#btn_play').children().text("play_arrow"); btn_play.children().text("play_arrow");
$('#music_img').attr("src","/img/no_music.jpg"); $('#music_img').attr("src","/img/no_music.jpg");
$('#total_time').text("00:00"); $('#total_time').text("00:00");
$('#current_time').text("00:00"); $('#current_time').text("00:00");
btn_play.removeClass("amber");
btn_play.addClass("green");
break; break;
case "PLAYING": case "PLAYING":
disconected = false; disconected = false;
$('#modalChanels').modal('close'); $('#modalChanels').modal('close');
$('#btn_play').children().text("pause"); btn_play.children().text("pause");
$('#btn_play').removeClass("green"); btn_play.removeClass("green");
$('#btn_play').addClass("amber"); btn_play.addClass("amber");
updateControl(data); updateControl(data);
break; break;
@ -222,9 +114,10 @@ function getCurentMusic() {
case "PAUSE": case "PAUSE":
disconected = false; disconected = false;
$('#modalChanels').modal('close'); $('#modalChanels').modal('close');
$('#btn_play').children().text("play_arrow"); btn_play.children().text("play_arrow");
$('#btn_play').removeClass("amber"); btn_play.removeClass("amber");
$('#btn_play').addClass("green"); btn_play.addClass("green");
btn_play.addClass("green");
updateControl(data); updateControl(data);
break; break;
@ -246,28 +139,13 @@ function getCurentMusic() {
$('#btn_play').children().text("play_arrow"); $('#btn_play').children().text("play_arrow");
if (!$('#btn_play').hasClass("disabled")) { disableBtn(btn_play);
$('#btn_play').addClass("disabled"); disableBtn(btn_stop);
} disableBtn(btn_info);
if (!$('#btn_stop').hasClass("disabled")) { disableBtn(btn_add);
$('#btn_stop').addClass("disabled"); disableBtn(btn_flush);
} disableBtn(btn_next);
if (!$('#btn_next').hasClass("disabled")) { disableBtn(btn_disconnect);
$('#btn_next').addClass("disabled");
}
if (!$('#btn_info').hasClass("disabled")) {
$('#btn_info').addClass("disabled");
}
if (!$('#add_btn').hasClass("disabled")) {
$('#add_btn').addClass("disabled");
}
if (!$('#flush_btn').hasClass("disabled")) {
$('#flush_btn').addClass("disabled");
}
if (!$('#btn_disconnect').hasClass("disabled")) {
$('#btn_disconnect').addClass("disabled");
}
$('#music_img').attr("src","/img/disconnected.png"); $('#music_img').attr("src","/img/disconnected.png");
if(Cookies.get('token') != undefined){ if(Cookies.get('token') != undefined){
@ -332,9 +210,11 @@ function getPlayList() {
} }
else else
$('#playlist_list').empty(); $('#playlist_list').empty();
}).fail(function (data) {
if(!error){
alert("Comunication error, please refresh.");
error = true;
}
}); });
@ -355,13 +235,14 @@ function getChannels(){
template.html(content); template.html(content);
$('#channelForm').append(template); $('#channelForm').append(template);
}); });
$('#modalChanels').modal('open'); $('#modalChanels').modal('open');
}).fail(function (data) {
if(!error){
alert("Com error, please refresh.");
error = true;
}
}); });
} }
@ -387,53 +268,23 @@ function updateControl(data){
$('#music_progress').width(percent + "%"); $('#music_progress').width(percent + "%");
if(Cookies.get('token') != undefined){ if(Cookies.get('token') != undefined){
if ($('#btn_play').hasClass("disabled")) { enableBtn(btn_play);
$('#btn_play').removeClass("disabled"); enableBtn(btn_stop);
} enableBtn(btn_info);
if ($('#btn_stop').hasClass("disabled")) { enableBtn(btn_add);
$('#btn_stop').removeClass("disabled"); enableBtn(btn_flush);
} enableBtn(btn_next);
if ($('#btn_info').hasClass("disabled")) { enableBtn(btn_disconnect);
$('#btn_info').removeClass("disabled");
}
if ($('#add_btn').hasClass("disabled")) {
$('#add_btn').removeClass("disabled");
}
if ($('#flush_btn').hasClass("disabled")) {
$('#flush_btn').removeClass("disabled");
}
if ($('#btn_next').hasClass("disabled")) {
$('#btn_next').removeClass("disabled");
}
if ($('#btn_disconnect').hasClass("disabled")) {
$('#btn_disconnect').removeClass("disabled");
}
} }
else else
{ {
if (!$('#btn_play').hasClass("disabled")) { disableBtn(btn_play);
$('#btn_play').addClass("disabled"); disableBtn(btn_stop);
} disableBtn(btn_info);
if (!$('#btn_stop').hasClass("disabled")) { disableBtn(btn_add);
$('#btn_stop').addClass("disabled"); disableBtn(btn_flush);
} disableBtn(btn_next);
if (!$('#btn_info').hasClass("disabled")) { disableBtn(btn_disconnect);
$('#btn_info').addClass("disabled");
}
if (!$('#add_btn').hasClass("disabled")) {
$('#add_btn').addClass("disabled");
}
if (!$('#flush_btn').hasClass("disabled")) {
$('#flush_btn').addClass("disabled");
}
if (!$('#btn_next').hasClass("disabled")) {
$('#btn_next').addClass("disabled");
}
if (!$('#btn_disconnect').hasClass("disabled")) {
$('#btn_disconnect').addClass("disabled");
}
} }
@ -445,6 +296,7 @@ function updateControl(data){
} }
function sendCommand(command){ function sendCommand(command){
modal_loading.modal('open');
command["token"] = Cookies.get('token'); command["token"] = Cookies.get('token');
console.log(command) console.log(command)
$.ajax({ $.ajax({
@ -455,11 +307,14 @@ function sendCommand(command){
data: JSON.stringify(command), data: JSON.stringify(command),
success: function (data) { success: function (data) {
console.log(data); console.log(data);
getCurentMusic();
modal_loading.modal('close');
} }
}).fail(function (data) { }).fail(function (data) {
console.log(data); console.log(data);
alert(data.responseJSON.Message); alert(data.responseJSON.Message);
modal_loading.modal('close');
if(data.responseJSON.error === "token"){ if(data.responseJSON.error === "token"){
Cookies.remove('token'); Cookies.remove('token');
Cookies.remove('name'); Cookies.remove('name');
@ -500,4 +355,100 @@ function msToTime(duration) {
return minutes + ":" + seconds; return minutes + ":" + seconds;
} }
function listeners() {
$('#btn_play').click(function () {
switch (state){
case "PLAYING":
sendCommand({ command: "PAUSE"})
break;
case "PAUSE":
sendCommand({ command: "PLAY"})
break;
default:
sendCommand({command: "PLAY"})
}
});
$('#btn_next').click(function () {
sendCommand({ command: "NEXT"});
});
$('#btn_stop').click(function () {
sendCommand({ command: "STOP"});
});
$('#input_link').on("input", function () {
if($('#input_link').val() == ""){
disableBtn($('#btn_add_bottom'));
disableBtn($('#btn_add_top'));
}
else{
enableBtn($('#btn_add_bottom'));
enableBtn($('#btn_add_top'));
}
});
$('#modalChanels').change(function () {
if ($('#btn_ok_channel').hasClass("disabled")) {
$('#btn_ok_channel').removeClass("disabled");
}
});
$('#flush_btn').click(function () {
var command = {
command: "FLUSH"
};
sendCommand(command);
});
$('#btn_add_top').click(function () {
var command = {
command: "ADD",
url: $('#input_link').val(),
playlistLimit: $('#limit_range').val(),
onHead: true
};
$('#input_link').val('');
sendCommand(command);
});
$('#btn_add_bottom').click(function () {
var command = {
command: "ADD",
url: $('#input_link').val(),
playlistLimit: $('#limit_range').val(),
onHead: false
};
$('#input_link').val('');
sendCommand(command);
});
$('#btn_ok_channel').click(function () {
var command = {
command: "CONNECT",
chanelId: $('input[name=vocalRadio]:checked').val()
};
sendCommand(command);
});
$('#btn_disconnect').click(function () {
sendCommand({command : "DISCONNECT"})
});
}
function disableBtn(btn) {
if (!btn.hasClass("disabled")) {
btn.addClass("disabled");
}
}
function enableBtn(btn){
if (btn.hasClass("disabled")) {
btn.removeClass("disabled");
}
}

4
src/main/resources/static/js/navabar.js
View File

@ -30,7 +30,7 @@ $(document).ready(function() {
connected(); connected();
} }
listeners(); navListeners();
}); });
@ -110,7 +110,7 @@ function tryConnection() {
} }
function listeners() { function navListeners() {
input_name.on("input", function () { input_name.on("input", function () {
if(input_name.val() !== "" && input_psw.val() !== "") { if(input_name.val() !== "" && input_psw.val() !== "") {
popInSubmit(); popInSubmit();

65
src/main/resources/templates/music.html
View File

@ -285,9 +285,6 @@
<form id="channelForm" action="#" class=""> <form id="channelForm" action="#" class="">
</form> </form>
</div> </div>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
@ -295,6 +292,68 @@
</div> </div>
</div> </div>
<div id="modal_loading" class="modal valign-wrapper">
<div class="modal-content" >
<div class="row center">
<h3 class="col s12 center">Please wait</h3>
</div>
<div class="row center" >
<div class="preloader-wrapper big active">
<div class="spinner-layer spinner-blue">
<div class="circle-clipper left">
<div class="circle"></div>
</div>
<div class="gap-patch">
<div class="circle"></div>
</div>
<div class="circle-clipper right">
<div class="circle"></div>
</div>
</div>
<div class="spinner-layer spinner-red">
<div class="circle-clipper left">
<div class="circle"></div>
</div>
<div class="gap-patch">
<div class="circle"></div>
</div>
<div class="circle-clipper right">
<div class="circle"></div>
</div>
</div>
<div class="spinner-layer spinner-yellow">
<div class="circle-clipper left">
<div class="circle"></div>
</div>
<div class="gap-patch">
<div class="circle"></div>
</div>
<div class="circle-clipper right">
<div class="circle"></div>
</div>
</div>
<div class="spinner-layer spinner-green">
<div class="circle-clipper left">
<div class="circle"></div>
</div>
<div class="gap-patch">
<div class="circle"></div>
</div>
<div class="circle-clipper right">
<div class="circle"></div>
</div>
</div>
</div>
</div>
</div>
</div>
<p id="radioTemplate" class="" style="visibility: hidden"> <p id="radioTemplate" class="" style="visibility: hidden">
<input name="vocalRadio" class="with-gap" type="radio" value="@id" id="@id"/> <input name="vocalRadio" class="with-gap" type="radio" value="@id" id="@id"/>
<label for="@id">@name</label> <label for="@id">@name</label>