Added onStartedLoading and onFinishedLoading listeners

Author: devgianlu

api/src/main/java/xyz/gianlu/librespot/api/handlers/EventsHandler.java

@@ -139,6 +139,14 @@ public void onPanicState(@NotNull Player player) {
         dispatch(obj);
     }
 
+    @Override
+    public void onStartedLoading(@NotNull Player player) {
+    }
+
+    @Override
+    public void onFinishedLoading(@NotNull Player player) {
+    }
+
     @Override
     public void onSessionCleared(@NotNull Session old) {
         old.removeReconnectionListener(this);

player/src/main/java/xyz/gianlu/librespot/player/Player.java

@@ -363,6 +363,8 @@ public void startedLoading() {
                     state.setBuffering(true);
                     state.updated();
                 }
+
+                events.startedLoading();
             }
 
             @Override
@@ -371,6 +373,7 @@ public void finishedLoading(@NotNull MetadataWrapper metadata) {
                 state.setBuffering(false);
                 state.updated();
 
+                events.finishedLoading();
                 events.metadataAvailable();
             }
 
@@ -878,6 +881,10 @@ public interface EventsListener {
         void onVolumeChanged(@NotNull Player player, @Range(from = 0, to = 1) float volume);
 
         void onPanicState(@NotNull Player player);
+
+        void onStartedLoading(@NotNull Player player);
+
+        void onFinishedLoading(@NotNull Player player);
     }
 
     /**
@@ -1038,6 +1045,14 @@ public void onVolumeChanged(@NotNull Player player, @Range(from = 0, to = 1) flo
                     @Override
                     public void onPanicState(@NotNull Player player) {
                     }
+
+                    @Override
+                    public void onStartedLoading(@NotNull Player player) {
+                    }
+
+                    @Override
+                    public void onFinishedLoading(@NotNull Player player) {
+                    }
                 });
             }
         }
@@ -1067,6 +1082,16 @@ void contextChanged() {
                 executorService.execute(() -> l.onContextChanged(Player.this, uri));
         }
 
+        void startedLoading() {
+            for (EventsListener l : new ArrayList<>(listeners))
+                executorService.execute(() -> l.onStartedLoading(Player.this));
+        }
+
+        void finishedLoading() {
+            for (EventsListener l : new ArrayList<>(listeners))
+                executorService.execute(() -> l.onFinishedLoading(Player.this));
+        }
+
         void trackChanged(boolean userInitiated) {
             PlayableId id = state.getCurrentPlayable();
             if (id == null) return;

player/src/main/java/xyz/gianlu/librespot/player/ShellEvents.java

@@ -119,6 +119,16 @@ public void onPanicState(@NotNull Player player) {
         exec(conf.onPanicState);
     }
 
+    @Override
+    public void onStartedLoading(@NotNull Player player) {
+        exec(conf.onStartedLoading);
+    }
+
+    @Override
+    public void onFinishedLoading(@NotNull Player player) {
+        exec(conf.onFinishedLoading);
+    }
+
     @Override
     public void onConnectionDropped() {
         exec(conf.onConnectionDropped);
@@ -144,10 +154,13 @@ public static class Configuration {
         public final String onPanicState;
         public final String onConnectionDropped;
         public final String onConnectionEstablished;
+        public final String onStartedLoading;
+        public final String onFinishedLoading;
 
         public Configuration(boolean enabled, boolean executeWithBash, String onContextChanged, String onTrackChanged, String onPlaybackEnded, String onPlaybackPaused,
                              String onPlaybackResumed, String onTrackSeeked, String onMetadataAvailable, String onVolumeChanged,
-                             String onInactiveSession, String onPanicState, String onConnectionDropped, String onConnectionEstablished) {
+                             String onInactiveSession, String onPanicState, String onConnectionDropped, String onConnectionEstablished,
+                             String onStartedLoading, String onFinishedLoading) {
             this.enabled = enabled;
             this.executeWithBash = executeWithBash;
             this.onContextChanged = onContextChanged;
@@ -162,6 +175,8 @@ public Configuration(boolean enabled, boolean executeWithBash, String onContextC
             this.onPanicState = onPanicState;
             this.onConnectionDropped = onConnectionDropped;
             this.onConnectionEstablished = onConnectionEstablished;
+            this.onStartedLoading = onStartedLoading;
+            this.onFinishedLoading = onFinishedLoading;
         }
 
         public static class Builder {
@@ -179,6 +194,8 @@ public static class Builder {
             private String onPanicState = "";
             private String onConnectionDropped = "";
             private String onConnectionEstablished = "";
+            private String onStartedLoading = "";
+            private String onFinishedLoading = "";
 
             public Builder() {
             }
@@ -253,10 +270,21 @@ public Builder setOnConnectionEstablished(String command) {
                 return this;
             }
 
+            public Builder setOnStartedLoading(String onStartedLoading) {
+                this.onStartedLoading = onStartedLoading;
+                return this;
+            }
+
+            public Builder setOnFinishedLoading(String onFinishedLoading) {
+                this.onFinishedLoading = onFinishedLoading;
+                return this;
+            }
+
             @NotNull
             public Configuration build() {
                 return new Configuration(enabled, executeWithBash, onContextChanged, onTrackChanged, onPlaybackEnded, onPlaybackPaused, onPlaybackResumed,
-                        onTrackSeeked, onMetadataAvailable, onVolumeChanged, onInactiveSession, onPanicState, onConnectionDropped, onConnectionEstablished);
+                        onTrackSeeked, onMetadataAvailable, onVolumeChanged, onInactiveSession, onPanicState, onConnectionDropped, onConnectionEstablished,
+                        onStartedLoading, onFinishedLoading);
             }
         }
     }

player/src/main/resources/default.toml

@@ -79,4 +79,6 @@ onVolumeChanged = ""
 onInactiveSession = ""
 onPanicState = ""
 onConnectionDropped = ""
-onConnectionEstablished = ""
+onConnectionEstablished = ""
+onStartedLoading = ""
+onFinishedLoading = ""