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

update

Browse source
This commit is contained in:
Daniel Neto 2023-02-27 15:37:33 -03:00
parent d545f864ac
commit b1048c7827
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
view/js/script.js
View file

@ -2389,15 +2389,17 @@ function goToURLOrAlertError(jsonURL, data) {
}); });
} }
var downloadModal = getPleaseWait();
function downloadURL(url, filename) { function downloadURL(url, filename) {
modal.showPleaseWait();
downloadModal.showPleaseWait();
filename = clean_name(filename) + '.' + clean_name(url.split(/[#?]/)[0].split('.').pop().trim()); filename = clean_name(filename) + '.' + clean_name(url.split(/[#?]/)[0].split('.').pop().trim());
console.log('downloadURL start ', url, filename); console.log('downloadURL start ', url, filename);
var loaded = 0; var loaded = 0;
var contentLength = 0; var contentLength = 0;
fetch(url) fetch(url)
.then(response => { .then(response => {
modal.hidePleaseWait(); downloadModal.hidePleaseWait();
avideoToastSuccess('Download Start'); avideoToastSuccess('Download Start');
const contentEncoding = response.headers.get('content-encoding'); const contentEncoding = response.headers.get('content-encoding');
const contentLength = response.headers.get(contentEncoding ? 'x-file-size' : 'content-length'); const contentLength = response.headers.get(contentEncoding ? 'x-file-size' : 'content-length');
@ -2421,8 +2423,8 @@ function downloadURL(url, filename) {
loaded += value.byteLength; loaded += value.byteLength;
var percentageLoaded = Math.round(loaded / total * 100); var percentageLoaded = Math.round(loaded / total * 100);
////console.log(percentageLoaded); ////console.log(percentageLoaded);
modal.setProgress(percentageLoaded); downloadModal.setProgress(percentageLoaded);
modal.setText('Downloading ... ' + percentageLoaded + '%'); downloadModal.setText('Downloading ... ' + percentageLoaded + '%');
controller.enqueue(value); controller.enqueue(value);
read(); read();
}).catch(error => { }).catch(error => {
@ -2446,7 +2448,7 @@ function downloadURL(url, filename) {
document.body.appendChild(a); document.body.appendChild(a);
a.click(); a.click();
window.URL.revokeObjectURL(url); window.URL.revokeObjectURL(url);
modal.hidePleaseWait(); downloadModal.hidePleaseWait();
avideoToastSuccess('Download complete ' + filename); avideoToastSuccess('Download complete ' + filename);
}) })
.catch(function (err) { .catch(function (err) {
@ -2459,12 +2461,13 @@ function downloadURL(url, filename) {
} }
var downloadURLOrAlertErrorInterval; var downloadURLOrAlertErrorInterval;
var downloadURLOrAlertModal = getPleaseWait();
function downloadURLOrAlertError(jsonURL, data, filename, FFMpegProgress) { function downloadURLOrAlertError(jsonURL, data, filename, FFMpegProgress) {
if (empty(jsonURL)) { if (empty(jsonURL)) {
console.log('downloadURLOrAlertError error empty jsonURL', jsonURL, data, filename, FFMpegProgress); console.log('downloadURLOrAlertError error empty jsonURL', jsonURL, data, filename, FFMpegProgress);
return false; return false;
} }
modal.showPleaseWait(); downloadURLOrAlertModal.showPleaseWait();
avideoToastInfo('Converting'); avideoToastInfo('Converting');
console.log('downloadURLOrAlertError 1', jsonURL, FFMpegProgress); console.log('downloadURLOrAlertError 1', jsonURL, FFMpegProgress);
checkFFMPEGProgress(FFMpegProgress); checkFFMPEGProgress(FFMpegProgress);
@ -2476,7 +2479,7 @@ function downloadURLOrAlertError(jsonURL, data, filename, FFMpegProgress) {
clearInterval(downloadURLOrAlertErrorInterval); clearInterval(downloadURLOrAlertErrorInterval);
if (response.error) { if (response.error) {
avideoAlertError(response.msg); avideoAlertError(response.msg);
modal.hidePleaseWait(); downloadURLOrAlertModal.hidePleaseWait();
} else if (response.url) { } else if (response.url) {
if (response.msg) { if (response.msg) {
avideoAlertInfo(response.msg); avideoAlertInfo(response.msg);
@ -2496,7 +2499,7 @@ function downloadURLOrAlertError(jsonURL, data, filename, FFMpegProgress) {
} else { } else {
console.log('downloadURLOrAlertError 4', response); console.log('downloadURLOrAlertError 4', response);
avideoResponse(response); avideoResponse(response);
modal.hidePleaseWait(); downloadURLOrAlertModal.hidePleaseWait();
} }
} }
}); });