From 685b8c728cd56f925987a46709a6f8d6272dc934 Mon Sep 17 00:00:00 2001 From: 0xb00bface <0xboobface@gmail.com> Date: Sat, 12 Mar 2022 15:21:59 +0100 Subject: [PATCH] Fix AmateurTv stream URL construction --- .../java/ctbrec/sites/amateurtv/AmateurTvModel.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/ctbrec/sites/amateurtv/AmateurTvModel.java b/common/src/main/java/ctbrec/sites/amateurtv/AmateurTvModel.java index 89fd52aa..bf68c315 100644 --- a/common/src/main/java/ctbrec/sites/amateurtv/AmateurTvModel.java +++ b/common/src/main/java/ctbrec/sites/amateurtv/AmateurTvModel.java @@ -73,8 +73,17 @@ public class AmateurTvModel extends AbstractModel { PlaylistParser parser = new PlaylistParser(inputStream, Format.EXT_M3U, Encoding.UTF_8, ParsingMode.LENIENT); Playlist playlist = parser.parse(); MediaPlaylist media = playlist.getMediaPlaylist(); - String baseUrl = streamUrl.substring(0, streamUrl.lastIndexOf('/') + 1); - String vodUri = baseUrl + media.getTracks().get(0).getUri(); + String vodUri; + String trackUri = media.getTracks().get(0).getUri(); + if (trackUri.startsWith("http")) { + vodUri = trackUri; + } else if (trackUri.startsWith("/")) { + String baseUrl = streamUrl.substring(0, streamUrl.indexOf("/", 8)); + vodUri = baseUrl + trackUri; + } else { + String baseUrl = streamUrl.substring(0, streamUrl.lastIndexOf('/') + 1); + vodUri = baseUrl + trackUri; + } StreamSource streamsource = new StreamSource(); streamsource.mediaPlaylistUrl = vodUri; streamsource.width = 0;