yetangitu/Oinktube
1
0
Fork 0
mirror of https://github.com/DanielnetoDotCom/YouPHPTube synced 2025-10-03 17:59:55 +02:00
Code Issues Releases Wiki Activity

Improve add view

Browse source
This commit is contained in:
DanieL 2022-10-03 12:50:23 -03:00
parent 6fe8b6a64f
commit d9a3c9a9bf
3 changed files with 185 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

2
objects/video.php
View file

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

6
view/css/main.css
View file

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

351
view/js/script.js
View file

@ -480,37 +480,45 @@ var last_videos_id = 0;
var last_currentTime = -1; var last_currentTime = -1;
var videoViewAdded = false; var videoViewAdded = false;
var addViewBeaconTimeout; var addViewBeaconTimeout;
var _addViewCheck = false;
function addView(videos_id, currentTime) { function addView(videos_id, currentTime) {
addViewSetCookie(PHPSESSID, videos_id, currentTime, seconds_watching_video); addViewSetCookie(PHPSESSID, videos_id, currentTime, seconds_watching_video);
if(_addViewCheck){
return false;
}
if (last_videos_id == videos_id && last_currentTime == currentTime) { if (last_videos_id == videos_id && last_currentTime == currentTime) {
return false; 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; return false;
} }
_addViewCheck = true;
if (!videoViewAdded || videoViewAdded !== videos_id) { last_videos_id = videos_id;
videoViewAdded = videos_id; last_currentTime = currentTime;
last_videos_id = videos_id; _addView(videos_id, currentTime, seconds_watching_video);
last_currentTime = currentTime; setTimeout(function () {
_addView(videos_id, currentTime); _addViewCheck = false
} }, 1000);
return true; return true;
} }
function _addView(videos_id, currentTime) { function _addView(videos_id, currentTime, seconds_watching_video) {
if (typeof PHPSESSID == 'undefined') { if (typeof PHPSESSID == 'undefined') {
PHPSESSID = ''; PHPSESSID = '';
} }
var url = webSiteRootURL + 'objects/videoAddViewCount.json.php'; var url = webSiteRootURL + 'objects/videoAddViewCount.json.php';
if(empty(PHPSESSID)){
return false;
}
url = addGetParam(url, 'PHPSESSID', PHPSESSID); url = addGetParam(url, 'PHPSESSID', PHPSESSID);
//console.log('_addView', videos_id, currentTime); //console.log('_addView', videos_id, currentTime);
$.ajax({ $.ajax({
url: url, url: url,
method: 'POST', method: 'POST',
data: { data: {
'id': videos_id, id: videos_id,
'currentTime': currentTime currentTime: currentTime,
seconds_watching_video: seconds_watching_video
}, },
success: function (response) { success: function (response) {
$('.view-count' + videos_id).text(response.countHTML); $('.view-count' + videos_id).text(response.countHTML);
@ -530,22 +538,10 @@ function _addViewAsync() {
var url = webSiteRootURL + 'objects/videoAddViewCount.json.php'; var url = webSiteRootURL + 'objects/videoAddViewCount.json.php';
url = addGetParam(url, 'PHPSESSID', PHPSESSID); url = addGetParam(url, 'PHPSESSID', PHPSESSID);
_addViewAsyncSent = true; _addViewAsyncSent = true;
$.ajax({ _addView(mediaId, playerCurrentTime, seconds_watching_video);
url: url, setTimeout(function () {
method: 'POST', _addViewAsyncSent = false;
data: { }, 2000);
'id': mediaId,
'currentTime': playerCurrentTime,
'seconds_watching_video': seconds_watching_video
},
async: false,
success: function (response) {
//console.log('_addViewAsync', response);
setTimeout(function () {
_addViewAsyncSent = false;
}, 2000);
}
});
} }
var _addViewFromCookie_addingtime = false; var _addViewFromCookie_addingtime = false;
@ -575,21 +571,12 @@ async function addViewFromCookie() {
forceCurrentTime = addView_playerCurrentTime; forceCurrentTime = addView_playerCurrentTime;
} }
$.ajax({ _addView(addView_videos_id, addView_playerCurrentTime, addView_seconds_watching_video)
url: url, setTimeout(function () {
method: 'POST', _addViewFromCookie_addingtime = false;
data: { }, 2000);
'id': addView_videos_id, addViewSetCookie(false, false, false, false);
'currentTime': addView_playerCurrentTime,
'seconds_watching_video': addView_seconds_watching_video
},
async: false,
success: function (response) {
_addViewFromCookie_addingtime = false;
//console.log('addViewFromCookie', response);
addViewSetCookie(false, false, false, false);
}
});
} }
async function addViewSetCookie(PHPSESSID, videos_id, playerCurrentTime, seconds_watching_video) { async function addViewSetCookie(PHPSESSID, videos_id, playerCurrentTime, seconds_watching_video) {
@ -2744,18 +2731,18 @@ function addAtMention(selector) {
}); });
} }
/* /*
async function selectAElements() { async function selectAElements() {
$("a").each(function () { $("a").each(function () {
var location = window.location.toString() var location = window.location.toString()
var res = location.split("?"); var res = location.split("?");
pathWitoutGet = res[0]; pathWitoutGet = res[0];
if ($(this).attr("href") == window.location.pathname if ($(this).attr("href") == window.location.pathname
|| $(this).attr("href") == window.location || $(this).attr("href") == window.location
|| $(this).attr("href") == pathWitoutGet) { || $(this).attr("href") == pathWitoutGet) {
$(this).addClass("selected"); $(this).addClass("selected");
} }
}); });
}*/ }*/
var hidePleaseWaitTimeout = {}; var hidePleaseWaitTimeout = {};
var pleaseWaitIsINUse = {}; var pleaseWaitIsINUse = {};
@ -2937,7 +2924,7 @@ function openWindow(url) {
} }
function openWindowWithPost(url, name, params, strWindowFeatures) { 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"; 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); var windowObject = window.open("about:blank", name, strWindowFeatures);
@ -3275,20 +3262,20 @@ function notifyInputIfIsWrongFormat(_this, isValid) {
} }
function setupMySQLInput(selector) { function setupMySQLInput(selector) {
if(typeof $(selector).inputmask !== 'function'){ if (typeof $(selector).inputmask !== 'function') {
addScript(webSiteRootURL+'node_modules/inputmask/dist/jquery.inputmask.min.js'); addScript(webSiteRootURL + 'node_modules/inputmask/dist/jquery.inputmask.min.js');
setTimeout(function(){ setTimeout(function () {
setupMySQLInput(selector); setupMySQLInput(selector);
}, 1000); }, 1000);
return false; return false;
} }
$(selector).inputmask({ $(selector).inputmask({
mask: "9999-99-99 99:99:99", mask: "9999-99-99 99:99:99",
onincomplete: function(buffer, opts) { onincomplete: function (buffer, opts) {
notifyInputIfIsWrongFormat($(this), false); notifyInputIfIsWrongFormat($(this), false);
}, },
oncomplete: function(buffer, opts) { oncomplete: function (buffer, opts) {
notifyInputIfIsWrongFormat($(this), true); notifyInputIfIsWrongFormat($(this), true);
} }
}); });
} }
@ -3394,133 +3381,133 @@ function arrayToTemplate(itemsArray, template) {
return template; return template;
} }
/* /*
function avideoLoadPage(url) { function avideoLoadPage(url) {
console.log('avideoLoadPage', url); console.log('avideoLoadPage', url);
avideoPushState(url); avideoPushState(url);
if (inMainIframe()) { if (inMainIframe()) {
parent.avideoLoadPage(url); parent.avideoLoadPage(url);
} else { } else {
document.location = url; document.location = url;
} }
} }
function avideoLoadPage3(url) { function avideoLoadPage3(url) {
console.log('avideoLoadPage3', url); console.log('avideoLoadPage3', url);
avideoPushState(url); avideoPushState(url);
if (inMainIframe()) { if (inMainIframe()) {
parent.modal.showPleaseWait(); parent.modal.showPleaseWait();
} else { } else {
modal.showPleaseWait(); modal.showPleaseWait();
} }
$.ajax({ $.ajax({
url: url, url: url,
success: function (data) { success: function (data) {
var parser = new DOMParser(); var parser = new DOMParser();
var htmlDoc = parser.parseFromString(data, "text/html"); var htmlDoc = parser.parseFromString(data, "text/html");
$('body').fadeOut('fast', function () { $('body').fadeOut('fast', function () {
var head = $(htmlDoc).find('head'); var head = $(htmlDoc).find('head');
$('head').html(head.html()); $('head').html(head.html());
var selector = 'body > .container-fluid, body > .container'; var selector = 'body > .container-fluid, body > .container';
var container = $(htmlDoc).find(selector).html(); var container = $(htmlDoc).find(selector).html();
$(selector).html(container); $(selector).html(container);
var scriptsToAdd = $(htmlDoc).find('body script'); var scriptsToAdd = $(htmlDoc).find('body script');
addScripts(scriptsToAdd); addScripts(scriptsToAdd);
var footerCode = $(htmlDoc).find('#pluginFooterCode').html(); var footerCode = $(htmlDoc).find('#pluginFooterCode').html();
$('#pluginFooterCode').html(footerCode); $('#pluginFooterCode').html(footerCode);
$('body').fadeIn('fast', function () { $('body').fadeIn('fast', function () {
if (inMainIframe()) { if (inMainIframe()) {
parent.modal.hidePleaseWait(); parent.modal.hidePleaseWait();
parent.updatePageFromIframe(); parent.updatePageFromIframe();
} else { } else {
modal.hidePleaseWait(); modal.hidePleaseWait();
} }
//aHrefToAjax(); //aHrefToAjax();
}); });
}); });
} }
}); });
} }
function avideoLoadPage2(url) { function avideoLoadPage2(url) {
console.log('avideoLoadPage', url); console.log('avideoLoadPage', url);
avideoPushState(url); avideoPushState(url);
modal.showPleaseWait(); modal.showPleaseWait();
$.ajax({ $.ajax({
url: url, url: url,
success: function (data) { success: function (data) {
var parser = new DOMParser(); var parser = new DOMParser();
var htmlDoc = parser.parseFromString(data, "text/html"); var htmlDoc = parser.parseFromString(data, "text/html");
$('body').fadeOut('fast', function () { $('body').fadeOut('fast', function () {
var bodyElement = $(htmlDoc).find('body'); var bodyElement = $(htmlDoc).find('body');
var head = $(htmlDoc).find('head').html(); var head = $(htmlDoc).find('head').html();
var body = bodyElement.html(); var body = bodyElement.html();
var _class = bodyElement.attr('class'); var _class = bodyElement.attr('class');
var id = bodyElement.attr('id'); var id = bodyElement.attr('id');
var style = bodyElement.attr('style'); var style = bodyElement.attr('style');
$('head').html(head); $('head').html(head);
$('body').attr('class', _class); $('body').attr('class', _class);
$('body').attr('id', id); $('body').attr('id', id);
$('body').attr('style', style); $('body').attr('style', style);
$('body').html(body); $('body').html(body);
$('#pluginFooterCode').fadeIn('slow', function () { $('#pluginFooterCode').fadeIn('slow', function () {
modal.hidePleaseWait(); modal.hidePleaseWait();
}); });
}); });
} }
}); });
} }
async function aHrefToAjax() { async function aHrefToAjax() {
if(typeof useIframe === 'undefined' || !useIframe){ if(typeof useIframe === 'undefined' || !useIframe){
return false; return false;
} }
$('a.aHrefToAjax').off('click'); $('a.aHrefToAjax').off('click');
$('a').click(function (evt) { $('a').click(function (evt) {
var target = $(this).attr('target'); var target = $(this).attr('target');
$(this).addClass('aHrefToAjax'); $(this).addClass('aHrefToAjax');
if (empty(target)) { if (empty(target)) {
var url = $(this).attr('href'); var url = $(this).attr('href');
if (isValidURL(url)) { if (isValidURL(url)) {
evt.preventDefault(); evt.preventDefault();
avideoLoadPage(url); avideoLoadPage(url);
return false; return false;
} }
} }
}); });
} }
function addScripts(scriptsToAdd) { function addScripts(scriptsToAdd) {
var localScripts = $("script"); var localScripts = $("script");
for (index in scriptsToAdd) { for (index in scriptsToAdd) {
var script = scriptsToAdd[index]; var script = scriptsToAdd[index];
if (typeof script === 'object') { if (typeof script === 'object') {
var src = $(script).attr('src'); var src = $(script).attr('src');
console.log(typeof script, typeof $(script)); console.log(typeof script, typeof $(script));
if (empty(src)) { if (empty(src)) {
try { try {
$('body').append(script); $('body').append(script);
} catch (e) { } catch (e) {
} }
} else { } else {
var scriptFound = false; var scriptFound = false;
localScripts.each(function () { localScripts.each(function () {
var _src = $(this).attr('src'); var _src = $(this).attr('src');
if (src === _src) { if (src === _src) {
scriptFound = true; scriptFound = true;
return false; return false;
} }
}); });
if (!scriptFound) { if (!scriptFound) {
$('<script src="' + src + '" type="text/javascript"></script>').appendTo(document.body); $('<script src="' + src + '" type="text/javascript"></script>').appendTo(document.body);
} }
} }
} }
} }
} }
* */ * */
function addScript(src) { function addScript(src) {
@ -3538,7 +3525,7 @@ function addScript(src) {
if (!scriptFound) { if (!scriptFound) {
console.log('addScript', src); console.log('addScript', src);
$('<script src="' + src + '" type="text/javascript"></script>').appendTo(document.body); $('<script src="' + src + '" type="text/javascript"></script>').appendTo(document.body);
}else{ } else {
console.log('addScript already added ', src); console.log('addScript already added ', src);
} }
} }