From c692c7fb56bc63aac41f88678b7ca19c8b8d3230 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Wed, 4 Jan 2023 20:51:13 +0100 Subject: [PATCH] fix template None template call --- apps/nspanel-lovelace-ui/luibackend/config.py | 13 +++++-------- apps/nspanel-lovelace-ui/luibackend/controller.py | 12 ++++++------ apps/nspanel-lovelace-ui/luibackend/pages.py | 2 +- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/apps/nspanel-lovelace-ui/luibackend/config.py b/apps/nspanel-lovelace-ui/luibackend/config.py index 9026b911..e9d7dce1 100644 --- a/apps/nspanel-lovelace-ui/luibackend/config.py +++ b/apps/nspanel-lovelace-ui/luibackend/config.py @@ -159,11 +159,10 @@ class LuiBackendConfig(object): apis.ha_api.log("Input config: %s", inconfig) self._config = self.dict_recursive_update(inconfig, self._DEFAULT_CONFIG) apis.ha_api.log("Loaded config: %s", self._config) - + # parse cards for card in self.get("cards"): self._config_cards.append(Card(card)) - # setup prev and next uuids top_level_cards = filter(lambda card: not card.hidden, self._config_cards) first_card = None @@ -178,14 +177,12 @@ class LuiBackendConfig(object): if first_card and last_card: first_card.uuid_prev = last_card.uuid last_card.uuid_next = first_card.uuid - # parse screensaver self._config_screensaver = Card(self.get("screensaver")) # parse hidden cards for card in self.get("hiddenCards"): self._config_cards.append(Card(card, hidden=True)) - # all entites sorted by generated key, to be able to use short identifiers self._config_entites_table = {x.uuid: x for x in self.get_all_entitys()} self._config_card_table = {x.uuid: x for x in self._config_cards} @@ -218,7 +215,7 @@ class LuiBackendConfig(object): entities.extend(card.get_entity_list()) return entities - def searchCard(self, id): + def search_card(self, id): id = id.replace("navigate.", "") if id.startswith("uuid"): return self.get_card_by_uuid(id) @@ -238,11 +235,11 @@ class LuiBackendConfig(object): def get_default_card(self): defaultCard = self._config.get("screensaver.defaultCard") - defaultCard = apis.ha_api.render_template(defaultCard) if defaultCard is not None: + defaultCard = apis.ha_api.render_template(defaultCard) defaultCard = self.search_card(defaultCard) - if defaultCard is not None: - return defaultCard + if defaultCard is not None: + return defaultCard else: return self._config_cards[0] diff --git a/apps/nspanel-lovelace-ui/luibackend/controller.py b/apps/nspanel-lovelace-ui/luibackend/controller.py index 762678da..a3822e9f 100644 --- a/apps/nspanel-lovelace-ui/luibackend/controller.py +++ b/apps/nspanel-lovelace-ui/luibackend/controller.py @@ -11,21 +11,21 @@ class LuiController(object): self._send_mqtt_msg = send_mqtt_msg self._current_card = self._config._config_screensaver + self._previous_cards = [] # first card (default, after startup) self._previous_cards.append(self._config.get_default_card()) - self._pages_gen = LuiPagesGen(config, send_mqtt_msg) # send panel back to startup page on restart of this script self._pages_gen.page_type("pageStartup") - + # calculate current brightness self.current_screensaver_brightness = self.calc_current_brightness(self._config.get("sleepBrightness")) self.current_screen_brightness = self.calc_current_brightness(self._config.get("screenBrightness")) - # register callbacks - self.register_callbacks() + self.register_callbacks() + def startup(self): apis.ha_api.log(f"Startup Event") @@ -201,7 +201,7 @@ class LuiController(object): if defaultCard is not None: defaultCard = apis.ha_api.render_template(defaultCard) apis.ha_api.log(f"Searching for the following page as defaultPage: {defaultCard}") - dstCard = self._config.searchCard(defaultCard) + dstCard = self._config.search_card(defaultCard) apis.ha_api.log(f"Result for the following page as defaultPage: {dstCard}") if dstCard is not None: self._previous_cards = [] @@ -285,7 +285,7 @@ class LuiController(object): dstCard = self._config.get_card_by_uuid(entity_id.replace('navigate.','')) # internal for navigation to nested pages else: - dstCard = self._config.searchCard(entity_id) + dstCard = self._config.search_card(entity_id) if dstCard is not None: if dstCard.hidden: self._previous_cards.append(self._current_card) diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index 3779f5c8..79e227eb 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -236,7 +236,7 @@ class LuiPagesGen(object): if entityType == "delete": return f"~{entityType}~~~~~" if entityType == "navigate": - page_search_res = self._config.searchCard(entityId) + page_search_res = self._config.search_card(entityId) if page_search_res is not None: name = name if name is not None else page_search_res.title text = get_translation(self._locale, "frontend.ui.card.button.press")