mirror of
https://gitea.invidious.io/iv-org/invidious-copy-2022-08-14.git
synced 2024-08-15 00:53:20 +00:00
fix helpers
This commit is contained in:
parent
7dd699370f
commit
835237382f
1 changed files with 21 additions and 17 deletions
|
@ -25,7 +25,7 @@ Math.sign = Math.sign || function(x) {
|
||||||
};
|
};
|
||||||
|
|
||||||
// Monstrous global variable for handy code
|
// Monstrous global variable for handy code
|
||||||
helpers = helpers || {
|
window.helpers = window.helpers || {
|
||||||
/**
|
/**
|
||||||
* https://en.wikipedia.org/wiki/Clamping_(graphics)
|
* https://en.wikipedia.org/wiki/Clamping_(graphics)
|
||||||
* @param {Number} num Source number
|
* @param {Number} num Source number
|
||||||
|
@ -38,9 +38,9 @@ helpers = helpers || {
|
||||||
var t = max; max = min; min = t; // swap max and min
|
var t = max; max = min; min = t; // swap max and min
|
||||||
}
|
}
|
||||||
|
|
||||||
if (max > num)
|
if (max < num)
|
||||||
return max;
|
return max;
|
||||||
if (min < num)
|
if (min > num)
|
||||||
return min;
|
return min;
|
||||||
return num;
|
return num;
|
||||||
},
|
},
|
||||||
|
@ -62,12 +62,15 @@ helpers = helpers || {
|
||||||
if (method === 'POST')
|
if (method === 'POST')
|
||||||
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
|
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
|
||||||
|
|
||||||
xhr.onreadystatechange = function () {
|
// better than onreadystatechange because of 404 codes https://stackoverflow.com/a/36182963
|
||||||
if (xhr.readyState === XMLHttpRequest.DONE) {
|
xhr.onloadend = function () {
|
||||||
if (xhr.status === 200)
|
if (xhr.status === 200) {
|
||||||
if (callbacks.on200)
|
if (callbacks.on200)
|
||||||
callbacks.on200(xhr.response);
|
callbacks.on200(xhr.response);
|
||||||
else
|
} else {
|
||||||
|
// handled by onerror
|
||||||
|
if (xhr.status === 0) return;
|
||||||
|
|
||||||
if (callbacks.onNon200)
|
if (callbacks.onNon200)
|
||||||
callbacks.onNon200(xhr);
|
callbacks.onNon200(xhr);
|
||||||
}
|
}
|
||||||
|
@ -89,14 +92,14 @@ helpers = helpers || {
|
||||||
xhr.send();
|
xhr.send();
|
||||||
},
|
},
|
||||||
/** @private */
|
/** @private */
|
||||||
_xhrRetry(method, url, options, callbacks) {
|
_xhrRetry: function(method, url, options, callbacks) {
|
||||||
if (options.retries <= 0) {
|
if (options.retries <= 0) {
|
||||||
console.warn('Failed to pull', options.entity_name);
|
console.warn('Failed to pull', options.entity_name);
|
||||||
if (callbacks.onTotalFail)
|
if (callbacks.onTotalFail)
|
||||||
callbacks.onTotalFail();
|
callbacks.onTotalFail();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
helpers.xhr(method, url, options, callbacks);
|
helpers._xhr(method, url, options, callbacks);
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* @callback callbackXhrOn200
|
* @callback callbackXhrOn200
|
||||||
|
@ -123,18 +126,19 @@ helpers = helpers || {
|
||||||
* @param {callbackXhrError} [callbacks.onError]
|
* @param {callbackXhrError} [callbacks.onError]
|
||||||
* @param {callbackXhrError} [callbacks.onTotalFail] - if failed after all retries
|
* @param {callbackXhrError} [callbacks.onTotalFail] - if failed after all retries
|
||||||
*/
|
*/
|
||||||
xhr(method, url, options, callbacks) {
|
xhr: function(method, url, options, callbacks) {
|
||||||
if (options.retries > 1) {
|
if (!options.retries || options.retries <= 1) {
|
||||||
helpers._xhr(method, url, options, callbacks);
|
helpers._xhr(method, url, options, callbacks);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!options.entity_name) options.entity_name = 'unknown';
|
if (!options.entity_name) options.entity_name = 'unknown';
|
||||||
if (!options.retry_timeout) options.retry_timeout = 1;
|
if (!options.retry_timeout) options.retry_timeout = 1000;
|
||||||
const retries_total = options.retries;
|
const retries_total = options.retries;
|
||||||
|
let currentTry = 1;
|
||||||
|
|
||||||
const retry = function () {
|
const retry = function () {
|
||||||
console.warn('Pulling ' + options.entity_name + ' failed... ' + options.retries + '/' + retries_total);
|
console.warn('Pulling ' + options.entity_name + ' failed... ' + (currentTry++) + '/' + retries_total);
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
options.retries--;
|
options.retries--;
|
||||||
helpers._xhrRetry(method, url, options, callbacks);
|
helpers._xhrRetry(method, url, options, callbacks);
|
||||||
|
|
Loading…
Reference in a new issue