diff --git a/src/main/java/kinosearch/core/Kino.java b/src/main/java/kinosearch/core/Kino.java index 0529749..247265f 100644 --- a/src/main/java/kinosearch/core/Kino.java +++ b/src/main/java/kinosearch/core/Kino.java @@ -1,13 +1,17 @@ package kinosearch.core; +import kinosearch.core.warez.KinoWarez; + public class Kino { private String name; private String url; private boolean player = false; + private KinoWarez kinowarez; - public Kino(String name, String url) { + public Kino(String name, String url, KinoWarez kinoWarez) { this.name = name; this.url = url; + this.kinowarez = kinoWarez; } public String getName() { @@ -29,4 +33,17 @@ public class Kino { public void setPlayer(boolean value) { this.player = value; } + + public KinoWarez getKinowarez() { + return kinowarez; + } + + public String getPlayerUrl() { + if (player) { + String path = url.substring(kinowarez.getDomain().length()); + return kinowarez.getName().toLowerCase() + path; + } else { + return "#"; + } + } } diff --git a/src/main/java/kinosearch/core/warez/Hdrezka.java b/src/main/java/kinosearch/core/warez/Hdrezka.java index 4f5fda6..1568f22 100644 --- a/src/main/java/kinosearch/core/warez/Hdrezka.java +++ b/src/main/java/kinosearch/core/warez/Hdrezka.java @@ -23,6 +23,11 @@ public class Hdrezka implements KinoWarez { return NAME; } + @Override + public String getDomain() { + return DOMAIN; + } + @Override public List search(String nameKino, boolean strong) { Browser browser = Tools.createBrowser(); @@ -54,7 +59,7 @@ public class Hdrezka implements KinoWarez { } } - outList.add(new Kino(name, url)); + outList.add(new Kino(name, url, this)); } return outList; diff --git a/src/main/java/kinosearch/core/warez/KinoWarez.java b/src/main/java/kinosearch/core/warez/KinoWarez.java index e9864b7..e36a3fd 100644 --- a/src/main/java/kinosearch/core/warez/KinoWarez.java +++ b/src/main/java/kinosearch/core/warez/KinoWarez.java @@ -8,4 +8,5 @@ public interface KinoWarez { String getName(); List search(String nameKino, boolean strong); String player(String page); + String getDomain(); } diff --git a/src/main/java/kinosearch/core/warez/Onlinelife.java b/src/main/java/kinosearch/core/warez/Onlinelife.java index 7075d2b..d0f1233 100644 --- a/src/main/java/kinosearch/core/warez/Onlinelife.java +++ b/src/main/java/kinosearch/core/warez/Onlinelife.java @@ -27,6 +27,11 @@ public class Onlinelife implements KinoWarez { return NAME; } + @Override + public String getDomain() { + return DOMAIN; + } + @Override public List search(String nameKino, boolean strong) { Browser browser = Tools.createBrowser(); @@ -62,7 +67,7 @@ public class Onlinelife implements KinoWarez { } name = name.replaceAll("\\[.+", "").trim(); - Kino kino = new Kino(name, url); + Kino kino = new Kino(name, url, this); kino.setPlayer(true); outList.add(kino); } diff --git a/src/main/java/kinosearch/webapp/KinoGroup.java b/src/main/java/kinosearch/webapp/KinoGroup.java index f8b97d5..1645525 100644 --- a/src/main/java/kinosearch/webapp/KinoGroup.java +++ b/src/main/java/kinosearch/webapp/KinoGroup.java @@ -1,6 +1,7 @@ package kinosearch.webapp; import kinosearch.core.Kino; +import kinosearch.core.warez.KinoWarez; import java.util.ArrayList; import java.util.List; @@ -12,8 +13,8 @@ import java.util.List; public class KinoGroup extends Kino { private List kinolist = new ArrayList<>(); - public KinoGroup(String name, String url) { - super(name, ""); + public KinoGroup(String name, String url, KinoWarez kinoWarez) { + super(name, "", kinoWarez); } public List getKinolist() { diff --git a/src/main/java/kinosearch/webapp/servlets/IndexServlet.java b/src/main/java/kinosearch/webapp/servlets/IndexServlet.java index 76bcaf8..687f04e 100644 --- a/src/main/java/kinosearch/webapp/servlets/IndexServlet.java +++ b/src/main/java/kinosearch/webapp/servlets/IndexServlet.java @@ -89,7 +89,7 @@ public class IndexServlet extends HttpServlet { continue; } - KinoGroup group = new KinoGroup(s1, null); + KinoGroup group = new KinoGroup(s1, null, null); Iterator itr2 = list.iterator(); int val = 0; diff --git a/webapp/WEB-INF/index.html b/webapp/WEB-INF/index.html index ad6edd1..7d79639 100644 --- a/webapp/WEB-INF/index.html +++ b/webapp/WEB-INF/index.html @@ -28,7 +28,7 @@ на сайте <#else>
@@ -52,7 +52,7 @@ на сайте
<#else>