diff --git a/common/src/main/java/ctbrec/sites/fc2live/Fc2Live.java b/common/src/main/java/ctbrec/sites/fc2live/Fc2Live.java index c0e19493..fbf73ab8 100644 --- a/common/src/main/java/ctbrec/sites/fc2live/Fc2Live.java +++ b/common/src/main/java/ctbrec/sites/fc2live/Fc2Live.java @@ -41,7 +41,7 @@ public class Fc2Live extends AbstractSite { @Override public Model createModelFromUrl(String url) { Matcher m = Pattern.compile("http.*?fc2.*?.com/(\\d+)/?").matcher(url); - if(m.find()) { + if (m.find()) { Fc2Model model = (Fc2Model) createModel(""); model.setId(m.group(1)); try { @@ -51,9 +51,9 @@ public class Fc2Live extends AbstractSite { return null; } return model; + } else { + return super.createModelFromUrl(url); } - - return super.createModelFromUrl(url); } @Override diff --git a/common/src/main/java/ctbrec/sites/showup/Showup.java b/common/src/main/java/ctbrec/sites/showup/Showup.java index f19a1aa4..3272c4e6 100644 --- a/common/src/main/java/ctbrec/sites/showup/Showup.java +++ b/common/src/main/java/ctbrec/sites/showup/Showup.java @@ -20,7 +20,6 @@ import org.slf4j.LoggerFactory; import ctbrec.Config; import ctbrec.Model; -import ctbrec.UnknownModel; import ctbrec.io.HttpClient; import ctbrec.io.HttpException; import ctbrec.sites.AbstractSite; @@ -172,11 +171,11 @@ public class Showup extends AbstractSite { @Override 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()) { return createModel(matcher.group(1)); } else { - return new UnknownModel(); + return super.createModelFromUrl(url); } }