Clean up FloweryTTS AudioTrack (#183)

Author: devoxin

main/src/main/java/com/github/topi314/lavasrc/flowerytts/FloweryTTSAudioTrack.java

@@ -6,29 +6,24 @@
 import com.sedmelluq.discord.lavaplayer.container.ogg.OggAudioTrack;
 import com.sedmelluq.discord.lavaplayer.container.wav.WavAudioTrack;
 import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
+import com.sedmelluq.discord.lavaplayer.tools.Units;
 import com.sedmelluq.discord.lavaplayer.tools.io.PersistentHttpStream;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.BaseAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.DelegatedAudioTrack;
+import com.sedmelluq.discord.lavaplayer.track.*;
 import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.utils.URIBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.io.InputStream;
-import java.util.List;
+import java.net.URI;
+import java.util.Arrays;
 import java.util.Map;
+import java.util.function.BiFunction;
+import java.util.stream.Collectors;
 
 public class FloweryTTSAudioTrack extends DelegatedAudioTrack {
-	private static final Map<String, Class<? extends BaseAudioTrack>> AUDIO_FORMATS = Map.of(
-		"mp3", Mp3AudioTrack.class,
-		"ogg_opus", OggAudioTrack.class,
-		"ogg_vorbis", OggAudioTrack.class,
-		"wav", WavAudioTrack.class,
-		"flac", FlacAudioTrack.class,
-		"aac", AdtsAudioTrack.class
-	);
+	private static final Logger log = LoggerFactory.getLogger(FloweryTTSAudioTrack.class);
+
 	public static final String API_BASE = "https://api.flowery.pw/v1/tts";
 
 	private final FloweryTTSSourceManager sourceManager;
@@ -41,30 +36,28 @@ public FloweryTTSAudioTrack(AudioTrackInfo trackInfo, FloweryTTSSourceManager so
 	@Override
 	public void process(LocalAudioTrackExecutor executor) throws Exception {
 		try (var httpInterface = this.sourceManager.getHttpInterface()) {
-			var queryParams = new URIBuilder(this.trackInfo.identifier).getQueryParams();
-			var apiUri = new URIBuilder(API_BASE);
-			String format = "mp3";
-
-			apiUri.addParameter("text", this.trackInfo.title);
-			for (var entry : this.sourceManager.getDefaultConfig().entrySet()) {
-				var value = queryParams.stream()
-					.filter((p) -> entry.getKey().equals(p.getName()))
-					.map(NameValuePair::getValue)
-					.findFirst()
-					.orElse(entry.getValue());
+			var queryParams = new URIBuilder(this.trackInfo.identifier).getQueryParams()
+				.stream()
+				.collect(Collectors.toMap(NameValuePair::getName, NameValuePair::getValue));
+
+			var apiUri = new URIBuilder(API_BASE)
+				.addParameter("text", this.trackInfo.title);
+
+			Map<String, String> config = this.sourceManager.getDefaultConfig();
+			String audioFormat = queryParams.getOrDefault("audio_format", config.get("audio_format"));
+
+			for (var entry : config.entrySet()) {
+				var value = queryParams.getOrDefault(entry.getKey(), entry.getValue());
 				apiUri.addParameter(entry.getKey(), value);
-				if ("audio_format".equals(entry.getKey())) {
-					format = value;
-				}
 			}
-			System.out.println(apiUri.build());
-			try (var stream = new PersistentHttpStream(httpInterface, apiUri.build(), null)) {
-				var audioTrackClass = AUDIO_FORMATS.get(format);
-				if (audioTrackClass == null) {
-					throw new IllegalArgumentException("Invalid audio format");
-				}
-				var streamClass = ("aac".equals(format)) ? InputStream.class : SeekableInputStream.class;
-				processDelegate(audioTrackClass.getConstructor(AudioTrackInfo.class, streamClass).newInstance(this.trackInfo, stream), executor);
+
+			URI url = apiUri.build();
+			AudioFormat format = AudioFormat.getByName(audioFormat);
+			log.debug("Requesting TTS URL \"{}\"", url);
+
+			try (var stream = new PersistentHttpStream(httpInterface, url, Units.CONTENT_LENGTH_UNKNOWN)) {
+				InternalAudioTrack track = format.trackFactory.apply(this.trackInfo, stream);
+				processDelegate(track, executor);
 			}
 		}
 	}
@@ -79,4 +72,27 @@ public AudioSourceManager getSourceManager() {
 		return this.sourceManager;
 	}
 
-}
+	private enum AudioFormat {
+		MP3("mp3", Mp3AudioTrack::new),
+		OGG_OPUS("ogg_opus", OggAudioTrack::new),
+		OGG_VORBIS("ogg_vorbis", OggAudioTrack::new),
+		WAV("wav", WavAudioTrack::new),
+		FLAC("flac", FlacAudioTrack::new),
+		AAC("aac", AdtsAudioTrack::new);
+
+		private final String name;
+		private final BiFunction<AudioTrackInfo, PersistentHttpStream, InternalAudioTrack> trackFactory;
+
+		AudioFormat(String name, BiFunction<AudioTrackInfo, PersistentHttpStream, InternalAudioTrack> trackFactory) {
+			this.name = name;
+			this.trackFactory = trackFactory;
+		}
+
+		static AudioFormat getByName(String name) {
+			return Arrays.stream(values())
+				.filter(e -> e.name.equals(name))
+				.findFirst()
+				.orElseThrow(() -> new IllegalArgumentException("Invalid audio format"));
+		}
+	}
+}