Eliminate settings.get_settings

Settings should always be requested from the app instance, which
holds the settings object: `get_app().get_settings()`

Author: ferdnyc

src/classes/language.py

@@ -33,7 +33,6 @@
 
 from classes.logger import log
 from classes import info
-from classes import settings
 
 
 try:
@@ -75,7 +74,11 @@ def init_language():
                     ]
 
     # Get the user's configured language preference
-    preference_lang = settings.get_settings().get('default-language')
+    settings = app.get_settings()
+    if settings:
+        preference_lang = settings.get('default-language')
+    else:
+        preference_lang = "Default"
 
     # Output all languages detected from various sources
     log.info("Qt Detected Languages: {}".format(QLocale().system().uiLanguages()))

src/classes/logger_libopenshot.py

@@ -26,8 +26,9 @@
  """
 
 from threading import Thread
-from classes import settings, info
+from classes import info
 from classes.logger import log
+from classes.app import get_app
 import openshot
 import os
 import zmq
@@ -46,7 +47,7 @@ def run(self):
         self.running = True
 
         # Get settings
-        s = settings.get_settings()
+        s = get_app().get_settings()
 
         # Get port from settings
         port = s.get("debug-port")

src/classes/metrics.py

@@ -35,15 +35,15 @@
 from copy import deepcopy
 from classes import info
 from classes import language
+from classes.app import get_app
 from classes.logger import log
-from classes import settings
 import openshot
 
 from PyQt5.QtCore import QT_VERSION_STR
 from PyQt5.QtCore import PYQT_VERSION_STR
 
 # Get settings
-s = settings.get_settings()
+s = get_app().get_settings()
 
 # Determine OS version
 os_version = "X11; Linux %s" % platform.machine()

src/classes/project_data.py

@@ -33,7 +33,8 @@
 import random
 import shutil
 
-from classes import info, settings
+from classes import info
+from classes.app import get_app
 from classes.image_types import is_image
 from classes.json_data import JsonDataStore
 from classes.logger import log
@@ -276,7 +277,7 @@ def new(self):
         info.BLENDER_PATH = os.path.join(info.USER_PATH, "blender")
 
         # Get default profile
-        s = settings.get_settings()
+        s = get_app().get_settings()
         default_profile = s.get("default-profile")
 
         # Loop through profiles
@@ -853,7 +854,7 @@ def add_to_recent_files(self, file_path):
             # Ignore backup recovery project
             return
 
-        s = settings.get_settings()
+        s = get_app().get_settings()
         recent_projects = s.get("recent_projects")
 
         # Make sure file_path is absolute

src/classes/settings.py

@@ -35,30 +35,14 @@
 from classes.json_data import JsonDataStore
 
 
-def get_settings():
-    """ Get the current application's settings instance """
-    return SettingStore.get_app().get_settings()
-
-
 class SettingStore(JsonDataStore):
     """ This class only allows setting pre-existing keys taken from default settings file, and merges user settings
     on load, assumes default OS dir."""
 
-    @classmethod
-    def save_app(cls, app_reference):
-        cls._app = app_reference
-
-    @classmethod
-    def get_app(cls):
-        if hasattr(cls, "_app"):
-            return cls._app
-        return None
-
     def __init__(self, parent=None):
         super().__init__()
         # Also keep track of our parent, if defined
-        if parent:
-            SettingStore.save_app(parent)
+        self.app = parent
         # Set the data type name for logging clarity (base class functions use this variable)
         self.data_type = "user settings"
         self.settings_filename = "openshot.settings"
@@ -111,10 +95,9 @@ def load(self):
             except Exception as ex:
                 log.error("Error loading settings file: %s", ex)
                 user_settings = {}
-                app = SettingStore.get_app()
-                if app:
+                if self.app:
                     # We have a parent, ask to show a message box
-                    app.settings_load_error(file_path)
+                    self.app.settings_load_error(file_path)
 
         # Merge default and user settings, excluding settings not in default, Save settings
         self._data = self.merge_settings(default_settings, user_settings)

src/classes/timeline.py

@@ -31,7 +31,6 @@
 from classes.updates import UpdateInterface
 from classes.logger import log
 from classes.app import get_app
-from classes import settings
 
 
 class TimelineSync(UpdateInterface):
@@ -41,7 +40,7 @@ def __init__(self, window):
         self.app = get_app()
         self.window = window
         project = self.app.project
-        s = settings.get_settings()
+        s = self.app.get_settings()
 
         # Get some settings from the project
         fps = project.get("fps")

src/classes/waveform.py

@@ -31,12 +31,11 @@
 from classes import info
 from classes.app import get_app
 from classes.logger import log
-from classes import settings
 import openshot
 
 
 # Get settings
-s = settings.get_settings()
+s = get_app().get_settings()
 
 
 def get_audio_data(clip_id, file_path, channel_filter, volume_keyframe):

src/windows/add_to_timeline.py

@@ -33,7 +33,6 @@
 from PyQt5.QtWidgets import QDialog
 from PyQt5.QtGui import QIcon
 
-from classes import settings
 from classes import info, ui_util, time_parts
 from classes.logger import log
 from classes.query import Clip, Transition
@@ -437,13 +436,13 @@ def __init__(self, files=None, position=0.0):
         # Init UI
         ui_util.init_ui(self)
 
-        # Get settings
-        self.settings = settings.get_settings()
-
         # Get translation object
         self.app = get_app()
         _ = self.app._tr
 
+        # Get settings
+        self.settings = self.app.get_settings()
+
         # Track metrics
         track_metric_screen("add-to-timeline-screen")
 

src/windows/export.py

@@ -50,7 +50,6 @@
 from classes import info
 from classes import ui_util
 from classes import openshot_rc  # noqa
-from classes import settings
 from classes.logger import log
 from classes.app import get_app
 from classes.metrics import track_metric_screen, track_metric_error
@@ -78,12 +77,12 @@ def __init__(self, *args, **kwargs):
 
         # get translations & settings
         _ = get_app()._tr
-        self.s = settings.get_settings()
+        self.s = get_app().get_settings()
 
         track_metric_screen("export-screen")
 
         # Dynamically load tabs from settings data
-        self.settings_data = settings.get_settings().get_all_settings()
+        self.settings_data = self.s.get_all_settings()
 
         # Add buttons to interface
         self.cancel_button = QPushButton(_('Cancel'))

src/windows/file_properties.py

@@ -35,7 +35,7 @@
 # Python module for libopenshot (required video editing module installed separately)
 import openshot
 
-from classes import info, ui_util, settings
+from classes import info, ui_util
 from classes.app import get_app
 from classes.logger import log
 from classes.metrics import track_metric_screen
@@ -64,7 +64,7 @@ def __init__(self, file):
         _ = app._tr
 
         # Get settings
-        self.s = settings.get_settings()
+        self.s = app.get_settings()
 
         # Track metrics
         track_metric_screen("file-properties-screen")
@@ -75,7 +75,7 @@ def __init__(self, file):
         self.buttonBox.addButton(QPushButton(_('Cancel')), QDialogButtonBox.RejectRole)
 
         # Dynamically load tabs from settings data
-        self.settings_data = settings.get_settings().get_all_settings()
+        self.settings_data = self.s.get_all_settings()
 
         # Get file properties
         filename = os.path.basename(self.file.data["path"])