From 8c359e57729a0487d26f1456ea74393cb87d9390 Mon Sep 17 00:00:00 2001 From: 0xb00bface <0xboobface@gmail.com> Date: Sun, 28 Feb 2021 15:09:39 +0100 Subject: [PATCH] Fix Camsoda playlist URLs They changed their code again, which constructs the playlist URLs --- .../ctbrec/sites/camsoda/CamsodaModel.java | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/common/src/main/java/ctbrec/sites/camsoda/CamsodaModel.java b/common/src/main/java/ctbrec/sites/camsoda/CamsodaModel.java index 22ff4191..7733a732 100644 --- a/common/src/main/java/ctbrec/sites/camsoda/CamsodaModel.java +++ b/common/src/main/java/ctbrec/sites/camsoda/CamsodaModel.java @@ -76,19 +76,12 @@ public class CamsodaModel extends AbstractModel { private String constructStreamUrl(String edgeServer, String streamName, String token) { StringBuilder url = new StringBuilder("https://"); url.append(edgeServer).append('/'); - if (streamName.contains("-flu")) { - url.append(streamName); - url.append("_h264_aac"); - url.append(streamName.contains("-flu-hd") ? "_720p" : "_480p"); - url.append("/index.m3u8"); - if (!isPublic(streamName)) { - url.append("?token=").append(token); - } - } else { - // https://vide7-ord.camsoda.com/cam/mp4:maxandtokio-enc10-ord_h264_aac_480p/playlist.m3u8 - url.append("cam/mp4:"); - url.append(streamName); - url.append("_h264_aac_480p/playlist.m3u8"); + url.append(streamName); + url.append("_h264_aac"); + url.append(streamName.contains("-flu") ? "_720p" : "_480p"); + url.append("/index.m3u8"); + if (!isPublic(streamName)) { + url.append("?token=").append(token); } LOG.trace("Stream URL: {}", url); return url.toString();