From cad063e6a3282032f4a121015112fc53c1a3c54a Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Tue, 13 Jul 2021 07:07:55 +0200 Subject: [PATCH] some fixes - improved handling of 'empty' config paramaters - improved handling of bf recipes where a step has no name --- cbpi/controller/config_controller.py | 2 +- cbpi/controller/upload_controller.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cbpi/controller/config_controller.py b/cbpi/controller/config_controller.py index f9b8a00..65d0298 100644 --- a/cbpi/controller/config_controller.py +++ b/cbpi/controller/config_controller.py @@ -35,7 +35,7 @@ class ConfigController: def get(self, name, default=None): self.logger.debug("GET CONFIG VALUE %s (default %s)" % (name, default)) - if name in self.cache and self.cache[name].value is not None: + if name in self.cache and self.cache[name].value is not None and self.cache[name].value != "": return self.cache[name].value else: return default diff --git a/cbpi/controller/upload_controller.py b/cbpi/controller/upload_controller.py index 94f46eb..395a6d9 100644 --- a/cbpi/controller/upload_controller.py +++ b/cbpi/controller/upload_controller.py @@ -438,7 +438,13 @@ class UploadController: MashIn_Flag = True step_kettle = self.id for step in mash_steps: - step_name = step['name'] + try: + step_name = step['name'] + if step_name == "": + step_name = "MashStep" + except: + step_name = "MashStep" + step_timer = str(int(step['stepTime'])) if self.TEMP_UNIT == "C":