battery states

simplified getting battery info

Author: gitagogaming

src/adb_globals.py

@@ -65,18 +65,24 @@ def bat_state_conver(choice, num):
 
 
 def match_device(name):
-    """ Returns the device ID associated with the device name"""
+    """ 
+    Returns the device ID associated with the device name
+    """
     return device_list[name]['ID']
 
 
 def kb2mb(num):
+    """
+    Converts KB to MB 
+    """
     return int(num) // 1024
 
 
 
 
 def out(command):
-    """Power Shell Func
+    """
+    Power Shell Func
     - Checking Devices Test
     """
     systemencoding = windll.kernel32.GetConsoleOutputCP()

src/device_states.py

@@ -9,45 +9,57 @@
 -------------------------------------------------
 """
 
-battery_states_final={}
-def battery_state_update(device, format = "Celcius"):
-    """ Returns Dictionary with Full Battery Details """
-    battery_states = {"temperature": "", "level": "", "voltage":"", "status":"", "health": "",
-                      "AC powered": "", "USB powered": "", "Wireless powered":"",  "present": ""}
+def battery_state_update(device: object, format: str = "Celcius"):
+    battery_info = {}
+    output = (device.shell('dumpsys battery'))
 
-    ok=(device.shell('dumpsys battery'))
-    buf = StringIO(ok)
-    changes = 0
-    for line2 in buf.readlines():
-        line = line2.strip()
-        if "Max charging voltage" in line:
-            pass
-        else:
-            for state, value in battery_states.items():
-                m = re.search(r'{}:(.*)'.format(state), line)
-                if m:
-                    if value != m.group(1):
-                        changes += 1
-                       # print("changed: state={} old={} new={}".format(state, value, m.group(1)))
-
-                        battery_states[state] = m.group(1).lstrip()
-
-        # Taking Battery Health/Status and Turning into "result"""
-        if "vendor.samsung.hardware" in battery_states['health']:
-            extract_health= (battery_states['health'].split("::")[0].replace("vendor.samsung.hardware.health@",""))
-            battery_states['health'] = str(round(float(extract_health)))
-
-    # Converting Battery Status Number to String
-    try:
-        battery_states['status'] = bat_state_conver(choice='status',num=int(battery_states['status']))
-    except:
-        print("Unable to Convert Status, Check Results")
-        
-    if changes > 0:
-        print("---- {} changes".format(changes))
-        pass
-    
-    return battery_states
+    for line in output.splitlines():
+        if ":" in line:
+            key, value = line.split(":", 1)
+            battery_info[key.strip()] = value.strip()
+
+    battery_info['status'] = bat_state_conver(choice='status',num=int(battery_info['status']))
+    return battery_info
+
+#battery_states_final={}
+#def battery_state_update(device, format = "Celcius"):
+#    """ Returns Dictionary with Full Battery Details """
+#    battery_states = {"temperature": "", "level": "", "voltage":"", "status":"", "health": "",
+#                      "AC powered": "", "USB powered": "", "Wireless powered":"",  "present": ""}
+#    
+#    ok=(device.shell('dumpsys battery'))
+#    buf = StringIO(ok)
+#    changes = 0
+#    for line2 in buf.readlines():
+#        line = line2.strip()
+#        if "Max charging voltage" in line:
+#            pass
+#        else:
+#            for state, value in battery_states.items():
+#                m = re.search(r'{}:(.*)'.format(state), line)
+#                if m:
+#                    if value != m.group(1):
+#                        changes += 1
+#                       # print("changed: state={} old={} new={}".format(state, value, m.group(1)))
+#
+#                        battery_states[state] = m.group(1).lstrip()
+#
+#        # Taking Battery Health/Status and Turning into "result"""
+#        if "vendor.samsung.hardware" in battery_states['health']:
+#            extract_health= (battery_states['health'].split("::")[0].replace("vendor.samsung.hardware.health@",""))
+#            battery_states['health'] = str(round(float(extract_health)))
+#
+#    # Converting Battery Status Number to String
+#    try:
+#        battery_states['status'] = bat_state_conver(choice='status',num=int(battery_states['status']))
+#    except:
+#        print("Unable to Convert Status, Check Results")
+#        
+#    if changes > 0:
+#        print("---- {} changes".format(changes))
+#        pass
+#    
+#    return battery_states
 
 
 

src/main.py

@@ -179,6 +179,8 @@ def create_states():
         "value": bat_state_conver(choice='health',num=int(device['health'])),
         'parentGroup': device['Model']
         },
+        ## add "AC powered", "USB powered", "Wireless powered"
+        
         {
         "id": PLUGIN_ID + f'.device.{device["Model"]}.cpu_usage',
         "desc": f"{device['Model']} CPU Usage",
@@ -292,9 +294,8 @@ def state_loop_update():
         for x in device_list:
             device_states.get_cpu_usge(device_list[x]['ID'])
             device_states.get_mem_info(device_list[x]['ID'])
-            
             ## have not decided to loop for battery % yet.. until someone notices?? 
-          #  device_states.battery_state_update(device_list[x]['ID'])
+            device_states.battery_state_update(device_list[x]['ID'])
         create_states()
         time.sleep(5)