Skip to content

Home Information - Your home, your data, organized.

Python

More improvements to SettingsManager

Anthony Cassandra8932094fdbe7
diff --git a/src/hi/apps/config/settings_manager.py b/src/hi/apps/config/settings_manager.py
index 270faed8..dc9ed686 100644
--- a/src/hi/apps/config/settings_manager.py
+++ b/src/hi/apps/config/settings_manager.py
@@ -1,6 +1,10 @@
+import logging
+from threading import local
from typing import List
from django.db import transaction
+from django.db.models.signals import post_save, post_delete
+from django.dispatch import receiver
from hi.apps.attribute.enums import AttributeType
from hi.apps.common.singleton import Singleton
@@ -8,20 +12,34 @@ from hi.apps.common.singleton import Singleton
from .enums import SubsystemType, SubsystemAttributeType
from .models import Subsystem, SubsystemAttribute
+logger = logging.getLogger(__name__)
+
class SettingsManager( Singleton ):
def __init_singleton__( self ):
self._subsystem_list = list()
+ self._attribute_value_map = dict()
self.reload()
return
def reload(self):
self._subsystem_list = self._load_subsystem_list()
+
+ self._attribute_value_map = dict()
+ for subsystem in self._subsystem_list:
+ for subsystem_attribute in subsystem.attributes.all():
+ attr_type = subsystem_attribute.subsystem_attribute_type
+ self._attribute_value_map[attr_type] = subsystem_attribute.value
+ continue
+ continue
return
def get_subsystems(self) -> List[ Subsystem ]:
return self._subsystem_list
+
+ def get_setting_value( self, subsystem_attribute_type : SubsystemAttributeType ):
+ return self._attribute_value_map.get( subsystem_attribute_type )
def _load_subsystem_list(self):
existing_subsystem_map = {
@@ -87,4 +105,38 @@ class SettingsManager( Singleton ):
is_editable = subsystem_attribute_type.is_editable,
is_required = subsystem_attribute_type.is_required,
)
+
+
+_thread_local = local()
+
+
+def do_settings_manager_reload():
+ logger.debug( 'Reloading SettingsManager from model changes.')
+ SettingsManager().reload()
+ _thread_local.reload_registered = False
+ return
+
+
+@receiver( post_save, sender = Subsystem )
+@receiver( post_save, sender = SubsystemAttribute )
+@receiver( post_delete, sender = Subsystem )
+@receiver( post_delete, sender = SubsystemAttribute )
+def settings_manager_model_changed( sender, instance, **kwargs ):
+ """
+ Queue the SettingsManager.reload() call to execute after the transaction
+ is committed. This prsettingss reloading multiple times if multiple
+ models saved as part of a transaction (which is the normal case for
+ SettingsDefinition and its related models.)
+ """
+ if not hasattr(_thread_local, "reload_registered"):
+ _thread_local.reload_registered = False
+
+ logger.debug( 'SettingsManager model change detected.')
+
+ if not _thread_local.reload_registered:
+ logger.debug( 'Queuing SettingsManager reload on model change.')
+ _thread_local.reload_registered = True
+ transaction.on_commit( do_settings_manager_reload )
+
+ return
diff --git a/src/hi/apps/event/event_manager.py b/src/hi/apps/event/event_manager.py
index 930d873b..1b4b678f 100644
--- a/src/hi/apps/event/event_manager.py
+++ b/src/hi/apps/event/event_manager.py
@@ -6,7 +6,7 @@ from threading import local
from typing import List
from django.db.models.signals import post_save, post_delete
-from django.db.transaction import on_commit
+from django.db import transaction
from django.dispatch import receiver
from hi.apps.alert.alert_manager import AlertManager
@@ -193,6 +193,6 @@ def event_manager_model_changed( sender, instance, **kwargs ):
if not _thread_local.reload_registered:
logger.debug( 'Queuing EventManager reload on model change.')
_thread_local.reload_registered = True
- on_commit( do_event_manager_reload )
+ transaction.on_commit( do_event_manager_reload )
return
diff --git a/src/hi/integrations/hass/hass_manager.py b/src/hi/integrations/hass/hass_manager.py
index 64d1b31b..a250786c 100644
--- a/src/hi/integrations/hass/hass_manager.py
+++ b/src/hi/integrations/hass/hass_manager.py
@@ -3,7 +3,7 @@ from threading import local
from typing import Dict
from django.db.models.signals import post_save, post_delete
-from django.db.transaction import on_commit
+from django.db import transaction
from django.dispatch import receiver
from hi.apps.common.singleton import Singleton
@@ -171,6 +171,6 @@ def hass_manager_model_changed( sender, instance, **kwargs ):
if not _thread_local.reload_registered:
logger.debug( 'Queuing HassManager reload on model change.')
_thread_local.reload_registered = True
- on_commit( do_hass_manager_reload )
+ transaction.on_commit( do_hass_manager_reload )
return
diff --git a/src/hi/integrations/zoneminder/zm_manager.py b/src/hi/integrations/zoneminder/zm_manager.py
index f09dea2c..24c34037 100644
--- a/src/hi/integrations/zoneminder/zm_manager.py
+++ b/src/hi/integrations/zoneminder/zm_manager.py
@@ -8,7 +8,7 @@ from threading import local
from typing import Dict, List
from django.db.models.signals import post_save, post_delete
-from django.db.transaction import on_commit
+from django.db import transaction
from django.dispatch import receiver
import hi.apps.common.datetimeproxy as datetimeproxy
@@ -273,6 +273,6 @@ def zm_manager_model_changed( sender, instance, **kwargs ):
if not _thread_local.reload_registered:
logger.debug( 'Queuing ZoneMinderManager reload on model change.')
_thread_local.reload_registered = True
- on_commit( do_zm_manager_reload )
+ transaction.on_commit( do_zm_manager_reload )
return