From be54401bf6fa2b82dee8ec9c8b1d8aa06f14dd06 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sat, 26 Mar 2016 16:37:08 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B0=D1=80=D0=B5=D0=B7?= =?UTF-8?q?=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kinosearch/core/warez/Hdrezka.java | 8 +++++++- src/main/java/kinosearch/core/warez/KinoWarez.java | 1 + src/main/java/kinosearch/core/warez/Onlinelife.java | 10 ++++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/kinosearch/core/warez/Hdrezka.java b/src/main/java/kinosearch/core/warez/Hdrezka.java index 20ace63..502bf98 100644 --- a/src/main/java/kinosearch/core/warez/Hdrezka.java +++ b/src/main/java/kinosearch/core/warez/Hdrezka.java @@ -14,6 +14,12 @@ import java.util.regex.Pattern; public class Hdrezka implements KinoWarez { private static final String DOMAIN = "http://hdrezka.me"; + private static final String NAME = "HDREZKA"; + + @Override + public String getName() { + return NAME; + } @Override public void search(String nameKino, List outList, boolean strong) { @@ -45,7 +51,7 @@ public class Hdrezka implements KinoWarez { } } - outList.add(new Kino("[HDREZKA] " + name, url)); + outList.add(new Kino(name, url)); } } diff --git a/src/main/java/kinosearch/core/warez/KinoWarez.java b/src/main/java/kinosearch/core/warez/KinoWarez.java index f0a5212..1e34616 100644 --- a/src/main/java/kinosearch/core/warez/KinoWarez.java +++ b/src/main/java/kinosearch/core/warez/KinoWarez.java @@ -5,6 +5,7 @@ import kinosearch.core.Kino; import java.util.List; public interface KinoWarez { + String getName(); void search(String nameKino, List outList, boolean strong); String player(String page); } diff --git a/src/main/java/kinosearch/core/warez/Onlinelife.java b/src/main/java/kinosearch/core/warez/Onlinelife.java index 0bc6893..80d4399 100644 --- a/src/main/java/kinosearch/core/warez/Onlinelife.java +++ b/src/main/java/kinosearch/core/warez/Onlinelife.java @@ -18,6 +18,12 @@ import java.util.regex.Pattern; public class Onlinelife implements KinoWarez { private static final String DOMAIN = "http://www.online-life.cc"; + private static final String NAME = "OnlineLife"; + + @Override + public String getName() { + return NAME; + } @Override public void search(String nameKino, List outList, boolean strong) { @@ -43,7 +49,7 @@ public class Onlinelife implements KinoWarez { for (Element element : elements) { Element childElement = element.child(0); String name = childElement.text(); - String url = "onlinelife/" + (childElement.attr("href").substring(DOMAIN.length()+1)); + String url = childElement.attr("href"); if (strong) { Matcher matcher = pattern.matcher(name.toLowerCase()); @@ -53,7 +59,7 @@ public class Onlinelife implements KinoWarez { } name = name.replaceAll("\\[.+", "").trim(); - outList.add(new Kino("[OnlineLife] "+name, url)); + outList.add(new Kino(name, url)); } }