Merge lp:~martin-borho/ubuntu-weather-app/bug-1287446 into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

workaround for Bug #1287446, only starting WorkerScript for newly added / outdated locations, or when an update is forced.

workaround for Bug #1287446, only starting WorkerScript for newly added / outdated locations, or when an update is forced.

[Nicholas Skaggs (nskaggs)]

I was unable to reproduce the specific issue mentioned in the bug after applying this branch. +1 from me.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'components/WeatherApi.js'
--- components/WeatherApi.js	2014-03-03 13:26:03 +0000
+++ components/WeatherApi.js	2014-03-06 20:42:53 +0000
@@ -728,14 +728,14 @@
                             api_key: message.params.api_key
                         },
                         secsFromLastFetch = (now-loc.updated)/1000;
-                    //
-                    if( message.params.force===true || loc.format !== RESPONSE_DATA_VERSION || secsFromLastFetch > 1800){
+                    // cache check deactivated, due to https://bugs.launchpad.net/ubuntu-weather-app/+bug/1287446
+                    /*if( message.params.force===true || loc.format !== RESPONSE_DATA_VERSION || secsFromLastFetch > 1800){*/
                         // data older than 30min, location is new or data format is deprecated
                         WeatherApi.getLocationData(params, updatedHnd, onError);
-                    } else {
+                    /*} else {
                         console.log("["+loc.location.name+"] returning cached data, time from last fetch: "+secsFromLastFetch)
                         updatedHnd(loc, true);
-                    }
+                    }*/
                 })
             } else {
                 finished(result);
 
=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml	2014-02-26 17:08:11 +0000
+++ ubuntu-weather-app.qml	2014-03-06 20:42:53 +0000
@@ -104,15 +104,26 @@
     WorkerScript {
         id: locationDataWorker
         source: "components/WeatherApi.js"
+        property int response_data_version: 20131207
+        // temporary cache for data while WorkerScript runs
+        property var tempData: ({})
         onMessage: {
+            var refreshedLocations = [];
             if(!messageObject.error) {
                 if(messageObject.action === "updateData") {
                     messageObject.result.forEach(function(loc) {
+                        // replace location data in cache with refreshed values
+                        tempData[loc.db.id] = loc;
                         if(loc["save"] === true) {
                             storage.updateLocation(loc.db.id, loc);
                         }
                     });
-                    buildTabs(messageObject.result);
+                    // now build a new list of locations
+                    for(var db_id in tempData) {
+                        refreshedLocations.push(tempData[db_id]);
+                    }
+                    tempData = ({}) // clear cache
+                    buildTabs(refreshedLocations);
                 }
             } else {
                 console.log(messageObject.error.msg+" / "+messageObject.error.request.url)                
@@ -120,6 +131,34 @@
                 refreshData(true, null);
             }
         }
+
+        function loadLocations(locations, force_refresh) {
+            var locsToLoad = [],
+                now = new Date().getTime();
+            locations.forEach(function(location) {
+                var secsFromLastFetch = (now-location.updated)/1000;
+                // add data for the cache
+                tempData[location.db.id] = location;
+                if( force_refresh===true || location.format !== response_data_version || secsFromLastFetch > 1800) {
+                   // location shoudl get refreshed
+                   locsToLoad.push(location);
+                }
+            });
+            if(locsToLoad.length > 0) {
+                sendMessage({
+                    action: "updateData",
+                    params: {
+                        locations:locsToLoad,
+                        force:force_refresh,
+                        service:settings["service"],
+                        api_key: Key.twcKey
+                    }
+                })
+            } else {
+                tempData = ({}) // clear cache again, not needed
+                buildTabs(locations);
+            }
+        }
     }
 
     ParallelAnimation {
@@ -199,16 +238,8 @@
         if(from_storage === true && force_refresh !== true) {
             storage.getLocations(buildTabs);
         } else {            
-            storage.getLocations(function(locations) {                
-                locationDataWorker.sendMessage({
-                    action: "updateData",
-                    params: {
-                        locations:locations,
-                        force:force_refresh,
-                        service:settings["service"],
-                        api_key: Key.twcKey
-                    }
-                })
+            storage.getLocations(function(locations) {
+                locationDataWorker.loadLocations(locations, force_refresh)
             });
         }
     }