From d23f84bc8020bb7b8d8f14558cdef1b64ae0ebcf Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Thu, 24 Mar 2016 13:43:30 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D1=87=D0=BD=D1=8B=D0=B9=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D1=80=D1=81=D0=B8=D0=BD=D0=B3=20=D1=84=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BC=D0=BE=D0=B2=20=D0=B8=20=D1=81=D0=B5=D1=80=D0=B8?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=BE=D0=B2=20=D1=81=20OnlineLife?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kinosearch/core/warez/Onlinelife.java     |  9 +--
 .../webapp/servlets/PlayerServlet.java        |  4 +-
 webapp/WEB-INF/player.html                    | 65 ++++++++++++++++++-
 3 files changed, 71 insertions(+), 7 deletions(-)

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">
-    <video id="player" src="${movie_url}" class="center-block" controls="controls"></video>
+    <script type="text/javascript">
+        var video_data = ${json};
+
+        $(function(){
+            if (typeof(video_data.file) !== 'undefined') {
+                $('#player').attr('src', video_data.file);
+            } else if (typeof(video_data.playlist) !== 'undefined') {
+                $('#pl-season').removeClass('hide');
+                menu = $('#pl-season-menu');
+
+                menu.html('');
+                video_data.playlist.forEach(function(item, i){
+                    menu.append('<li><a data-tag="' + i + '" href="#" onclick="return false;">' + item.comment + '</a></li>');
+                });
+
+                ddBtn = $('#dropdownSeason');
+                smenu = $('#pl-serial-menu');
+                menu.find('a').bind('click', function(){
+                    ddBtn.html(this.text + '&nbsp;<span class="caret"></span>');
+
+                    $('#dropdownSerial').html('Serials&nbsp;<span class="caret"></span>');
+
+                    smenu.html('');
+                    video_data.playlist[this.attributes['data-tag'].value].playlist.forEach(function(item){
+                        smenu.append('<li><a data-file="' + item.file + '" href="#" onclick="return false;">' + item.comment + '</a></li>');
+                    });
+
+                    smenu.find('a').bind('click', function(){
+                        $('#dropdownSerial').html(this.text + '&nbsp;<span class="caret"></span>');
+                        $('#player').attr('src', this.attributes['data-file'].value);
+                    });
+
+                    $('#pl-serial').removeClass('hide');
+                });
+            }
+        });
+    </script>
+
+    <hr>
+
+    <div id="pl-season" class="dropdown hide" style="display: inline-block;">
+        <button class="btn btn-default dropdown-toggle" type="button" id="dropdownSeason" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+            Seasons
+            <span class="caret"></span>
+        </button>
+        <ul id="pl-season-menu" class="dropdown-menu" aria-labelledby="dropdownSeason">
+            <li><a href="#">Season</a></li>
+        </ul>
+    </div>
+
+    <div id="pl-serial" class="dropdown hide" style="display: inline-block;">
+        <button class="btn btn-default dropdown-toggle" type="button" id="dropdownSerial" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+            Serials
+            <span class="caret"></span>
+        </button>
+        <ul id="pl-serial-menu" class="dropdown-menu" aria-labelledby="dropdownSerial">
+            <li><a href="#">Serial</a></li>
+        </ul>
+    </div>
+
+    <br><br>
+
+    <video id="player" class="center-block" controls="controls"></video>
+    <br>
 <#include "/fother.inc.html">
\ No newline at end of file