diff --git a/src/main/java/net/Broken/RestApi/MusicWebController.java b/src/main/java/net/Broken/RestApi/MusicWebController.java index 65a97cb..91ce83e 100644 --- a/src/main/java/net/Broken/RestApi/MusicWebController.java +++ b/src/main/java/net/Broken/RestApi/MusicWebController.java @@ -106,6 +106,15 @@ public class MusicWebController { case "ADD": return new WebLoadUtils(musicCommande ,data).getResponse(); + case "FLUSH": + try { + musicCommande.getAudioManager().getMusicManager().scheduler.flush(); + return new ResponseEntity<>(new CommandResponseData(data.command, "Accepted"), HttpStatus.OK); + } catch (NullMusicManager | NotConectedException nullMusicManager) { + return new ResponseEntity<>(new CommandResponseData(data.command, "Not connected to vocal!"), HttpStatus.NOT_ACCEPTABLE); + } + + } } else diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 943dfee..22bb966 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -2,15 +2,14 @@ - + - [%d{yyy-MM-dd ~ HH:mm:ss.SSS}][%-5level]%-30.30c{1.}: %msg%n + [%d{HH:mm:ss.SSS}]%highlight{[%-5level]}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}[%-30.30c{1.}]: %highlight{%msg%n}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan} - diff --git a/src/main/resources/static/js/init.js b/src/main/resources/static/js/init.js index 5423536..9ccaa96 100644 --- a/src/main/resources/static/js/init.js +++ b/src/main/resources/static/js/init.js @@ -65,6 +65,13 @@ $(document).ready(function() { } }); + $('#flush_btn').click(function () { + var command = { + command: "FLUSH" + }; + sendCommand(JSON.stringify(command)); + }); + $('#btn_add_top').click(function () { var command = { command: "ADD", @@ -74,7 +81,7 @@ $(document).ready(function() { }; $('#input_link').val(''); sendCommand(JSON.stringify(command)); - }) + }); $('#btn_add_bottom').click(function () { var command = { @@ -85,7 +92,7 @@ $(document).ready(function() { }; $('#input_link').val(''); sendCommand(JSON.stringify(command)); - }) + }); }) @@ -120,8 +127,13 @@ function getCurentMusic() { if ($('#add_btn').hasClass("disabled")) { $('#add_btn').removeClass("disabled"); } + if ($('#flush_btn').hasClass("disabled")) { + $('#flush_btn').removeClass("disabled"); + } $('#music_img').attr("src","/img/no_music.jpg"); + $('#total_time').text("00:00"); + $('#current_time').text("00:00"); break; @@ -168,6 +180,9 @@ function getCurentMusic() { if (!$('#add_btn').hasClass("disabled")) { $('#add_btn').addClass("disabled"); } + if (!$('#flush_btn').hasClass("disabled")) { + $('#flush_btn').addClass("disabled"); + } $('#music_img').attr("src","/img/disconnected.png"); @@ -252,12 +267,18 @@ function updateControl(data){ 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"); } $('#music_img').attr("src","https://img.youtube.com/vi/"+data.info.identifier+"/hqdefault.jpg"); + console.log(data); + $('#total_time').text(msToTime(data.info.length)); + $('#current_time').text(msToTime(data.currentPos)); updateModal(data); } diff --git a/src/main/resources/templates/music.html b/src/main/resources/templates/music.html index ca44919..37d9021 100644 --- a/src/main/resources/templates/music.html +++ b/src/main/resources/templates/music.html @@ -45,11 +45,15 @@

-