dtPyAppFramework 1.4__tar.gz → 1.4.2__tar.gz

{dtpyappframework-1.4/src/dtPyAppFramework.egg-info → dtpyappframework-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dtPyAppFramework
-Version: 1.4
+Version: 1.4.2
 Summary: A Python library for common features in application development.
 Author-email: Digital-Thought <dev@digital-thought.org>
 Maintainer-email: Digital-Thought <dev@digital-thought.org>

{dtpyappframework-1.4 → dtpyappframework-1.4.2}/src/dtPyAppFramework/settings/__init__.py

@@ -1,3 +1,5 @@
+import logging
+
 from ..paths import ApplicationPaths
 from ..decorators import singleton
 from .settings_reader import SettingsReader
@@ -53,6 +55,49 @@ class Settings(dict):
         self.secret_manager = SecretsManager(application_paths=self.application_paths, application_settings=self,
                                              cloud_session_manager=self.cloud_session_manager)
 
+    def persist_settings(self, settings, scope):
+        if scope == 'app':
+            p = os.path.join(os.getcwd(), "config")
+        elif scope == 'all_user':
+            p = self.application_paths.app_data_root_path
+        elif scope == 'current_user':
+            p = self.application_paths.usr_data_root_path
+        else:
+            raise Exception(f'The Settings Scope "{scope}" is not recognised.')
+
+        p = os.path.join(p, 'config.yaml')
+        with open(p, 'w') as i_set:
+            i_set.write(settings)
+
+    def get_raw_settings(self):
+        raw_settings = {}
+
+        for key in ['app', 'all_user', 'current_user']:
+            raw_settings[key] = {'read_only': False, 'raw_data': ''}
+
+            p = None
+            if key == 'app':
+                p = os.path.join(os.getcwd(), "config")
+            elif key == 'all_user':
+                p = self.application_paths.app_data_root_path
+            elif key == 'current_user':
+                p = self.application_paths.usr_data_root_path
+
+            p = os.path.join(p, 'config.yaml')
+            if os.path.exists(p):
+                with open(p, 'r') as i_set:
+                    raw_settings[key]['raw_data'] = i_set.read()
+
+                try:
+                    with open(p, 'w') as o_set:
+                        o_set.write(raw_settings[key]['raw_data'])
+                    raw_settings[key]['read_only'] = False
+                except Exception as ex:
+                    logging.exception(str(ex))
+                    raw_settings[key]['read_only'] = True
+
+        return raw_settings
+
     def get_requests_tor_proxy(self) -> dict:
         """
         Gets TOR Proxy configuration in a format compatible with Requests.

{dtpyappframework-1.4 → dtpyappframework-1.4.2}/src/dtPyAppFramework/settings/secrets/__init__.py

@@ -59,9 +59,13 @@ class SecretsManager(object):
         _index = {"User_Local_Store": {}, "App_Local_Store": {}}
         for key in _index:
             store: LocalSecretStore = self.get_store(key)
-            _index[key]['available'] = store.store_available
-            _index[key]['index'] = store.get_index()
-            _index[key]['read_only'] = store.store_read_only
+            try:
+                _index[key]['available'] = store.store_available
+                _index[key]['index'] = store.get_index()
+                _index[key]['read_only'] = store.store_read_only
+            except Exception as ex:
+                logging.error(str(ex))
+                _index[key]['available'] = False
 
         return _index
 

{dtpyappframework-1.4 → dtpyappframework-1.4.2}/src/dtPyAppFramework/settings/secrets/local_secret_store.py

@@ -148,7 +148,8 @@ class LocalSecretStore(AbstractSecretStore):
         self.store.setPassword(account=key, password=value)
         self.__save()
         index = self.get_index()
-        index.append(key)
+        if key not in index:
+            index.append(key)
         self.__set_index(index)
 
     def delete_secret(self, key):
@@ -161,7 +162,8 @@ class LocalSecretStore(AbstractSecretStore):
         entry = self.store.setPassword(account=key, password='NONE')
         self.__save()
         index = self.get_index()
-        index.remove(key)
+        while key in index:
+            index.remove(key)
         self.__set_index(index)
 
     def __set_index(self, index: list):

dtpyappframework-1.4.2/src/dtPyAppFramework/version.dat

@@ -0,0 +1 @@
+1.4.2

{dtpyappframework-1.4 → dtpyappframework-1.4.2/src/dtPyAppFramework.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dtPyAppFramework
-Version: 1.4
+Version: 1.4.2
 Summary: A Python library for common features in application development.
 Author-email: Digital-Thought <dev@digital-thought.org>
 Maintainer-email: Digital-Thought <dev@digital-thought.org>

dtpyappframework-1.4/src/dtPyAppFramework/version.dat

@@ -1 +0,0 @@
-1.4