Merge pull request #2762 from halemmerich/owmweather

owmweather - Fix updating weather too often

apps/owmweather/ChangeLog

@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Do first update request 5s after boot to boot up faster
+0.03: Fix updating weather too often

apps/owmweather/boot.js

@@ -1,19 +1,21 @@
 {
   let waiting = false;
-  let settings = require("Storage").readJSON("owmweather.json", 1) || {
+  let settings = Object.assign(
-    enabled: false
+    require('Storage').readJSON("owmweather.default.json", true) || {},
-  };
+    require('Storage').readJSON("owmweather.json", true) || {}
+  );
   
   let completion = function(){
     waiting = false;
+    settings.updated = Date.now();
+    require('Storage').writeJSON("owmweather.json", settings);
   }
 
   if (settings.enabled) {    
     let weather = require("Storage").readJSON('weather.json') || {};
-    let lastUpdate;
     if (weather && weather.weather && weather.weather.time) lastUpdate = weather.weather.time;
 
-    if (!lastUpdate || lastUpdate + settings.refresh * 1000 * 60 < Date.now()){
+    if (!settings.updated || settings.updated + settings.refresh * 1000 * 60 < Date.now()){
       setTimeout(() => {
         if (!waiting){
           waiting = true;

apps/owmweather/lib.js

@@ -25,7 +25,7 @@ function parseWeather(response) {
 
     json.weather = weather;
     require("Storage").writeJSON('weather.json', json);
-    require("weather").emit("update", json.weather);
+    if (require("Storage").read("weather")!==undefined) require("weather").emit("update", json.weather);
     return undefined;
   } else {
     return /*LANG*/"Not OWM data";

apps/owmweather/metadata.json

@@ -1,7 +1,7 @@
 { "id": "owmweather",
   "name": "OpenWeatherMap weather provider",
   "shortName":"OWM Weather",
-  "version":"0.02",
+  "version":"0.03",
   "description": "Pulls weather from OpenWeatherMap (OWM) API",
   "icon": "app.png",
   "type": "bootloader",