Merge lp:~vthompson/ubuntu-weather-app/reboot-migrate-to-kph-nicely into lp:ubuntu-weather-app

[Victor Thompson]

* Fix migration of kmh to kph
* Add migration fixes for when the settings have not been added/changed

* Fix migration of kmh to kph
* Add migration fixes for when the settings have not been added/changed

This fixes the migration of using "kmh" to using "kph" and also adds fixes for migrating settings data that hadn't been changed from the defaults. When a setting is not changed it is not in the db.

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

PASSED: Continuous integration, rev:38
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/84/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/54
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/84

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/84/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:39
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/85/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/55
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/85

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/85/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM, tested the case of an empty db, metric units before and imperial units before. All settings were correctly translated :-)

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-autolanding/45/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-autolanding/36/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-autolanding/45/console

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'app/data/Storage.qml'
--- app/data/Storage.qml	2015-03-03 18:37:59 +0000
+++ app/data/Storage.qml	2015-05-09 00:47:30 +0000
@@ -70,13 +70,32 @@
 
                 console.debug("Migrating old data:", JSON.stringify(oldSettings))
 
+                var metric = Qt.locale().measurementSystem === Locale.MetricSystem
+
                 // Move to new Settings API
                 settings.migrated = true
-                settings.precipUnits = oldSettings["precip_units"]
-                settings.service = oldSettings["service"]
-                settings.tempScale = "°" + (oldSettings["units"] === "metric" ? "C" : "F")
-                settings.units = oldSettings["units"]
-                settings.windUnits = oldSettings["wind_units"]
+                settings.service = oldSettings["service"] === undefined ? "weatherchannel" : oldSettings["service"]
+
+                if (oldSettings["precip_units"] !== undefined) {
+                    settings.precipUnits = oldSettings["precip_units"]
+                } else {
+                    settings.precipUnits = metric ? "mm" : "in"
+                }
+
+                if (oldSettings["units"] !== undefined) {
+                    settings.tempScale = oldSettings["units"] === "metric" ? "°C" : "°F"
+                    settings.units = oldSettings["units"]
+                } else {
+                    settings.tempScale = metric ? "°C" : "°F"
+                    settings.units = metric ? "metric" : "imperial"
+                }
+
+                if (oldSettings["units"] !== undefined) {
+                    // If old wind speed was in "kmh" use "kph" instead
+                    settings.windUnits = oldSettings["wind_units"] === "kmh" ? "kph" : oldSettings["wind_units"]
+                } else {
+                    settings.windUnits = metric ? "kph" : "mph"
+                }
 
                 /*
                   TODO: uncomment when reboot is ready to replace existing app