From 25f8f0e70a389e185c5bf141afa0cf531d60d706 Mon Sep 17 00:00:00 2001 From: David Amorim Date: Sun, 5 Sep 2021 13:25:34 +0100 Subject: [PATCH] Refactor AudioLoaderRestHandler --- .../server/player/AudioLoaderRestHandler.kt | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/LavalinkServer/src/main/kotlin/lavalink/server/player/AudioLoaderRestHandler.kt b/LavalinkServer/src/main/kotlin/lavalink/server/player/AudioLoaderRestHandler.kt index 09a55140..d787e5c3 100644 --- a/LavalinkServer/src/main/kotlin/lavalink/server/player/AudioLoaderRestHandler.kt +++ b/LavalinkServer/src/main/kotlin/lavalink/server/player/AudioLoaderRestHandler.kt @@ -46,10 +46,7 @@ class AudioLoaderRestHandler( } private fun log(request: HttpServletRequest) { - val path = request.servletPath - val method = request.method - - log.info("$method $path") + log.info("${request.method} ${request.servletPath}") } private fun trackToJSON(audioTrack: AudioTrack): JSONObject { @@ -63,10 +60,9 @@ class AudioLoaderRestHandler( .put("uri", trackInfo.uri) .put("isStream", trackInfo.isStream) .put("isSeekable", audioTrack.isSeekable) - .put("source", audioTrack.sourceManager.sourceName) + .put("source", audioTrack.sourceManager?.sourceName) .put("position", audioTrack.position) .put("thumbnail", trackInfo.artworkUrl) - .put("sourceName", audioTrack.sourceManager?.sourceName) } private fun encodeLoadResult(result: LoadResult): JSONObject { @@ -115,7 +111,7 @@ class AudioLoaderRestHandler( return AudioLoader(audioPlayerManager).load(identifier) .thenApply(this::encodeLoadResult) .thenApply { - ResponseEntity(it.toString(), HttpStatus.OK) + ResponseEntity(it.toString(), HttpStatus.OK) } } @@ -127,7 +123,7 @@ class AudioLoaderRestHandler( val audioTrack = Util.decodeAudioTrack(audioPlayerManager, track) - return ResponseEntity(trackToJSON(audioTrack).toString(), HttpStatus.OK) + return ResponseEntity(trackToJSON(audioTrack).toString(), HttpStatus.OK) } @PostMapping(value = ["/decodetracks"], consumes = ["application/json"], produces = ["application/json"]) @@ -139,7 +135,7 @@ class AudioLoaderRestHandler( val requestJSON = JSONArray(body) val responseJSON = JSONArray() - requestJSON.forEachIndexed { i, _ -> + for (i in 0 until requestJSON.length()) { val track = requestJSON.getString(i) val audioTrack = Util.decodeAudioTrack(audioPlayerManager, track) @@ -151,6 +147,6 @@ class AudioLoaderRestHandler( responseJSON.put(trackJSON) } - return ResponseEntity(responseJSON.toString(), HttpStatus.OK) + return ResponseEntity(responseJSON.toString(), HttpStatus.OK) } }