Adding autoflow button

src/main/java/net/Broken/RestApi/Commands/AutoFlowOff.java

@@ -20,7 +20,7 @@ public class AutoFlowOff implements CommandInterface{
         AudioM audioM = AudioM.getInstance(null);
         try {
             TrackScheduler scheduler = audioM.getGuildMusicManager().scheduler;
-            scheduler.setAutoPlay(false);
+            scheduler.setAutoFlow(false);
             return new ResponseEntity<>(new CommandResponseData(data.command,"ok"), HttpStatus.OK);
         } catch (NullMusicManager | NotConnectedException nullMusicManager) {
             LogManager.getLogger().catching(nullMusicManager);

src/main/java/net/Broken/RestApi/Commands/AutoFlowOn.java

@@ -20,7 +20,7 @@ public class AutoFlowOn implements CommandInterface{
         AudioM audioM = AudioM.getInstance(null);
         try {
             TrackScheduler scheduler = audioM.getGuildMusicManager().scheduler;
-            scheduler.setAutoPlay(true);
+            scheduler.setAutoFlow(true);
             return new ResponseEntity<>(new CommandResponseData(data.command,"ok"), HttpStatus.OK);
         } catch (NullMusicManager | NotConnectedException nullMusicManager) {
             LogManager.getLogger().catching(nullMusicManager);

src/main/java/net/Broken/RestApi/Data/CurrentMusicData.java

@@ -14,13 +14,15 @@ public class CurrentMusicData {
     private final long currentPos;
     private final String state;
     private final boolean pause;
+    private final boolean autoflow;
 
 
-    public CurrentMusicData(UserAudioTrackData info, long currentPos, String state, boolean pause) {
+    public CurrentMusicData(UserAudioTrackData info, long currentPos, String state, boolean pause, boolean autoflow) {
         this.info = info;
         this.currentPos = currentPos;
         this.state = state;
         this.pause = pause;
+        this.autoflow = autoflow;
     }
 
     public UserAudioTrackData getInfo() {
@@ -37,4 +39,8 @@ public class CurrentMusicData {
         else
             return state;
     }
+
+    public boolean isAutoflow() {
+        return autoflow;
+    }
 }

src/main/java/net/Broken/RestApi/MusicWebAPIController.java

@@ -51,16 +51,16 @@ public class MusicWebAPIController {
                 AudioTrack currentTrack = player.getPlayingTrack();
                 if(currentTrack == null)
                 {
-                    return new CurrentMusicData(null,0, "STOP",false);
+                    return new CurrentMusicData(null,0, "STOP",false, musicCommande.audio.getGuildMusicManager().scheduler.isAutoFlow());
                 }
                 UserAudioTrackData uat = new UserAudioTrackData(musicCommande.audio.getGuildMusicManager().scheduler.getCurrentPlayingTrack());
-                return new CurrentMusicData(uat, currentTrack.getPosition(), currentTrack.getState().toString(), player.isPaused());
+                return new CurrentMusicData(uat, currentTrack.getPosition(), currentTrack.getState().toString(), player.isPaused(), musicCommande.audio.getGuildMusicManager().scheduler.isAutoFlow());
             } catch (NullMusicManager | NotConnectedException nullMusicManager) {
-                return new CurrentMusicData(null,0, "STOP",false);
+                return new CurrentMusicData(null,0, "STOP",false, false);
             }
         }else
         {
-            return new CurrentMusicData(null,0, "DISCONNECTED",false);
+            return new CurrentMusicData(null,0, "DISCONNECTED",false, false);
         }
     }
 

src/main/java/net/Broken/audio/TrackScheduler.java

@@ -2,19 +2,16 @@ package net.Broken.audio;
 
 import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import net.Broken.Commands.Music;
 import net.Broken.MainBot;
 import net.Broken.RestApi.Data.UserAudioTrackData;
 import net.Broken.audio.Youtube.YoutubeTools;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.BlockingDeque;
@@ -27,7 +24,7 @@ public class TrackScheduler extends AudioEventAdapter {
     private final AudioPlayer player;
     private final BlockingDeque<UserAudioTrack> queue;
     private UserAudioTrack currentPlayingTrack;
-    private boolean autoPlay = true;
+    private boolean autoFlow = true;
     private ArrayList<String> history = new ArrayList<>();
     Logger logger = LogManager.getLogger();
 
@@ -175,7 +172,7 @@ public class TrackScheduler extends AudioEventAdapter {
     }
 
     private void needAutoPlay(){
-        if((queue.size() < 1) && autoPlay && currentPlayingTrack != null){
+        if((queue.size() < 1) && autoFlow && currentPlayingTrack != null){
             logger.info("Auto add needed!");
             AudioM audioM = AudioM.getInstance(null);
             YoutubeTools youtubeTools = YoutubeTools.getInstance(null);
@@ -193,8 +190,12 @@ public class TrackScheduler extends AudioEventAdapter {
         }
     }
 
-    public void setAutoPlay(boolean autoPlay) {
+    public void setAutoFlow(boolean autoFlow) {
-        this.autoPlay = autoPlay;
+        this.autoFlow = autoFlow;
         needAutoPlay();
     }
+
+    public boolean isAutoFlow() {
+        return autoFlow;
+    }
 }

src/main/java/net/Broken/audio/Youtube/Authorization.java

@@ -33,7 +33,6 @@ public class Authorization extends AuthorizationCodeInstalledApp {
 
     protected void notify(String url){
         Preconditions.checkNotNull(url);
-        // Ask user to open in their browser using copy-paste
         logger.fatal("Please open this URL: "+url);
         PrivateMessage.send(guild.getOwner().getUser(),"Please open this url to confirm google api account acces : " + url,null);
 

src/main/resources/static/js/music.js

@@ -10,6 +10,7 @@ var btn_info;
 var btn_disconnect;
 var btn_flush;
 var btn_add;
+var switchAutoFlow;
 var loadingFlag = false;
 
 $(document).ready(function() {
@@ -21,7 +22,7 @@ $(document).ready(function() {
     btn_disconnect = $('#btn_disconnect');
     btn_flush = $('#flush_btn');
     btn_add = $('#add_btn');
-
+    switchAutoFlow = $("#autoflow");
 
     setInterval("getCurentMusic()",1000);
     $('#modalAdd').modal();
@@ -160,6 +161,8 @@ function getCurentMusic() {
 
                 break;
         }
+        if(switchAutoFlow.is(':checked') != data.autoflow)
+            switchAutoFlow.prop('checked', data.autoflow);
         getPlayList();
 
     })
@@ -451,6 +454,15 @@ function listeners() {
     $('#btn_disconnect').click(function () {
         sendCommand({command : "DISCONNECT"})
     });
+
+    switchAutoFlow.click(function () {
+        console.log(switchAutoFlow.is(':checked'))
+        if(switchAutoFlow.is(':checked')){
+            sendCommand({command: 'AUTOFLOWON'})
+        }
+        else
+            sendCommand({command: 'AUTOFLOWOFF'})
+    });
 }
 
 function disableBtn(btn) {

src/main/resources/templates/music.html

@@ -174,11 +174,11 @@
                 <tr>
                     <th style="padding: 0px;">
                         <div class="row center valign-wrapper" style="margin: 0px">
-                            <div class="col s4 center"><h5>Playlist</h5></div>
+                            <div class="col s3 center blue-grey-text text-darken-3"><h5><b>Playlist</b></h5></div>
-                            <div class="col s4 center">
+                            <div class="col s3 center">
                                 <a class="waves-effect waves-light btn modal-trigger red darken-4" id="flush_btn"><i class="material-icons">delete_sweep</i></a>
                             </div>
-                            <div class="col s4 center">
+                            <div class="col s3 center" style="padding-right: 0px">
                                 <!-- Modal Trigger -->
                                 <a class="waves-effect waves-light btn modal-trigger green darken-4" id="add_btn" href="#modalAdd"><i class="material-icons">add_circle_outline</i></a>
 
@@ -215,6 +215,17 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="col s3 center " style="padding-left: 0px">
+                                <div class="row switch  blue-grey-text text-darken-3" style="margin-bottom: 0px">
+                                    AutoFlow
+                                </div>
+                                <div class="row switch ">
+                                    <label>
+                                        <input type="checkbox" id="autoflow"/>
+                                        <span class="lever"></span>
+                                    </label>
+                                </div>
+                            </div>
 
                         </div>
                     </th>