From 51c4d8208bbd82635fd8d9a5bf50fe51643869ab Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Wed, 30 Mar 2016 09:24:12 +0300
Subject: [PATCH 1/6] =?UTF-8?q?onlinelife:=D0=B2=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=81=D0=B5=D1=80=D0=B8=D0=B0=D0=BB=D1=8B?=
 =?UTF-8?q?=20=D0=B2=20=D0=BF=D0=BB=D0=B5=D0=B5=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

эксперементально
---
 .../java/kinosearch/core/warez/Onlinelife.java    | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/main/java/kinosearch/core/warez/Onlinelife.java b/src/main/java/kinosearch/core/warez/Onlinelife.java
index f2ef435..d0f1233 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("-"));

From ea05db05329253628f28a3e31ef3ba84436b4f36 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Wed, 30 Mar 2016 12:00:46 +0300
Subject: [PATCH 2/6] =?UTF-8?q?=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD=D0=B5=D0=B3=D0=BE?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D1=81=D0=BC=D0=BE=D1=82=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webapp/WEB-INF/player.html       | 73 ++++++++++++++++++++++++++++++--
 webapp/js/js.cookie-2.1.0.min.js |  2 +
 2 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 webapp/js/js.cookie-2.1.0.min.js

diff --git a/webapp/WEB-INF/player.html b/webapp/WEB-INF/player.html
index ce854de..852a7ab 100644
--- a/webapp/WEB-INF/player.html
+++ b/webapp/WEB-INF/player.html
@@ -1,10 +1,33 @@
 <#include "/header.inc.html">
+    <script type="text/javascript" src="${basedir}/js/js.cookie-2.1.0.min.js"></script>
     <script type="text/javascript">
         var video_data = ${json};
+        var player;
+        var videotime = 0;
+
+        function msToTime(ms) {
+            function addZ(n) { return (n<10? '0':'') + n; }
+
+            var _ms = ms % 1000;
+            ms = (ms - _ms) / 1000;
+            var _sec = ms % 60;
+            ms = (ms - _sec) / 60;
+            var _min = ms % 60;
+            var _hr = (ms - _min) / 60;
+
+            return {
+                's': addZ(_sec),
+                'm': addZ(_min),
+                'h': addZ(_hr)
+            };
+        }
 
         $(function(){
+            player = $('#player');
+
+            // set video
             if (typeof(video_data.file) !== 'undefined') {
-                $('#player').attr('src', '${basedir}'+video_data.file);
+                player.attr('src', '${basedir}'+video_data.file);
             } else if (typeof(video_data.playlist) !== 'undefined') {
                 $('#pl-season').removeClass('hide');
                 menu = $('#pl-season-menu');
@@ -28,15 +51,59 @@
 
                     smenu.find('a').bind('click', function(){
                         $('#dropdownSerial').html(this.text + '&nbsp;<span class="caret"></span>');
-                        $('#player').attr('src', '${basedir}'+this.attributes['data-file'].value);
+                        player.attr('src', '${basedir}'+this.attributes['data-file'].value);
                     });
 
                     $('#pl-serial').removeClass('hide');
                 });
             }
+
+            // save video time
+            var path = window.location.pathname.substr("${basedir}".length);
+            var data = Cookies.getJSON(path);
+            if (data != null) {
+                videotime = data.time;
+                var fulltime = msToTime(videotime * 1000);
+                $('#mdl-vtime').text(fulltime.h + ':' + fulltime.m + ':' + fulltime.s);
+                $('#modal').modal('show');
+            } else {
+                player.load();
+            }
+
+            var tl;
+            player.bind('play', function(){
+                tl = $.now();
+            });
+            player.bind('timeupdate', function(){
+                var tc = $.now();
+                var sec = Math.floor((tc-tl)/1000);
+                if (sec >= 5) {
+                    Cookies.set(path, {time:player[0].currentTime});
+                    tl = tc;
+                }
+            });
         });
+
+        function continueVideo() {
+            player[0].currentTime = videotime;
+            player[0].load();
+        }
     </script>
 
+    <div class="modal fade" tabindex="-1" role="dialog" id="modal">
+        <div class="modal-dialog modal-sm">
+            <div class="modal-content">
+                <div class="modal-body">
+                    <p class="text-center">Продолжить просмотр с <span id="mdl-vtime"></span>?</p>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="continueVideo()">Да</button>
+                    <button type="button" class="btn btn-default" data-dismiss="modal" onclick="player[0].load()">Нет</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <hr>
 
     <div id="pl-season" class="dropdown hide" style="display: inline-block;">
@@ -61,6 +128,6 @@
 
     <br><br>
 
-    <video id="player" class="center-block" controls="controls"></video>
+    <video id="player" class="center-block" controls="controls" preload="none"></video>
     <br>
 <#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={};a<arguments.length;a++){var c=arguments[a];for(var d in c)b[d]=c[d]}return b}function b(c){function d(b,e,f){var g;if(arguments.length>1){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<j.length;l++){var m=j[l].split("="),n=m[0].replace(k,decodeURIComponent),o=m.slice(1).join("=");'"'===o.charAt(0)&&(o=o.slice(1,-1));try{if(o=c.read?c.read(o,n):c(o,n)||o.replace(k,decodeURIComponent),this.json)try{o=JSON.parse(o)}catch(i){}if(b===n){g=o;break}b||(g[n]=o)}catch(i){}}return g}return d.get=d.set=d,d.getJSON=function(){return d.apply({json:!0},[].slice.call(arguments))},d.defaults={},d.remove=function(b,c){d(b,"",a(c,{expires:-1}))},d.withConverter=b,d}return b(function(){})});
\ No newline at end of file

From f7ab3476c6b878db98ae126ecaf284e0d84e8bd9 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Wed, 30 Mar 2016 13:00:52 +0300
Subject: [PATCH 3/6] =?UTF-8?q?=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=B2=D0=B8=D0=B4=D0=B5=D0=BE=20=D0=B2=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BA=D0=B5=20=D0=B8=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=B4=20=D0=BF=D0=BB=D0=B5=D0=B5=D1=80=D0=BE=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kinosearch/core/warez/Onlinelife.java     |  3 ++-
 webapp/WEB-INF/player.html                    | 21 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/kinosearch/core/warez/Onlinelife.java b/src/main/java/kinosearch/core/warez/Onlinelife.java
index d0f1233..941d419 100644
--- a/src/main/java/kinosearch/core/warez/Onlinelife.java
+++ b/src/main/java/kinosearch/core/warez/Onlinelife.java
@@ -89,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/player.html b/webapp/WEB-INF/player.html
index 852a7ab..10c1690 100644
--- a/webapp/WEB-INF/player.html
+++ b/webapp/WEB-INF/player.html
@@ -4,6 +4,7 @@
         var video_data = ${json};
         var player;
         var videotime = 0;
+        var origDocTitle;
 
         function msToTime(ms) {
             function addZ(n) { return (n<10? '0':'') + n; }
@@ -22,12 +23,25 @@
             };
         }
 
+        function setTitle(text) {
+            document.title = text + " :: " + origDocTitle;
+            $('#title').text(text);
+            $('#title').show();
+        }
+
         $(function(){
             player = $('#player');
+            origDocTitle = document.title;
+            if (typeof(video_data.title) !== 'undefined') {
+                setTitle(video_data.title);
+            } else {
+                $('#title').hide();
+            }
 
             // set video
             if (typeof(video_data.file) !== 'undefined') {
                 player.attr('src', '${basedir}'+video_data.file);
+                $('#plbr').hide();
             } else if (typeof(video_data.playlist) !== 'undefined') {
                 $('#pl-season').removeClass('hide');
                 menu = $('#pl-season-menu');
@@ -52,6 +66,7 @@
                     smenu.find('a').bind('click', function(){
                         $('#dropdownSerial').html(this.text + '&nbsp;<span class="caret"></span>');
                         player.attr('src', '${basedir}'+this.attributes['data-file'].value);
+                        setTitle(this.text);
                     });
 
                     $('#pl-serial').removeClass('hide');
@@ -126,7 +141,11 @@
         </ul>
     </div>
 
-    <br><br>
+    <br id="plbr">
+
+    <h2 id="title"></h2>
+
+    <br>
 
     <video id="player" class="center-block" controls="controls" preload="none"></video>
     <br>

From 3d62c5a18554899d56a8cefe18a18f41de65879a Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Wed, 30 Mar 2016 13:03:10 +0300
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=B4=D0=B5=D0=BE=20=D0=B8=D0=B4=D0=B5=D1=82=20=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8C=D1=88=D0=B5=2010=20=D1=81=D0=B5=D0=BA,=20?=
 =?UTF-8?q?=D0=BD=D0=B5=20=D0=B7=D0=B0=D0=BF=D0=BE=D0=BC=D0=B8=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=82=D1=8C=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webapp/WEB-INF/player.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/WEB-INF/player.html b/webapp/WEB-INF/player.html
index 10c1690..10b9498 100644
--- a/webapp/WEB-INF/player.html
+++ b/webapp/WEB-INF/player.html
@@ -93,6 +93,7 @@
                 var tc = $.now();
                 var sec = Math.floor((tc-tl)/1000);
                 if (sec >= 5) {
+                    if (Math.floor(player[0].currentTime) <= 10) return;
                     Cookies.set(path, {time:player[0].currentTime});
                     tl = tc;
                 }

From 990c2cb2684fa37a0a9b36fd106014276629c3e0 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Wed, 30 Mar 2016 14:23:46 +0300
Subject: [PATCH 5/6] =?UTF-8?q?=D0=B2=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D1=81=D0=BC=D0=BE=D1=82=D1=80=D0=B0=20=D1=81=D0=B5=D1=80=D0=B8?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

восстанавливается сезон, серия и время
---
 webapp/WEB-INF/player.html | 96 ++++++++++++++++++++++++++------------
 1 file changed, 66 insertions(+), 30 deletions(-)

diff --git a/webapp/WEB-INF/player.html b/webapp/WEB-INF/player.html
index 10b9498..f985626 100644
--- a/webapp/WEB-INF/player.html
+++ b/webapp/WEB-INF/player.html
@@ -3,8 +3,8 @@
     <script type="text/javascript">
         var video_data = ${json};
         var player;
-        var videotime = 0;
         var origDocTitle;
+        var isSerial = false;
 
         function msToTime(ms) {
             function addZ(n) { return (n<10? '0':'') + n; }
@@ -29,6 +29,41 @@
             $('#title').show();
         }
 
+        function setSeason(idx) {
+            var season_title = video_data.playlist[idx].comment;
+            $('#dropdownSeason').html(season_title + '&nbsp;<span class="caret"></span>');
+            $('#dropdownSerial').html('Serials&nbsp;<span class="caret"></span>');
+
+            var serial_menu = $('#pl-serial-menu');
+            serial_menu.html('');
+            video_data.playlist[idx].playlist.forEach(function(item, i){
+                serial_menu.append('<li><a data-file="' + item.file + '" data-season="' + idx + '" href="#" onclick="setSerial('+ idx + ',' + i + ');return false;">' + item.comment + '</a></li>');
+            });
+
+            /*
+            serial_menu.find('a').bind('click', function(){
+                $('#dropdownSerial').html(this.text + '&nbsp;<span class="caret"></span>');
+                player.attr('src', '${basedir}'+this.attributes['data-file'].value);
+                player.attr('data-season', this.attributes['data-season'].value);
+                player.attr('data-serial', this.attributes['data-serial'].value);
+                setTitle(this.text);
+            });
+            */
+
+            $('#pl-serial').removeClass('hide');
+        }
+
+        function setSerial(idx, sidx) {
+            var serial_title = video_data.playlist[idx].playlist[sidx].comment;
+            $('#dropdownSerial').html(serial_title + '&nbsp;<span class="caret"></span>');
+
+            var serial_file = video_data.playlist[idx].playlist[sidx].file;
+            player.attr('src', '${basedir}' + serial_file);
+            player.attr('data-season', idx);
+            player.attr('data-serial', sidx);
+            setTitle(serial_title);
+        }
+
         $(function(){
             player = $('#player');
             origDocTitle = document.title;
@@ -43,48 +78,32 @@
                 player.attr('src', '${basedir}'+video_data.file);
                 $('#plbr').hide();
             } else if (typeof(video_data.playlist) !== 'undefined') {
+                isSerial = true;
                 $('#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', '${basedir}'+this.attributes['data-file'].value);
-                        setTitle(this.text);
-                    });
-
-                    $('#pl-serial').removeClass('hide');
+                    menu.append('<li><a data-tag="' + i + '" href="#" onclick="setSeason(' + i + ');return false;">' + item.comment + '</a></li>');
                 });
             }
 
-            // save video time
+            // load video time
             var path = window.location.pathname.substr("${basedir}".length);
-            var data = Cookies.getJSON(path);
+            data = Cookies.getJSON(path);
             if (data != null) {
-                videotime = data.time;
-                var fulltime = msToTime(videotime * 1000);
+                var fulltime = msToTime(data.time * 1000);
                 $('#mdl-vtime').text(fulltime.h + ':' + fulltime.m + ':' + fulltime.s);
+                if (isSerial) {
+                    $('#mdl-season').text(data.season + 1);
+                    $('#mdl-serial').text(data.serial + 1);
+                }
                 $('#modal').modal('show');
             } else {
                 player.load();
             }
 
+            // save video time
             var tl;
             player.bind('play', function(){
                 tl = $.now();
@@ -94,14 +113,24 @@
                 var sec = Math.floor((tc-tl)/1000);
                 if (sec >= 5) {
                     if (Math.floor(player[0].currentTime) <= 10) return;
-                    Cookies.set(path, {time:player[0].currentTime});
+                    save_data = {time:player[0].currentTime};
+                    if (isSerial) {
+                        save_data.season = parseInt(player.attr('data-season'), 10);
+                        save_data.serial = parseInt(player.attr('data-serial'), 10);
+                    }
+                    Cookies.set(path, save_data);
                     tl = tc;
+                    console.debug(save_data);
                 }
             });
         });
 
         function continueVideo() {
-            player[0].currentTime = videotime;
+            if (isSerial) {
+                setSeason(data.season);
+                setSerial(data.season, data.serial);
+            }
+            player[0].currentTime = data.time;
             player[0].load();
         }
     </script>
@@ -109,8 +138,15 @@
     <div class="modal fade" tabindex="-1" role="dialog" id="modal">
         <div class="modal-dialog modal-sm">
             <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title">Продолжить просмотр?</h4>
+                </div>
                 <div class="modal-body">
-                    <p class="text-center">Продолжить просмотр с <span id="mdl-vtime"></span>?</p>
+                        <b>Время:</b> <span id="mdl-vtime"></span>
+                        <div id="mdl-blk-serial">
+                            <b>Сезон:</b> <span id="mdl-season"></span><br>
+                            <b>Серия:</b> <span id="mdl-serial"></span>
+                        </div>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="continueVideo()">Да</button>

From 4270049413f24e4c67a9a9686ee24f873e243dc3 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Wed, 30 Mar 2016 15:31:30 +0300
Subject: [PATCH 6/6] update news

---
 webapp/WEB-INF/news.inc.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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 @@
 <div class="news row">
+    <div class="col-sm-2">
+        <time datetime="2016-03-30">30.03.2016</time>
+    </div>
+    <div class="col-sm-10">
+        <p><em>Version 2.0.7c</em></p>
+        <ul>
+            <li>[эксперементально] плеер воспроизводит сериалы</li>
+            <li>возможность продолжить просмотр с сохранённой позиции</li>
+            <li>название фильма/серии над плеером</li>
+        </ul>
+    </div>
+
     <div class="col-sm-2">
         <time datetime="2016-03-26">26.03.2016</time>
     </div>