forked from FOSS/BangleApps
tiny refactor on top
parent
e1f16ea266
commit
da55ade2d3
|
@ -7,11 +7,7 @@
|
||||||
);
|
);
|
||||||
|
|
||||||
let refreshMillis = function () {
|
let refreshMillis = function () {
|
||||||
return settings.refresh * 1000 * 60
|
return settings.refresh * 1000 * 60 + 1 // +1 <- leave some slack
|
||||||
}
|
|
||||||
|
|
||||||
let nextDueDate = function () {
|
|
||||||
return settings.updated + refreshMillis() + 1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let onCompleted = function () {
|
let onCompleted = function () {
|
||||||
|
@ -19,7 +15,7 @@
|
||||||
settings.updated = Date.now();
|
settings.updated = Date.now();
|
||||||
require('Storage').writeJSON("owmweather.json", settings);
|
require('Storage').writeJSON("owmweather.json", settings);
|
||||||
if (timeoutRef) clearTimeout(timeoutRef);
|
if (timeoutRef) clearTimeout(timeoutRef);
|
||||||
timeoutRef = setTimeout(loadIfDueAndReschedule, refreshMillis() + 1);
|
timeoutRef = setTimeout(loadIfDueAndReschedule, refreshMillis());
|
||||||
}
|
}
|
||||||
|
|
||||||
let loadIfDueAndReschedule = function () {
|
let loadIfDueAndReschedule = function () {
|
||||||
|
@ -30,7 +26,7 @@
|
||||||
settings.updated = lastWeatherUpdate;
|
settings.updated = lastWeatherUpdate;
|
||||||
}
|
}
|
||||||
|
|
||||||
let MillisUntilDue = nextDueDate() - Date.now();
|
let MillisUntilDue = settings.updated + refreshMillis() - Date.now();
|
||||||
if (MillisUntilDue <= 0) {
|
if (MillisUntilDue <= 0) {
|
||||||
if (!loading) {
|
if (!loading) {
|
||||||
loading = true;
|
loading = true;
|
||||||
|
|
Loading…
Reference in New Issue