davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Fix createModelFromUrl for Showup and Fc2Live

This commit is contained in:
0xboobface 2020-05-23 16:20:14 +02:00
parent 62be5795f4
commit f1a0e5900c
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/java/ctbrec/sites/fc2live/Fc2Live.java
View File

@ -41,7 +41,7 @@ public class Fc2Live extends AbstractSite {
@Override @Override
public Model createModelFromUrl(String url) { public Model createModelFromUrl(String url) {
Matcher m = Pattern.compile("http.*?fc2.*?.com/(\\d+)/?").matcher(url); Matcher m = Pattern.compile("http.*?fc2.*?.com/(\\d+)/?").matcher(url);
if(m.find()) { if (m.find()) {
Fc2Model model = (Fc2Model) createModel(""); Fc2Model model = (Fc2Model) createModel("");
model.setId(m.group(1)); model.setId(m.group(1));
try { try {
@ -51,9 +51,9 @@ public class Fc2Live extends AbstractSite {
return null; return null;
} }
return model; return model;
} else {
return super.createModelFromUrl(url);
} }
return super.createModelFromUrl(url);
} }
@Override @Override

5
common/src/main/java/ctbrec/sites/showup/Showup.java
View File

@ -20,7 +20,6 @@ import org.slf4j.LoggerFactory;
import ctbrec.Config; import ctbrec.Config;
import ctbrec.Model; import ctbrec.Model;
import ctbrec.UnknownModel;
import ctbrec.io.HttpClient; import ctbrec.io.HttpClient;
import ctbrec.io.HttpException; import ctbrec.io.HttpException;
import ctbrec.sites.AbstractSite; import ctbrec.sites.AbstractSite;
@ -172,11 +171,11 @@ public class Showup extends AbstractSite {
@Override @Override
public Model createModelFromUrl(String url) { public Model createModelFromUrl(String url) {
Matcher matcher = Pattern.compile(getBaseUrl() + "(?:/profile)?/(.*)").matcher(url); Matcher matcher = Pattern.compile("https?://(?:.*?\\.)?showup.tv(?:/profile)?/(.*)").matcher(url);
if (matcher.find()) { if (matcher.find()) {
return createModel(matcher.group(1)); return createModel(matcher.group(1));
} else { } else {
return new UnknownModel(); return super.createModelFromUrl(url);
} }
} }