j62
/
ctbrec
2
2
Fork 2
Code Issues 9 Pull Requests Packages Projects Releases 3 Wiki Activity

Fix MVLive recordings

This commit is contained in:
0xb00bface 2020-12-20 00:08:07 +01:00
parent eba3052885
commit 867e500fbd
3 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,7 +1,9 @@
3.10.10 3.10.10
======================== ========================
* Fix: "Check URLs" button stays inactive * Fixed MVLive recordings once again
* Fix: "Check URLs" button stays inactive after the first run
* Fix: recordings for some Cam4 models still didn't start * Fix: recordings for some Cam4 models still didn't start
* Some smaller tweaks here and there
3.10.9 3.10.9
======================== ========================

3
common/src/main/java/ctbrec/sites/manyvids/MVLive.java
View File

@ -28,7 +28,8 @@ import okhttp3.Response;
public class MVLive extends AbstractSite { public class MVLive extends AbstractSite {
public static final String WS_URL = "wss://app-v2.live.manyvids.com"; public static final String APP_HOST = "app-v1.live.manyvids.com";
public static final String WS_URL = "wss://" + APP_HOST;
public static final String WS_ORIGIN = "https://live.manyvids.com"; public static final String WS_ORIGIN = "https://live.manyvids.com";
public static final String BASE_URL = "https://www.manyvids.com/MVLive/"; public static final String BASE_URL = "https://www.manyvids.com/MVLive/";

50
common/src/main/java/ctbrec/sites/manyvids/MVLiveModel.java
View File

@ -1,21 +1,9 @@
package ctbrec.sites.manyvids; package ctbrec.sites.manyvids;
import com.iheartradio.m3u8.*; import static ctbrec.Model.State.*;
import com.iheartradio.m3u8.data.MasterPlaylist; import static ctbrec.io.HttpConstants.*;
import com.iheartradio.m3u8.data.Playlist; import static ctbrec.sites.manyvids.MVLive.*;
import com.iheartradio.m3u8.data.PlaylistData; import static java.nio.charset.StandardCharsets.*;
import ctbrec.AbstractModel;
import ctbrec.Config;
import ctbrec.Model;
import ctbrec.StringUtil;
import ctbrec.io.HttpException;
import ctbrec.recorder.download.Download;
import ctbrec.recorder.download.StreamSource;
import okhttp3.Request;
import okhttp3.Response;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
@ -26,9 +14,29 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import static ctbrec.Model.State.ONLINE; import org.json.JSONObject;
import static ctbrec.io.HttpConstants.*; import org.slf4j.Logger;
import static java.nio.charset.StandardCharsets.UTF_8; import org.slf4j.LoggerFactory;
import com.iheartradio.m3u8.Encoding;
import com.iheartradio.m3u8.Format;
import com.iheartradio.m3u8.ParseException;
import com.iheartradio.m3u8.ParsingMode;
import com.iheartradio.m3u8.PlaylistException;
import com.iheartradio.m3u8.PlaylistParser;
import com.iheartradio.m3u8.data.MasterPlaylist;
import com.iheartradio.m3u8.data.Playlist;
import com.iheartradio.m3u8.data.PlaylistData;
import ctbrec.AbstractModel;
import ctbrec.Config;
import ctbrec.Model;
import ctbrec.StringUtil;
import ctbrec.io.HttpException;
import ctbrec.recorder.download.Download;
import ctbrec.recorder.download.StreamSource;
import okhttp3.Request;
import okhttp3.Response;
public class MVLiveModel extends AbstractModel { public class MVLiveModel extends AbstractModel {
@ -109,8 +117,8 @@ public class MVLiveModel extends AbstractModel {
} }
public void updateCloudFlareCookies() throws IOException, InterruptedException { public void updateCloudFlareCookies() throws IOException, InterruptedException {
String url = "https://app-v2.live.manyvids.com/api/" + getRoomNumber() + "/player-settings/" + getDisplayName(); String url = "https://" + APP_HOST + "/api/" + getRoomNumber() + "/player-settings/" + getDisplayName();
LOG.trace("Getting CF cookies: {}", url); LOG.debug("Getting CF cookies: {}", url);
Request req = new Request.Builder() Request req = new Request.Builder()
.url(url) .url(url)
.header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent) .header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)