Fix not-yet-loaded bug in SavedSettingsObject._get_saved_settings()

The earlier implementation only copied in the currently loaded
properties and the required ones.  The new implementation copies
in _all_ the non-default properties.

diff --git a/libbe/storage/util/settings_object.py b/libbe/storage/util/settings_object.py
index 9f2b7af9362907bdaeea36c67b9711f529db55eb..181d4ab3a8e74f2d74c883248fa671086fba22e3 100644 (file)
--- a/libbe/storage/util/settings_object.py
+++ b/libbe/storage/util/settings_object.py
@@ -204,18 +204,31 @@ class SavedSettingsObject(object):
             self._settings_loaded = True
 
     def save_settings(self):
-        """Load the settings from disk."""
+        """Save the settings to disk."""
         # Override.  Should save the dict output of ._get_saved_settings()
         settings = self._get_saved_settings()
         pass # write settings to disk....
 
     def _get_saved_settings(self):
+        """
+        In order to avoid overwriting unread on-disk data, make sure
+        we've loaded anything sitting on the disk.  In the current
+        implementation, all the settings are stored in a single file,
+        so we need to load _all_ the saved settings.  Another approach
+        would be per-setting saves, in which case you could skip this
+        step, since any setting changes would have forced that setting
+        load already.
+        """
         settings = {}
-        for k,v in self.settings.items():
-            if v != None and v != EMPTY:
-                settings[k] = v
-        for k in self.required_saved_properties:
-            settings[k] = getattr(self, self._setting_name_to_attr_name(k))
+        for k in self.settings_properties:
+            if k in self.settings and \
+                    not self.settings[k] in [None, EMPTY]:
+                settings[k] = self.settings[k]
+            else:
+                value = getattr(
+                    self, self._setting_name_to_attr_name(k))
+                if value not in [None, EMPTY, []]:
+                    settings[k] = value
         return settings
 
     def clear_cached_setting(self, setting=None):