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

Fix Flirt4Free thumb overviews and recording

This commit is contained in:
0xboobface 2019-06-08 10:34:44 +02:00
parent 59d1954d49
commit ddbd8de900
2 changed files with 49 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeUpdateService.java
View File

@ -7,8 +7,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.json.JSONArray;
import org.json.JSONObject;
import org.jsoup.nodes.Element; import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -41,52 +42,59 @@ public class Flirt4FreeUpdateService extends PaginatedScheduledService {
@Override @Override
public List<Model> call() throws IOException { public List<Model> call() throws IOException {
LOG.debug("Fetching page {}", url); LOG.debug("Fetching page {}", url);
Request request = new Request.Builder() Request request = new Request.Builder().url(url).addHeader("User-Agent", Config.getInstance().getSettings().httpUserAgent).build();
.url(url)
.addHeader("User-Agent", Config.getInstance().getSettings().httpUserAgent)
.build();
try (Response response = flirt4Free.getHttpClient().execute(request)) { try (Response response = flirt4Free.getHttpClient().execute(request)) {
if (response.isSuccessful()) { if (response.isSuccessful()) {
List<Model> models = new ArrayList<>(); List<Model> models = new ArrayList<>();
String body = response.body().string(); String body = response.body().string();
Elements tags = HtmlParser.getTags(body, "div#live_models div[class*=modelNumber]"); Matcher m = Pattern.compile("window\\.homepageData = (\\{.*\\})", Pattern.DOTALL).matcher(body);
for (Element tag : tags) { if (m.find()) {
tag.setBaseUri(url); JSONObject data = new JSONObject(m.group(1));
String modelHtml = tag.html(); JSONArray modelData = data.getJSONArray("liveModels");
Element modelLink = HtmlParser.getTag(modelHtml, "a[class*=modelLink]"); LOG.debug("Found {} models", modelData.length());
modelLink.setBaseUri(url); for (int i = 0; i < modelData.length(); i++) {
String href = modelLink.attr("href"); String modelHtml = modelData.getString(i);
String name = href.substring(0, href.length()-1); if (modelHtml.trim().isEmpty() || !modelHtml.contains("modelLink")) {
name = name.substring(name.indexOf('/', 1) + 1); continue;
Flirt4FreeModel model = (Flirt4FreeModel) flirt4Free.createModel(name);
Element img = HtmlParser.getTag(modelHtml, "a[class*=modelLink] img");
img.setBaseUri(url);
if(img.hasAttr("data-image-url")) {
model.setPreview(img.absUrl("data-image-url"));
} else {
// background-image: url('https://cdn1.vscdns.com/images/models/samples-640x480/3241715.jpg')
Matcher m = Pattern.compile("background-image: url\\('(.*?)'\\)").matcher(img.attr("style"));
if(m.find()) {
model.setPreview(m.group(1));
} }
Element modelDiv = HtmlParser.getTag(modelHtml, "div[class~=homepageModel]");
String name = modelDiv.attr("data-model-seo-name");
Flirt4FreeModel model = (Flirt4FreeModel) flirt4Free.createModel(name);
model.setDisplayName(modelDiv.attr("data-model-name"));
Element img = HtmlParser.getTag(modelHtml, "a[class*=modelLink] img");
img.setBaseUri(url);
if (img.hasAttr("data-image-url")) {
model.setPreview(img.absUrl("data-image-url"));
} else {
// background-image: url('https://cdn1.vscdns.com/images/models/samples-640x480/3241715.jpg')
m = Pattern.compile("background-image: url\\('(.*?)'\\)").matcher(img.attr("style"));
if (m.find()) {
model.setPreview(m.group(1));
}
}
Element link = HtmlParser.getTag(modelHtml, "a.name");
model.setDisplayName(link.attr("title"));
Element modelLink = HtmlParser.getTag(modelHtml, "a[class~=modelLink]");
model.setUrl(Flirt4Free.BASE_URI + "/rooms/" + modelDiv.attr("data-model-seo-name") + '/');
model.setDescription("");
String videoHost = modelLink.attr("data-video-host");
String modelId = modelLink.attr("data-model-id").substring(5);
model.setId(modelId);
String streamUrl = "https://manifest.vscdns.com/manifest.m3u8.m3u8?key=nil&provider=level3&secure=true&host=" + videoHost
+ "&model_id=" + modelId;
model.setStreamUrl(streamUrl);
model.setOnlineState(ctbrec.Model.State.ONLINE);
model.setOnline(true);
//System.err.println("--" + model);
models.add(model);
} }
Element link = HtmlParser.getTag(modelHtml, "a.name"); return models.stream()
model.setDisplayName(link.attr("title")); .skip((page - 1) * MODELS_PER_PAGE)
model.setUrl(modelLink.absUrl("href")); .limit(MODELS_PER_PAGE)
model.setDescription(""); .collect(Collectors.toList());
String videoHost = modelLink.attr("data-video-host"); } else {
String modelId = modelLink.attr("data-model-id").substring(5); throw new RuntimeException("Pattern didn't match model JSON data");
model.setId(modelId);
String streamUrl = "https://manifest.vscdns.com/manifest.m3u8.m3u8?key=nil&provider=level3&secure=true&host=" + videoHost + "&model_id=" + modelId;
model.setStreamUrl(streamUrl);
model.setOnlineState(ctbrec.Model.State.ONLINE);
model.setOnline(true);
models.add(model);
} }
return models.stream()
.skip((page-1) * MODELS_PER_PAGE)
.limit(MODELS_PER_PAGE)
.collect(Collectors.toList());
} else { } else {
throw new HttpException(response.code(), response.message()); throw new HttpException(response.code(), response.message());
} }

2
common/src/main/java/ctbrec/sites/flirt4free/Flirt4FreeModel.java
View File

@ -83,7 +83,7 @@ public class Flirt4FreeModel extends AbstractModel {
return false; return false;
} }
JSONObject json = new JSONObject(body); JSONObject json = new JSONObject(body);
// LOG.debug("check model status: {}", json.toString(2)); //LOG.debug("check model status: {}", json.toString(2));
online = Objects.equals(json.optString("status"), "online"); online = Objects.equals(json.optString("status"), "online");
id = String.valueOf(json.get("model_id")); id = String.valueOf(json.get("model_id"));
if (online) { if (online) {