0

Корректировка выдачи ссылки на плеер

This commit is contained in:
2016-03-26 18:44:05 +03:00
parent c827bf7ab8
commit d439ba938e
7 changed files with 37 additions and 8 deletions

View File

@@ -1,13 +1,17 @@
package kinosearch.core; package kinosearch.core;
import kinosearch.core.warez.KinoWarez;
public class Kino { public class Kino {
private String name; private String name;
private String url; private String url;
private boolean player = false; 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.name = name;
this.url = url; this.url = url;
this.kinowarez = kinoWarez;
} }
public String getName() { public String getName() {
@@ -29,4 +33,17 @@ public class Kino {
public void setPlayer(boolean value) { public void setPlayer(boolean value) {
this.player = 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 "#";
}
}
} }

View File

@@ -23,6 +23,11 @@ public class Hdrezka implements KinoWarez {
return NAME; return NAME;
} }
@Override
public String getDomain() {
return DOMAIN;
}
@Override @Override
public List<Kino> search(String nameKino, boolean strong) { public List<Kino> search(String nameKino, boolean strong) {
Browser browser = Tools.createBrowser(); 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; return outList;

View File

@@ -8,4 +8,5 @@ public interface KinoWarez {
String getName(); String getName();
List<Kino> search(String nameKino, boolean strong); List<Kino> search(String nameKino, boolean strong);
String player(String page); String player(String page);
String getDomain();
} }

View File

@@ -27,6 +27,11 @@ public class Onlinelife implements KinoWarez {
return NAME; return NAME;
} }
@Override
public String getDomain() {
return DOMAIN;
}
@Override @Override
public List<Kino> search(String nameKino, boolean strong) { public List<Kino> search(String nameKino, boolean strong) {
Browser browser = Tools.createBrowser(); Browser browser = Tools.createBrowser();
@@ -62,7 +67,7 @@ public class Onlinelife implements KinoWarez {
} }
name = name.replaceAll("\\[.+", "").trim(); name = name.replaceAll("\\[.+", "").trim();
Kino kino = new Kino(name, url); Kino kino = new Kino(name, url, this);
kino.setPlayer(true); kino.setPlayer(true);
outList.add(kino); outList.add(kino);
} }

View File

@@ -1,6 +1,7 @@
package kinosearch.webapp; package kinosearch.webapp;
import kinosearch.core.Kino; import kinosearch.core.Kino;
import kinosearch.core.warez.KinoWarez;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -12,8 +13,8 @@ import java.util.List;
public class KinoGroup extends Kino { public class KinoGroup extends Kino {
private List<Kino> kinolist = new ArrayList<>(); private List<Kino> kinolist = new ArrayList<>();
public KinoGroup(String name, String url) { public KinoGroup(String name, String url, KinoWarez kinoWarez) {
super(name, ""); super(name, "", kinoWarez);
} }
public List<Kino> getKinolist() { public List<Kino> getKinolist() {

View File

@@ -89,7 +89,7 @@ public class IndexServlet extends HttpServlet {
continue; continue;
} }
KinoGroup group = new KinoGroup(s1, null); KinoGroup group = new KinoGroup(s1, null, null);
Iterator<Kino> itr2 = list.iterator(); Iterator<Kino> itr2 = list.iterator();
int val = 0; int val = 0;

View File

@@ -28,7 +28,7 @@
<a class="btn btn-primary btn-block" href="${kino_groupped.url}" target="_blank">на сайте</a> <a class="btn btn-primary btn-block" href="${kino_groupped.url}" target="_blank">на сайте</a>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<a class="btn btn-danger btn-block" href="#" target="_blank">в плеере</a> <a class="btn btn-danger btn-block" href="${kino_groupped.getPlayerUrl()}" target="_blank">в плеере</a>
</div> </div>
<#else> <#else>
<div class="col-sm-12"> <div class="col-sm-12">
@@ -52,7 +52,7 @@
<a class="btn btn-primary btn-block" href="${kino.url}" target="_blank">на сайте</a> <a class="btn btn-primary btn-block" href="${kino.url}" target="_blank">на сайте</a>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<a class="btn btn-danger btn-block" href="#" target="_blank">в плеере</a> <a class="btn btn-danger btn-block" href="${kino.getPlayerUrl()}" target="_blank">в плеере</a>
</div> </div>
<#else> <#else>
<div class="col-sm-12"> <div class="col-sm-12">