Improve add view

objects/video.php

@@ -151,7 +151,7 @@ if (!class_exists('Video')) {
                 return false;
             }
             
-            $lastStatistic = self::getLastStatistics($this->id, User::getId());
+            $lastStatistic = VideoStatistic::getLastStatistics($this->id, User::getId());
             if(!empty($lastStatistic)){
                 return false;
             }

view/css/main.css

@@ -48,6 +48,12 @@ time.duration {
 .thumbsImageContainer .thumbsImage{
     border: none;
 }
+.thumbsImageContainer .progress{
+    height: 4px;
+    z-index: 1;
+    top: -4px;
+}
+}
 .videoLink .glyphicon-play-circle {
     transition: all 0.3s ease-in-out;
     top: 50%;

view/js/script.js

@@ -480,37 +480,45 @@ var last_videos_id = 0;
 var last_currentTime = -1;
 var videoViewAdded = false;
 var addViewBeaconTimeout;
+var _addViewCheck = false;
 function addView(videos_id, currentTime) {
     addViewSetCookie(PHPSESSID, videos_id, currentTime, seconds_watching_video);
+    if(_addViewCheck){
+        return false;
+    }
     if (last_videos_id == videos_id && last_currentTime == currentTime) {
         return false;
     }
-    if (currentTime > 5 && currentTime % 5 !== 0) { // only update each 5 seconds
+    if (currentTime > 5 && currentTime % 30 !== 0) { // only update each 30 seconds
         return false;
     }
-
-    if (!videoViewAdded || videoViewAdded !== videos_id) {
-        videoViewAdded = videos_id;
+    _addViewCheck = true;
     last_videos_id = videos_id;
     last_currentTime = currentTime;
-        _addView(videos_id, currentTime);
-    }
+    _addView(videos_id, currentTime, seconds_watching_video);
+    setTimeout(function () {
+        _addViewCheck = false
+    }, 1000);
     return true;
 }
 
-function _addView(videos_id, currentTime) {
+function _addView(videos_id, currentTime, seconds_watching_video) {
     if (typeof PHPSESSID == 'undefined') {
         PHPSESSID = '';
     }
     var url = webSiteRootURL + 'objects/videoAddViewCount.json.php';
+    if(empty(PHPSESSID)){
+        return false;
+    }
     url = addGetParam(url, 'PHPSESSID', PHPSESSID);
     //console.log('_addView', videos_id, currentTime);
     $.ajax({
         url: url,
         method: 'POST',
         data: {
-            'id': videos_id,
-            'currentTime': currentTime
+            id: videos_id,
+            currentTime: currentTime,
+            seconds_watching_video: seconds_watching_video
         },
         success: function (response) {
             $('.view-count' + videos_id).text(response.countHTML);
@@ -530,22 +538,10 @@ function _addViewAsync() {
     var url = webSiteRootURL + 'objects/videoAddViewCount.json.php';
     url = addGetParam(url, 'PHPSESSID', PHPSESSID);
     _addViewAsyncSent = true;
-    $.ajax({
-        url: url,
-        method: 'POST',
-        data: {
-            'id': mediaId,
-            'currentTime': playerCurrentTime,
-            'seconds_watching_video': seconds_watching_video
-        },
-        async: false,
-        success: function (response) {
-            //console.log('_addViewAsync', response);
+    _addView(mediaId, playerCurrentTime, seconds_watching_video);
     setTimeout(function () {
         _addViewAsyncSent = false;
     }, 2000);
-        }
-    });
 }
 
 var _addViewFromCookie_addingtime = false;
@@ -575,21 +571,12 @@ async function addViewFromCookie() {
         forceCurrentTime = addView_playerCurrentTime;
     }
     
-    $.ajax({
-        url: url,
-        method: 'POST',
-        data: {
-            'id': addView_videos_id,
-            'currentTime': addView_playerCurrentTime,
-            'seconds_watching_video': addView_seconds_watching_video
-        },
-        async: false,
-        success: function (response) {
+    _addView(addView_videos_id, addView_playerCurrentTime, addView_seconds_watching_video)
+    setTimeout(function () {
         _addViewFromCookie_addingtime = false;
-            //console.log('addViewFromCookie', response);
+    }, 2000);
     addViewSetCookie(false, false, false, false);
-        }
-    });
+
 }
 
 async function addViewSetCookie(PHPSESSID, videos_id, playerCurrentTime, seconds_watching_video) {
@@ -2744,7 +2731,7 @@ function addAtMention(selector) {
             });
 }
 /*
-async function selectAElements() {
+ async function selectAElements() {
  $("a").each(function () {
  var location = window.location.toString()
  var res = location.split("?");
@@ -2755,7 +2742,7 @@ async function selectAElements() {
  $(this).addClass("selected");
  }
  });
-}*/
+ }*/
 
 var hidePleaseWaitTimeout = {};
 var pleaseWaitIsINUse = {};
@@ -2937,7 +2924,7 @@ function openWindow(url) {
 }
 
 function openWindowWithPost(url, name, params, strWindowFeatures) {
-    if(empty(strWindowFeatures)){
+    if (empty(strWindowFeatures)) {
         strWindowFeatures = "directories=no,titlebar=no,toolbar=no,location=no,status=no,menubar=no,resizable=no,height=600,width=800";
     }
     var windowObject = window.open("about:blank", name, strWindowFeatures);
@@ -3275,19 +3262,19 @@ function notifyInputIfIsWrongFormat(_this, isValid) {
 }
 
 function setupMySQLInput(selector) {
-    if(typeof $(selector).inputmask !== 'function'){
-        addScript(webSiteRootURL+'node_modules/inputmask/dist/jquery.inputmask.min.js');
-        setTimeout(function(){
+    if (typeof $(selector).inputmask !== 'function') {
+        addScript(webSiteRootURL + 'node_modules/inputmask/dist/jquery.inputmask.min.js');
+        setTimeout(function () {
             setupMySQLInput(selector);
         }, 1000);
         return false;
     }
     $(selector).inputmask({
         mask: "9999-99-99 99:99:99",
-        onincomplete: function(buffer, opts) {
+        onincomplete: function (buffer, opts) {
             notifyInputIfIsWrongFormat($(this), false);
         },
-        oncomplete: function(buffer, opts) {
+        oncomplete: function (buffer, opts) {
             notifyInputIfIsWrongFormat($(this), true);
         }
     });
@@ -3394,7 +3381,7 @@ function arrayToTemplate(itemsArray, template) {
     return template;
 }
 /*
-function avideoLoadPage(url) {
+ function avideoLoadPage(url) {
  console.log('avideoLoadPage', url);
  avideoPushState(url);
  if (inMainIframe()) {
@@ -3402,9 +3389,9 @@ function avideoLoadPage(url) {
  } else {
  document.location = url;
  }
-}
+ }
  
-function avideoLoadPage3(url) {
+ function avideoLoadPage3(url) {
  console.log('avideoLoadPage3', url);
  avideoPushState(url);
  if (inMainIframe()) {
@@ -3439,9 +3426,9 @@ function avideoLoadPage3(url) {
  });
  }
  });
-}
+ }
  
-function avideoLoadPage2(url) {
+ function avideoLoadPage2(url) {
  console.log('avideoLoadPage', url);
  avideoPushState(url);
  modal.showPleaseWait();
@@ -3469,10 +3456,10 @@ function avideoLoadPage2(url) {
  });
  }
  });
-}
+ }
  
  
-async function aHrefToAjax() {
+ async function aHrefToAjax() {
  if(typeof useIframe === 'undefined' || !useIframe){
  return false;
  }
@@ -3489,9 +3476,9 @@ async function aHrefToAjax() {
  }
  }
  });
-}
+ }
  
-function addScripts(scriptsToAdd) {
+ function addScripts(scriptsToAdd) {
  var localScripts = $("script");
  for (index in scriptsToAdd) {
  var script = scriptsToAdd[index];
@@ -3520,7 +3507,7 @@ function addScripts(scriptsToAdd) {
  }
  }
  }
-}
+ }
  * */
 
 function addScript(src) {
@@ -3538,7 +3525,7 @@ function addScript(src) {
         if (!scriptFound) {
             console.log('addScript', src);
             $('<script src="' + src + '" type="text/javascript"></script>').appendTo(document.body);
-        }else{
+        } else {
             console.log('addScript already added ', src);
         }
     }