diff --git a/src/main/java/kinosearch/core/warez/Onlinelife.java b/src/main/java/kinosearch/core/warez/Onlinelife.java index f2ef435..941d419 100644 --- a/src/main/java/kinosearch/core/warez/Onlinelife.java +++ b/src/main/java/kinosearch/core/warez/Onlinelife.java @@ -66,28 +66,15 @@ public class Onlinelife implements KinoWarez { } } - boolean has_player = is_serial(name); - name = name.replaceAll("\\[.+", "").trim(); Kino kino = new Kino(name, url, this); - kino.setPlayer(has_player); + kino.setPlayer(true); outList.add(kino); } return outList; } - private boolean is_serial(String name) { - Pattern pattern = Pattern.compile("\\[(.+)\\]"); - Matcher matcher = pattern.matcher(name); - if (matcher.find()) { - int idx = matcher.group().indexOf("1"); - return !(idx >= 0); - } else { - return false; - } - } - @Override public String player(String page) { String movie_id = page.substring(1,page.indexOf("-")); @@ -102,7 +89,8 @@ public class Onlinelife implements KinoWarez { if (jsonObj.has("file")) { String fileMp4 = jsonObj.get("file").getAsString().substring("http://".length()); - return "{\"file\":\"/proxy/onlinelife/" + fileMp4 + "\"}"; + String title = jsonObj.get("comment").getAsString(); + return "{\"file\":\"/proxy/onlinelife/" + fileMp4 + "\",\"title\":\"" + title + "\"}"; } else if (jsonObj.has("pl")) { browser.setEncoding("utf-8"); return replaceToProxy(browser.get(jsonObj.get("pl").getAsString())); diff --git a/webapp/WEB-INF/news.inc.html b/webapp/WEB-INF/news.inc.html index 8909084..1dbcd83 100644 --- a/webapp/WEB-INF/news.inc.html +++ b/webapp/WEB-INF/news.inc.html @@ -1,4 +1,16 @@
+
+ +
+
+

Version 2.0.7c

+ +
+
diff --git a/webapp/WEB-INF/player.html b/webapp/WEB-INF/player.html index ce854de..f985626 100644 --- a/webapp/WEB-INF/player.html +++ b/webapp/WEB-INF/player.html @@ -1,42 +1,161 @@ <#include "/header.inc.html"> + + +
-

+
- +

+ +
+ +
<#include "/fother.inc.html"> \ No newline at end of file diff --git a/webapp/js/js.cookie-2.1.0.min.js b/webapp/js/js.cookie-2.1.0.min.js new file mode 100644 index 0000000..2b385bc --- /dev/null +++ b/webapp/js/js.cookie-2.1.0.min.js @@ -0,0 +1,2 @@ +/*! js-cookie v2.1.0 | MIT */ +!function(a){if("function"==typeof define&&define.amd)define(a);else if("object"==typeof exports)module.exports=a();else{var b=window.Cookies,c=window.Cookies=a();c.noConflict=function(){return window.Cookies=b,c}}}(function(){function a(){for(var a=0,b={};a1){if(f=a({path:"/"},d.defaults,f),"number"==typeof f.expires){var h=new Date;h.setMilliseconds(h.getMilliseconds()+864e5*f.expires),f.expires=h}try{g=JSON.stringify(e),/^[\{\[]/.test(g)&&(e=g)}catch(i){}return e=c.write?c.write(e,b):encodeURIComponent(String(e)).replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g,decodeURIComponent),b=encodeURIComponent(String(b)),b=b.replace(/%(23|24|26|2B|5E|60|7C)/g,decodeURIComponent),b=b.replace(/[\(\)]/g,escape),document.cookie=[b,"=",e,f.expires&&"; expires="+f.expires.toUTCString(),f.path&&"; path="+f.path,f.domain&&"; domain="+f.domain,f.secure?"; secure":""].join("")}b||(g={});for(var j=document.cookie?document.cookie.split("; "):[],k=/(%[0-9A-Z]{2})+/g,l=0;l