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

fix encoding progress bar

Browse source
This commit is contained in:
DanielnetoDotCom 2020-10-22 13:50:04 -03:00
parent b95c175827
commit 8344fea983
3 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

20
view/js/script.js
View file

@ -920,4 +920,24 @@ function isPlayingAds() {
function playerHasAds() { function playerHasAds() {
return ($("#mainVideo_ima-ad-container").length > 0); return ($("#mainVideo_ima-ad-container").length > 0);
}
function countTo(selector, total) {
current = parseInt($(selector).text());
total = parseInt(total);
if (!total || current >= total) {
$(selector).removeClass('loading');
return;
}
var rest = (total - current);
var step = parseInt(rest / 100);
if (step < 1) {
step = 1;
}
current += step;
$(selector).text(current);
var timeout = (500 / rest);
setTimeout(function () {
countTo(selector, total);
}, timeout);
} }

8
view/managerVideos_body.php
View file

@ -817,9 +817,11 @@ if (empty($advancedCustomUser->userCanNotChangeUserGroup) || User::isAdmin()) {
if (response.download_status && !response.encoding_status.progress) { if (response.download_status && !response.encoding_status.progress) {
$("#encodingProgress" + id).find('.progress-completed').html("<strong>" + response.encoding.name + " [Downloading ...] </strong> " + response.download_status.progress + '%'); $("#encodingProgress" + id).find('.progress-completed').html("<strong>" + response.encoding.name + " [Downloading ...] </strong> " + response.download_status.progress + '%');
} else { } else {
$("#encodingProgress" + id).find('.progress-completed').html("<strong>" + response.encoding.name + "[" + response.encoding_status.from + " to " + response.encoding_status.to + "] </strong> " + response.encoding_status.progress + '%'); $("#encodingProgress" + id).find('.progress-completed').html("<strong>" + response.encoding.name + "[" + response.encoding_status.from + " to " + response.encoding_status.to + "] </strong> <span id='encodingProgressCounter" + id +">0</span>%");
$("#encodingProgress" + id).find('.progress-bar').css({'width': response.encoding_status.progress + '%'}); $("#encodingProgress" + id).find('.progress-bar').css({'width': response.encoding_status.progress + '%'});
$("#encodingProgressComplete" + id).text(response.encoding_status.progress + '%'); //$("#encodingProgressComplete" + id).text(response.encoding_status.progress + '%');
countTo("#encodingProgressComplete" + id, response.encoding_status.progress);
countTo("#encodingProgressCounter" + id, response.encoding_status.progress);
} }
if (response.download_status) { if (response.download_status) {
$("#downloadProgress" + id).find('.progress-bar').css({'width': response.download_status.progress + '%'}); $("#downloadProgress" + id).find('.progress-bar').css({'width': response.download_status.progress + '%'});
@ -1327,7 +1329,7 @@ echo AVideoPlugin::getManagerVideosReset();
return false; return false;
} }
var item = '<div class="progress progress-striped active " id="encodingProgress' + id + '" style="margin: 0;border-bottom-right-radius: 0; border-bottom-left-radius: 0;">'; var item = '<div class="progress progress-striped active " id="encodingProgress' + id + '" style="margin: 0;border-bottom-right-radius: 0; border-bottom-left-radius: 0;">';
item += '<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0; animation-duration: 15s;animation: 15s;transition-duration: 15s; "><span id="encodingProgressComplete' + id + '">0% </span>Complete</div>'; item += '<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0; animation-duration: 15s;animation: 15s;transition-duration: 15s; "><span id="encodingProgressComplete' + id + '">0</span>% Complete</div>';
item += '<span class="progress-type"><span class="badge "><?php echo __("Queue Position"); ?> ' + position + '</span></span><span class="progress-completed">' + queueItem.name + '</span>'; item += '<span class="progress-type"><span class="badge "><?php echo __("Queue Position"); ?> ' + position + '</span></span><span class="progress-completed">' + queueItem.name + '</span>';
item += '</div><div class="progress progress-striped active " id="downloadProgress' + id + '" style="height: 10px; border-top-right-radius: 0; border-top-left-radius: 0;"><div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0;"></div></div> '; item += '</div><div class="progress progress-striped active " id="downloadProgress' + id + '" style="height: 10px; border-top-right-radius: 0; border-top-left-radius: 0;"><div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0;"></div></div> ';
$('#encodeProgress' + id).html(item); $('#encodeProgress' + id).html(item);

20
view/report0.php
View file

@ -262,26 +262,6 @@
</div> </div>
<script> <script>
function countTo(selector, total) {
current = parseInt($(selector).text());
total = parseInt(total);
if (!total || current >= total) {
$(selector).removeClass('loading');
return;
}
var rest = (total - current);
var step = parseInt(rest / 100);
if (step < 1) {
step = 1;
}
current += step;
$(selector).text(current);
var timeout = (500 / rest);
setTimeout(function () {
countTo(selector, total);
}, timeout);
}
var ctx = document.getElementById("myChart"); var ctx = document.getElementById("myChart");
var ctxPie = document.getElementById("myChartPie"); var ctxPie = document.getElementById("myChartPie");
var ctxLine = document.getElementById("myChartLine"); var ctxLine = document.getElementById("myChartLine");