Settings: getter -> cl.app; housekeeping

- classes.app will have a get_settings() function (which we should
  try to migrate to, from classes.settings.get_settings()
- in addition, the OpenShotApp instance has a get_settings() METHOD
  which is most-preferable
  (`from classes.app import get_app; s = get_app().get_settings()`)

Author: ferdnyc

src/classes/app.py

@@ -55,17 +55,22 @@
 except ImportError:
     pass
 
+def get_app():
+    """ Get the current QApplication instance of OpenShot """
+    return QApplication.instance()
+
+
+def get_settings():
+    """Get a reference to the app's settings object"""
+    return get_app().get_settings()
+
 try:
     # Enable High-DPI resolutions
     QApplication.setAttribute(Qt.AA_EnableHighDpiScaling)
 except AttributeError:
     pass  # Quietly fail for older Qt5 versions
 
 
-def get_app():
-    """ Returns the current QApplication instance of OpenShot """
-    return QApplication.instance()
-
 
 class OpenShotApp(QApplication):
     """ This class is the primary QApplication for OpenShot.
@@ -297,6 +302,11 @@ def settings_load_error(self, filepath=None):
             % {"file_path": filepath}
             )
 
+    def get_settings(self):
+        if not hasattr(self, "settings"):
+            return None
+        return self.settings
+
     def _tr(self, message):
         return self.translate("", message)
 

src/classes/settings.py

@@ -37,7 +37,7 @@
 
 def get_settings():
     """ Get the current application's settings instance """
-    return SettingStore.get_app().settings
+    return SettingStore.get_app().get_settings()
 
 
 class SettingStore(JsonDataStore):
@@ -72,20 +72,22 @@ def set(self, key, value):
         """ Store setting, but adding isn't allowed. All possible settings must be in default settings file. """
         key = key.lower()
 
-        # Load user setting's values (for easy merging)
-        user_values = {}
-        for item in self._data:
-            if "setting" in item and "value" in item:
-                user_values[item["setting"].lower()] = item
+        # Index settings values (for easy updates)
+        user_values = {
+            item["setting"].lower(): item
+            for item in self._data
+            if all(["setting" in item, "value" in item])
+        }
 
         # Save setting
         if key in user_values:
-            user_values[key]["value"] = value
+            user_values[key].update({"value": value})
         else:
             log.warn(
                 "{} key '{}' not valid. The following are valid: {}".format(
-                self.data_type, key,
-                list(self._data.keys()),
+                    self.data_type,
+                    key,
+                    list(self._data.keys()),
                 ))
 
     def load(self):