diff --git a/src/main/java/kinosearch/core/warez/Onlinelife.java b/src/main/java/kinosearch/core/warez/Onlinelife.java index 7f50d3d..410432a 100644 --- a/src/main/java/kinosearch/core/warez/Onlinelife.java +++ b/src/main/java/kinosearch/core/warez/Onlinelife.java @@ -41,7 +41,7 @@ public class Onlinelife implements KinoWarez { for (Element element : elements) { Element childElement = element.child(0); String name = childElement.text(); - String url = childElement.attr("href"); + String url = "onlinelife/" + (childElement.attr("href").substring(DOMAIN.length()+1)); if (strong) { Matcher matcher = pattern.matcher(name.toLowerCase()); @@ -68,11 +68,12 @@ public class Onlinelife implements KinoWarez { JsonObject jsonObj = new Gson().fromJson(json, JsonObject.class); if (jsonObj.has("file")) { - return jsonObj.get("file").getAsString(); + return "{\"file\":\"" + jsonObj.get("file").getAsString() + "\"}"; } else if (jsonObj.has("pl")) { - return jsonObj.get("pl").getAsString(); + browser.setEncoding("utf-8"); + return browser.get(jsonObj.get("pl").getAsString()); } else { - return ""; + return "{}"; } } } \ No newline at end of file diff --git a/src/main/java/kinosearch/webapp/servlets/PlayerServlet.java b/src/main/java/kinosearch/webapp/servlets/PlayerServlet.java index b42d501..1fdf9ba 100644 --- a/src/main/java/kinosearch/webapp/servlets/PlayerServlet.java +++ b/src/main/java/kinosearch/webapp/servlets/PlayerServlet.java @@ -38,8 +38,8 @@ public class PlayerServlet extends HttpServlet { req.getPathInfo(), req.getServletPath())); KinoWarez kinoWarez = new Onlinelife(); - String movie_url = kinoWarez.player(req.getPathInfo()); - model.put("movie_url", movie_url); + String json = kinoWarez.player(req.getPathInfo()); + model.put("json", json); resp.setCharacterEncoding("UTF-8"); resp.setContentType("text/html;charset=UTF-8"); diff --git a/webapp/WEB-INF/player.html b/webapp/WEB-INF/player.html index a0d7bda..536b3cc 100644 --- a/webapp/WEB-INF/player.html +++ b/webapp/WEB-INF/player.html @@ -1,3 +1,66 @@ <#include "/header.inc.html"> - + + +