From 3eee952a04272655cc7d7be56e97e1c824856aab Mon Sep 17 00:00:00 2001 From: swimIan Date: Tue, 8 Aug 2017 22:48:23 -0700 Subject: [PATCH] Add mashinstep, import mashin temp(infuse_temp) from beerxml, and put boil step ahead of whirlpool and chill steps. --- modules/recipe_import/beerxml.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/recipe_import/beerxml.py b/modules/recipe_import/beerxml.py index e9f17e0..91335d4 100644 --- a/modules/recipe_import/beerxml.py +++ b/modules/recipe_import/beerxml.py @@ -51,6 +51,8 @@ class BeerXMLImport(FlaskView): name = self.getRecipeName(id) self.api.set_config_parameter("brew_name", name) boil_time = self.getBoilTime(id) + infuse = self.getMashinTemp(id) + mashinstep_type = cbpi.get_config_parameter("step_mashin", "MashInStep") mashstep_type = cbpi.get_config_parameter("step_mash", "MashStep") mash_kettle = cbpi.get_config_parameter("step_mash_kettle", None) @@ -64,6 +66,8 @@ class BeerXMLImport(FlaskView): try: + ## Add Mashin step + Step.insert(**{"name": "MashIn", "type": mashinstep_type, "config": {"kettle": mash_kettle, "temp": infuse}}) for row in steps: Step.insert(**{"name": row.get("name"), "type": mashstep_type, "config": {"kettle": mash_kettle, "temp": float(row.get("temp")), "timer": row.get("timer")}}) Step.insert(**{"name": "ChilStep", "type": "ChilStep", "config": {"timer": 15}}) @@ -87,6 +91,14 @@ class BeerXMLImport(FlaskView): e = xml.etree.ElementTree.parse(self.BEER_XML_FILE).getroot() return float(e.find('./RECIPE[%s]/BOIL_TIME' % (str(id))).text) +def getMashinTemp(self, id): + e = xml.etree.ElementTree.parse(self.BEER_XML_FILE).getroot() + tempstr = e.find('./RECIPE[%s]/MASH/MASH_STEPS/MASH_STEP/INFUSE_TEMP' % (str(id))).text + val = tempstr[:-1] + infuse = float(val.rstrip()) + + return infuse + def getSteps(self, id):