From 76b11a7247ebf5c0ec37d56675a31ed0423a9bc6 Mon Sep 17 00:00:00 2001
From: prash3r <github@prash3r.de>
Date: Fri, 2 Sep 2022 18:17:08 +0200
Subject: [PATCH] =?UTF-8?q?imports=20the=20whirlpool=20hop=20addition=20kb?=
 =?UTF-8?q?h=20with=20timer=20previously=20the=20whirlpool=20step=20has=20?=
 =?UTF-8?q?been=20ignored=20when=20importing=20from=20a=20kbh=20database.?=
 =?UTF-8?q?=20on=20creation=20the=20whirlpoolstep=20would=20only=20be=20on?=
 =?UTF-8?q?=20a=20hardcoded=2015=20minute=20timer.=20I=20added=20the=20opt?=
 =?UTF-8?q?ional=20timer=20as=20argument=20to=20create=5FWhirlpool=5FCoold?=
 =?UTF-8?q?own().=20And=20made=20use=20of=20it=20for=20negative=20hops=20t?=
 =?UTF-8?q?imer=20imported=20from=20KBH.=20For=20KBH=20databases=20this=20?=
 =?UTF-8?q?is=20valid=20because=20if=20the=20hops=20timer=20value=20is=20n?=
 =?UTF-8?q?egative=20it=20can=20only=20be=20the=20whirlpool=20timer=20and?=
 =?UTF-8?q?=20the=20value=20is=20the=20time=20that=20is=20set=20for=20the?=
 =?UTF-8?q?=20brewing=20device=20for=20getting=20from=20boil=20to=20below?=
 =?UTF-8?q?=2080=C2=B0C.=20I=20did=20only=20test=20the=20data=20and=20not?=
 =?UTF-8?q?=20the=20functionality,=20but=20it=20sucessfully=20replaces=20t?=
 =?UTF-8?q?he=20hardcoded=20"15"=20timer=20with=20the=20value=20from=20the?=
 =?UTF-8?q?=20first=20whirlpool=20hop=20addition=20while=20getting=20rid?=
 =?UTF-8?q?=20of=20the=20sign.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cbpi/controller/upload_controller.py | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/cbpi/controller/upload_controller.py b/cbpi/controller/upload_controller.py
index f0a32c2..2379faf 100644
--- a/cbpi/controller/upload_controller.py
+++ b/cbpi/controller/upload_controller.py
@@ -193,8 +193,19 @@ class UploadController:
                     pass
 
                 # get the hop addition times
-                c.execute('SELECT Zeit FROM Hopfengaben WHERE Vorderwuerze <> 1 AND Vorderwuerze <> 5 AND SudID = ?', (Recipe_ID,))
+                c.execute('SELECT Zeit FROM Hopfengaben WHERE Vorderwuerze <> 1 AND SudID = ?', (Recipe_ID,))
                 hops = c.fetchall()
+                whirlpool = []
+                for hop in hops:
+                    if hop[0] < 0:
+                        whirlpool.append(hop)
+                for whirl in whirlpool:
+                    hops.remove(whirl)
+
+                print(whirlpool)
+                print(hops)
+                
+
 
                 # get the misc addition times
                 c.execute('SELECT Zugabedauer FROM WeitereZutatenGaben WHERE Zeitpunkt = 1 AND SudID = ?', (Recipe_ID,))
@@ -307,7 +318,7 @@ class UploadController:
 
                 await self.create_step(step_string)
 
-                await self.create_Whirlpool_Cooldown()
+                await self.create_Whirlpool_Cooldown(str(abs(whirlpool[0][0]))) # from kbh this value comes as negative but must be positive
  
                 self.cbpi.notify('KBH Recipe created', name, NotificationType.INFO)
 
@@ -946,13 +957,13 @@ class UploadController:
                 alert="Yes"
         return alert
 
-    async def create_Whirlpool_Cooldown(self):
+    async def create_Whirlpool_Cooldown(self, time : str = "15"):
         # Add Waitstep as Whirlpool
         if self.cooldown != "WaiStep" and self.cooldown !="":
             step_string = { "name": "Whirlpool",
                             "props": {
                                 "Kettle": self.boilid,
-                                "Timer": "15"
+                                "Timer": time
                                 },
                             "status_text": "",
                             "status": "I",
@@ -965,7 +976,7 @@ class UploadController:
         step_name = "CoolDown"
         cooldown_sensor = ""
         step_temp = ""
-        step_timer = "15"
+        step_timer = time
         if step_type == "CooldownStep":
             cooldown_sensor = self.cbpi.config.get("steps_cooldown_sensor", None)
             if cooldown_sensor is None or cooldown_sensor == '':