Merge lp:~marcustomlinson/unity-scopes-shell/lp-1583055 into lp:unity-scopes-shell

[Marcus Tomlinson]

Only create an empty settings file when attempting to write to one

[Marcus Tomlinson (marcustomlinson)]

I have tested this on the phone. If you'd like to confirm, here's a build: https://code.launchpad.net/~unity-api-team/+archive/ubuntu/dev-build-4

[Paweł Stołowski (stolowski)]

Looks good, thanks Markus!

review: Approve

=== modified file 'src/Unity/settingsmodel.cpp'
--- src/Unity/settingsmodel.cpp	2016-04-19 08:04:55 +0000
+++ src/Unity/settingsmodel.cpp	2016-05-19 07:18:35 +0000
@@ -86,12 +86,11 @@
 
     try
     {
-        tryLoadSettings();
+        tryLoadSettings(true);
     }
-    catch(const unity::FileException& e)
+    catch(const unity::FileException&)
     {
-        // Something has gone wrong, at this point we'll just have to continue with a null m_settings.
-        qWarning() << "SettingsModel::SettingsModel: Failed to read settings file:" << e.what();
+        // No settings file found, at this point we'll just have to continue with a null m_settings.
     }
 
     for (const auto &it : settingsDefinitions.toList())
@@ -179,7 +178,7 @@
             {
                 try
                 {
-                    tryLoadSettings();
+                    tryLoadSettings(true);
                     switch (data->variantType)
                     {
                         case QVariant::Bool:
@@ -269,7 +268,7 @@
         QVariant result;
         try
         {
-            tryLoadSettings();
+            tryLoadSettings(true);
             switch (data->variantType)
             {
                 case QVariant::Bool:
@@ -486,7 +485,7 @@
     {
         try
         {
-            tryLoadSettings();
+            tryLoadSettings(false);
             switch (value.type())
             {
                 case QVariant::Bool:
@@ -526,15 +525,19 @@
     }
 }
 
-void SettingsModel::tryLoadSettings() const
+void SettingsModel::tryLoadSettings(bool read_only) const
 {
     if (!m_settings)
     {
         QFileInfo checkFile(m_settings_path);
         if (!checkFile.exists() || !checkFile.isFile())
         {
+            if (read_only)
+            {
+                throw unity::FileException("Could not locate a settings file at: " + m_settings_path.toStdString(), -1);
+            }
             // Config file does not exist, so we create an empty one.
-            if (!QFile(m_settings_path).open(QFile::WriteOnly))
+            else if (!QFile(m_settings_path).open(QFile::WriteOnly))
             {
                 throw unity::FileException("Could not create an empty settings file at: " + m_settings_path.toStdString(), -1);
             }

=== modified file 'src/Unity/settingsmodel.h'
--- src/Unity/settingsmodel.h	2016-04-18 16:18:20 +0000
+++ src/Unity/settingsmodel.h	2016-05-19 07:18:35 +0000
@@ -91,7 +91,7 @@
     void settings_timeout();
 
 private:
-    void tryLoadSettings() const;
+    void tryLoadSettings(bool read_only) const;
 
 protected:
     mutable QMutex m_mutex;