Home Information - Your home, your data, organized.
Python
Refactor to try to avoid startup DB conflicts. (#12)
Tony Cf74c81e6e04b
diff --git a/src/hi/apps/config/context_processors.py b/src/hi/apps/config/context_processors.pyindex fe75a418..260e5745 100644--- a/src/hi/apps/config/context_processors.py+++ b/src/hi/apps/config/context_processors.py@@ -5,9 +5,10 @@ from .settings_mixins import SettingsMixindef settings_context(request):+ settings_manager = SettingsMixin().settings_manager()console_manager = ConsoleMixin().console_manager()return {- 'USER_TIMEZONE': SettingsMixin().settings_manager().get_setting_value( ConsoleSetting.TIMEZONE ),+ 'USER_TIMEZONE': settings_manager.get_setting_value( ConsoleSetting.TIMEZONE ),'CONSOLE_AUDIO_MAP': console_manager.get_console_audio_map(),'SLEEP_OVERLAY_OPACITY': console_manager.get_sleep_overlay_opacity(),}diff --git a/src/hi/apps/config/migrations/0002_alter_subsystem_name_alter_subsystem_subsystem_key.py b/src/hi/apps/config/migrations/0002_alter_subsystem_name_alter_subsystem_subsystem_key.pynew file mode 100644index 00000000..21132bbe--- /dev/null+++ b/src/hi/apps/config/migrations/0002_alter_subsystem_name_alter_subsystem_subsystem_key.py@@ -0,0 +1,25 @@+# Generated by Django 4.2.15 on 2025-02-14 21:27++from django.db import migrations, models+++class Migration(migrations.Migration):++ dependencies = [+ ("config", "0001_initial"),+ ]++ operations = [+ migrations.AlterField(+ model_name="subsystem",+ name="name",+ field=models.CharField(max_length=128, verbose_name="Name"),+ ),+ migrations.AlterField(+ model_name="subsystem",+ name="subsystem_key",+ field=models.CharField(+ max_length=32, unique=True, verbose_name="Subsystem Key"+ ),+ ),+ ]diff --git a/src/hi/apps/config/models.py b/src/hi/apps/config/models.pyindex 97e1f1ce..7c7d78e2 100644--- a/src/hi/apps/config/models.py+++ b/src/hi/apps/config/models.py@@ -9,12 +9,12 @@ class Subsystem( models.Model ):'Name',max_length = 128,null = False, blank = False,- unique = True,)subsystem_key = models.CharField('Subsystem Key',max_length = 32,null = False, blank = False,+ unique = True,)created_datetime = models.DateTimeField('Created',diff --git a/src/hi/apps/config/settings_manager.py b/src/hi/apps/config/settings_manager.pyindex cce2cad8..3e60902d 100644--- a/src/hi/apps/config/settings_manager.py+++ b/src/hi/apps/config/settings_manager.py@@ -120,6 +120,7 @@ class SettingsManager( Singleton ):return app_settings_listdef _load_or_create_settings( self, app_settings_list: List[ AppSettings ] ):+defined_app_settings_map = { x.app_name: x for x in app_settings_list }existing_subsystem_map = {x.subsystem_key: x@@ -142,6 +143,14 @@ class SettingsManager( Singleton ):return subsystem_listdef _create_app_subsystem( self, app_settings : AppSettings ):++ try:+ subsystem = Subsystem.objects.get( subsystem_key = app_settings.app_name )+ logger.warning( f'Skipping creating subsystem "{app_settings.label}". It already exists.' )+ return subsystem++ except Subsystem.DoesNotExist:+ passsubsystem = Subsystem.objects.create(name = app_settings.label,diff --git a/src/hi/apps/console/console_manager.py b/src/hi/apps/console/console_manager.pyindex d89e4c5f..db839001 100644--- a/src/hi/apps/console/console_manager.py+++ b/src/hi/apps/console/console_manager.py@@ -28,12 +28,12 @@ class ConsoleManager( Singleton, SettingsMixin, SensorResponseMixin ):if self._was_initialized:return- self._console_audio_map = self._build_console_audio_map()- self._video_stream_entity_list = self._build_video_stream_entity_list()-self.settings_manager().register_change_listener( self._reload_console_audio_map )EntityManager().register_change_listener( self._reload_video_stream_entity_list )+ self._console_audio_map = self._build_console_audio_map()+ self._video_stream_entity_list = self._build_video_stream_entity_list()+self._was_initialized = Truereturn