Refactor

src/pytevolve.py

@@ -23,6 +23,7 @@ class Tevolve:
         self.token_primary = ""
         self.token_refresh = ""
         self.sid = ""
+        self.devices = []
 
     setmode = ""
     setTemperature = ""
@@ -112,13 +113,16 @@ class Tevolve:
 
 
     def get_devices(self):
-        endpoint = "/devs/082e858131ff012c51/mgr/nodes"
+        endpoint = "/devs/"+self.dev_id+"/mgr/nodes"
 
-        header = {"Authorization": "Bearer " + self.token_primary}
+        header = {'content-type': 'application/json',
+                  "Authorization": "Bearer " + self.token_primary}
 
-        devices_request = requests.get(str(self.api_url + endpoint), headers=headers).json()
+        devices_request = requests.get(str(self.api_url + endpoint), headers=header).json()
 
-        print(devices_request)
+        self.devices = devices_request
+
+        return self.devices
 
 
 
@@ -222,8 +226,8 @@ class Tevolve:
         if response.status_code == 201 or response.status_code == 200:
             pass
 
-    @staticmethod
-    def get_mode(heater_id):
+
+    def get_mode(self):
         headers = {
             'host': 'api-tevolve.termoweb.net',
             'origin': 'https://tevolve.termoweb.net',
@@ -231,11 +235,11 @@ class Tevolve:
             'accept': 'application/json, text/plain, */*',
             'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) '
                           'Version/15.4 Safari/605.1.15',
-            'authorization': 'Bearer ' + Tevolve.token,
+            'authorization': 'Bearer ' + self.token_primary,
             'referer': 'https://tevolve.termoweb.net/',
 
         }
-        url = "https://api-tevolve.termoweb.net/api/v2/devs/082e858131ff012c51/htr/" + heater_id + "/status"
+        url = "https://api-tevolve.termoweb.net/api/v2/devs/082e858131ff012c51/htr/" + self.heater_id + "/status"
 
         response = requests.get(url, headers=headers)
         if response.status_code == 201 or response.status_code == 200:
@@ -244,7 +248,7 @@ class Tevolve:
                 return "heat"
 
 
-    def get_status(self):
+    def get_status(self, heater_id):
 
         headers = {
             'host': 'api-tevolve.termoweb.net',
@@ -257,7 +261,7 @@ class Tevolve:
             'referer': 'https://tevolve.termoweb.net/',
 
         }
-        url = "https://api-tevolve.termoweb.net/api/v2/devs/082e858131ff012c51/status"
+        url = "https://api-tevolve.termoweb.net/api/v2/devs/"+self.dev_id+"/htr/"+str(heater_id)+"/status"
 
         response = requests.get(url, headers=headers)
         if response.status_code == 201 or response.status_code == 200:
@@ -297,8 +301,14 @@ if __name__ == '__main__':
 
     test.get_devices()
 
+
+    for device in test.devices["nodes"]:
+        if device["name"] == "Hallway":
+            test.get_status(device["addr"])
+
     test.get_sid()
-    test.get_status()
+
+
     test.post_websocket()
     test.create_websocket()