Efficiency Updates

Changed from using for loops to get CPU / Mem usage to using Regex and or grep directly

Changed how to get sleep state of device and now only use Grep instead of a for loop

If `MEMAVAILABLE` isnt found then we will use MemFree instead, this may result in inaccurate memory calculation.

Author: gitagogaming

src/device_states.py

@@ -97,50 +97,89 @@ def get_screen_info(device_choice):
 -------------------------------------------------
 """
 
+
+import re
+
 def get_mem_info(device):
     """ Returns Dictionary with Memory Details"""
-    memavail = 0
-    memfree = 0
-    memtotal = 0
+    memdict = {}
 
-    try:
-        mem_check = device.shell("cat /proc/meminfo")
-        split = mem_check.splitlines(-1)
-        memdict ={}
-        for line in split:
-            if 'MemTotal:' in line:
-                size = kb2mb(int(line.split(" ")[-2]))
-                memdict['MemTotal'] = f"{size}"
-                memtotal = memdict['MemTotal']
-                
-            if 'MemFree:' in line:
-                size = kb2mb(line.split(" ")[-2])
-                memdict['MemFree'] = f"{size}"
-                memfree = memdict['MemFree']
-
-            if 'MemAvailable:' in line:
-                size = kb2mb(line.split(" ")[-2])
-                memdict['MemAvailable'] = f"{size}"
-                memavail = memdict['MemAvailable']
-
-
-           # print(memdict)
-            """Had to do this to get it to round?"""
-        perce= int(memavail) / int(memtotal) * 100
-        memdict['Percentage']= round(perce)
-
-        for x in device_list:
-            if device_list[x]['ID'] == device:
-                device_list[x].update({'MemAvailable':memavail})
-                device_list[x].update({'MemFree':memfree})
-                device_list[x].update({'Percentage':perce})
-              #  print(f"{x} Dictionary Updated with Memory Usage")
-
-        return memdict
+    # Use regular expressions to extract the relevant values from the output of the "cat /proc/meminfo" command
+    output = device.shell("cat /proc/meminfo")
+    match = re.search(r'MemTotal:\s+(\d+)\skB\nMemFree:\s+(\d+)\skB\nMemAvailable:\s+(\d+)\skB', output)
+    if match:
+        memtotal, memfree, memavail = map(int, match.groups())
+    else:
+        # If the MemAvailable value is not found, use the MemFree value as a fallback
+        match = re.search(r'MemTotal:\s+(\d+)\skB\nMemFree:\s+(\d+)\skB', output)
+        memtotal, memfree = map(int, match.groups())
+        memavail = memfree
 
-    except Exception as e:
-        print(f"Error Getting Memory Info: {e}")
-        return None
+    # Convert the values from kB to MB
+    memtotal_mb = kb2mb(memtotal)
+    memfree_mb = kb2mb(memfree)
+    memavail_mb = kb2mb(memavail)
+
+    # Calculate the percentage of available memory
+    percent = memavail_mb / memtotal_mb * 100
+
+    # Update the dictionary with the calculated values
+    memdict['MemTotal'] = int(memtotal_mb)
+    memdict['MemFree'] = int(memfree_mb)
+    memdict['MemAvailable'] = int(memavail_mb)
+    memdict['Percentage'] = round(percent)
+
+    # Update the device list with the calculated values
+    for x in device_list:
+        if device_list[x]['ID'] == device:
+            device_list[x].update({'MemAvailable': memavail_mb})
+            device_list[x].update({'MemFree': memfree_mb})
+            device_list[x].update({'Percentage': percent})
+            # print(f"{x} Dictionary Updated with Memory Usage")
+    return memdict
+
+
+# get mem info old
+# get mem info olddef get_mem_info(device):
+# get mem info old    """ Returns Dictionary with Memory Details"""
+# get mem info old    memavail = 0
+# get mem info old    memfree = 0
+# get mem info old    memtotal = 0
+# get mem info old    
+# get mem info old    try:
+# get mem info old        mem_check = device.shell("cat /proc/meminfo")
+# get mem info old        split = mem_check.splitlines(-1)
+# get mem info old        memdict ={}
+# get mem info old        for line in split:
+# get mem info old            if 'MemTotal:' in line:
+# get mem info old                size = kb2mb(int(line.split(" ")[-2]))
+# get mem info old                memdict['MemTotal'] = f"{size}"
+# get mem info old                memtotal = memdict['MemTotal']
+# get mem info old                
+# get mem info old            if 'MemFree:' in line:
+# get mem info old                size = kb2mb(line.split(" ")[-2])
+# get mem info old                
+# get mem info old                memdict['MemFree'] = f"{size}"
+# get mem info old                memfree = memdict['MemFree']
+# get mem info old
+# get mem info old
+# get mem info old
+# get mem info old  
+# get mem info old        perce= int(memavail) / int(memtotal) * 100
+# get mem info old        memdict['Percentage']= round(perce)
+# get mem info old
+# get mem info old        for x in device_list:
+# get mem info old            if device_list[x]['ID'] == device:
+# get mem info old                device_list[x].update({'MemAvailable':memavail})
+# get mem info old                device_list[x].update({'MemFree':memfree})
+# get mem info old                device_list[x].update({'Percentage':perce})
+# get mem info old              #  print(f"{x} Dictionary Updated with Memory Usage")
+# get mem info old
+# get mem info old        return memdict
+# get mem info old    
+# get mem info old    except Exception as e:
+# get mem info old        print(f"Error Getting Memory Info: {e}")
+# get mem info old        return None
 
 
 
@@ -152,39 +191,71 @@ def get_mem_info(device):
 -------------------------------------------------
 """
 
+## OLD WAY TO GET CPU USAGE with For loops..
+# def get_cpu_usge(device):
+#     """ 
+#     Get the CPU Usage of the Device(s) 
+#     - if cpuz doesnt calculate cpu then why should we???
+#     """
+#     
+#     build = {}
+#     thelist = {"cpu", "user", "nice", "sys", "idle"}
+#     ok = device.shell("top -n1")
+#     
+#     split = ok.splitlines(-1)
+#     complete = False
+#     for line in split:
+#         if not complete:
+#             if "cpu" in line:
+#                 newline = line.split(" ")
+#                 complete = True
+#                 for x in newline:
+#                     if x:
+#                         final_split = x.split("%")
+#                         if final_split[-1] in thelist:
+#                             build[final_split[-1]] = final_split[0]
+# 
+#                 result= int(build['user']) + int(build['sys'])
+#                 result = result / int(build['cpu'])
+#                 result=result*100
+#                 result = str(result)[0:2]
+#                 
+#                 if "." in result:
+#                     result = result.replace(".", "")
+# 
+#     """ Updating CPU Usage for Devices"""
+#     for x in device_list:
+#         if device_list[x]['ID'] == device:
+#             device_list[x].update({'CPU USAGE':result})
+#            # print(f"{x} Dictionary Updated with CPU Usage")
+#     print(ok)
+#     
+#     print("---------")
+#     return result
+
+
+
 def get_cpu_usge(device):
     """ 
     Get the CPU Usage of the Device(s) 
+    - if cpuz doesnt calculate cpu then why should we???
     """
 
-    build = {}
-    thelist = {"cpu", "user", "nice", "sys", "idle"}
-    ok = device.shell("top -n1")
-    split = ok.splitlines(-1)
-    complete = False
-    for line in split:
-        if not complete:
-            if "cpu" in line:
-                newline = line.split(" ")
-                complete = True
-                for x in newline:
-                    if x:
-                        final_split = x.split("%")
-                        if final_split[-1] in thelist:
-                            build[final_split[-1]] = final_split[0]
-
-                result= int(build['user']) + int(build['sys'])
-                result = result / int(build['cpu'])
-                result=result*100
-                result = str(result)[0:2]
-                
-                if "." in result:
-                    result = result.replace(".", "")
-
-    """ Updating CPU Usage for Devices"""
-    for x in device_list:
-        if device_list[x]['ID'] == device:
-            device_list[x].update({'CPU USAGE':result})
-           # print(f"{x} Dictionary Updated with CPU Usage")
-           
+    output = device.shell("top -n1")
+    
+    match =  re.search(r'(\d+%)cpu\s+(\d+%)user\s+(\d+%)nice\s+(\d+%)sys\s+(\d+%)idle', output)
+    
+    if match:
+        ## assigning the values to variables
+        cpu, user, nice, sys, idle = match.groups()
+        
+        ## stripping the '%' and splitting the values
+        cpu = int(cpu.strip('%').split()[0])
+        user = int(user.strip('%').split()[0])
+        sys = int(sys.strip('%').split()[0])
+        
+        ## calculating the Approximate CPU usage on Device
+        result = (int(user) + int(sys)) / int(cpu) * 100
+        result = str(result)[:2]
+    
     return result

src/main.py

@@ -1,7 +1,6 @@
 """
 Gitago - TouchPortal Android ADB
 """
-__version__ = "1.0"
 
 from adb_globals import *
 import device_states
@@ -105,9 +104,9 @@ def create_states():
         temp_formatted = format_temperature(device, "Fahrenheit")
 
         cpu_usage = device.get('CPU USAGE')
-        memfree=""
-        first_math = (int(device['MemTotal']) / int(device['MemFree']))
-        memfree = first_math*10
+      # memfree=""
+      # first_math = (int(device['MemTotal']) / int(device['MemFree']))
+      # memfree = first_math*10
 
 
         TPClient.createStateMany([
@@ -184,9 +183,9 @@ def create_states():
         'parentGroup': device['Model']
         },
         {
-        "id": PLUGIN_ID + f'.device.{device["Model"]}.MemoryFree',
-        "desc": f"{device['Model']} Memory Free",
-        "value": str(round(memfree)),
+        "id": PLUGIN_ID + f'.device.{device["Model"]}.MemoryAvailable',
+        "desc": f"{device['Model']} Memory Available",
+        "value": device['MemAvailable'],
         'parentGroup': device['Model']
         },
         {
@@ -326,36 +325,44 @@ def adjust_brightness(device:object, level)-> None:
 
 
 """ Check Sleep State """
+
 def check_sleep(device:object):
-    try:
-       # ok=(device.shell('dumpsys power | grep "mHolding"'))
-       ### we could find out phone boot time here also.... so if phone has been on more than X hours they can reboot maybe?
-       
-        sleep_state =(device.shell("dumpsys nfc | grep 'mScreenState='"))
-        
-        if not sleep_state:
-            sleep_state = device.shell("dumpsys nfc | grep 'Screen State'")
-            sleep_state = sleep_state.split(":")[-1]
-        buf = StringIO(sleep_state)
-        changes = 0
-        
-        """ This was used when grep mHolding"""
-     ###  for line2 in buf.readlines():
-     ###      line = line2.strip()
-     ###      for state, value in sleep_states.items():
-     ###          m = re.search(r'{}=(.*)'.format(state), line)
-     ###          if m:
-     ###              if value != m.group(1):
-     ###                  changes += 1
-     ###                  # print("SLEEP STATE CHANGED: state={} old={} new={}".format(state, value, m.group(1)))
-     ###                  sleep_states[state] = m.group(1)
-     ###       if changes > 0:
-               #pass
-     ###          print("---- {} Sleepstate changes".format(changes))
-     ###       return sleep_states
-        return sleep_state
-    except RuntimeError as err:
-        print(" error on check_sleep... ", err)
+    #output = device.shell('dumpsys power | grep -e "mWakefulness=" -e "Display Power"')
+    output = device.shell('dumpsys power | grep -e "mWakefulness="')
+    output = output.split("=")[-1]
+    return output
+
+# def check_sleep2(device:object):
+#     try:
+#        # ok=(device.shell('dumpsys power | grep "mHolding"'))
+#        ### we could find out phone boot time here also.... so if phone has been on more than X hours they can reboot maybe?
+#        
+#         sleep_state =(device.shell("dumpsys nfc | grep 'mScreenState='"))
+#         print(sleep_state)
+#         if not sleep_state:
+#             
+#             sleep_state = device.shell("dumpsys nfc | grep 'Screen State'")
+#             sleep_state = sleep_state.split(":")[-1]
+#         buf = StringIO(sleep_state)
+#         changes = 0
+#         
+#         """ This was used when grep mHolding"""
+#      ###  for line2 in buf.readlines():
+#      ###      line = line2.strip()
+#      ###      for state, value in sleep_states.items():
+#      ###          m = re.search(r'{}=(.*)'.format(state), line)
+#      ###          if m:
+#      ###              if value != m.group(1):
+#      ###                  changes += 1
+#      ###                  # print("SLEEP STATE CHANGED: state={} old={} new={}".format(state, value, m.group(1)))
+#      ###                  sleep_states[state] = m.group(1)
+#      ###       if changes > 0:
+#                #pass
+#      ###          print("---- {} Sleepstate changes".format(changes))
+#      ###       return sleep_states
+#         return sleep_state
+#     except RuntimeError as err:
+#         print(" error on check_sleep... ", err)