Skip to content

Commit fbd85f2

Browse files
committed
cleanup
replaced alot of print statements with g_log removed all the if statements for device_commands and made the values in the dropdown match the dictionary keys
1 parent 53a6239 commit fbd85f2

File tree

2 files changed

+61
-181
lines changed

2 files changed

+61
-181
lines changed

src/device_states.py

Lines changed: 0 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ def battery_state_update(device, format = "Celcius"):
4545

4646
if changes > 0:
4747
print("---- {} changes".format(changes))
48-
# print(battery_states)
4948
pass
5049

5150
return battery_states
@@ -139,50 +138,6 @@ def get_mem_info(device):
139138
return memdict
140139

141140

142-
# get mem info old
143-
# get mem info olddef get_mem_info(device):
144-
# get mem info old """ Returns Dictionary with Memory Details"""
145-
# get mem info old memavail = 0
146-
# get mem info old memfree = 0
147-
# get mem info old memtotal = 0
148-
# get mem info old
149-
# get mem info old try:
150-
# get mem info old mem_check = device.shell("cat /proc/meminfo")
151-
# get mem info old split = mem_check.splitlines(-1)
152-
# get mem info old memdict ={}
153-
# get mem info old for line in split:
154-
# get mem info old if 'MemTotal:' in line:
155-
# get mem info old size = kb2mb(int(line.split(" ")[-2]))
156-
# get mem info old memdict['MemTotal'] = f"{size}"
157-
# get mem info old memtotal = memdict['MemTotal']
158-
# get mem info old
159-
# get mem info old if 'MemFree:' in line:
160-
# get mem info old size = kb2mb(line.split(" ")[-2])
161-
# get mem info old
162-
# get mem info old memdict['MemFree'] = f"{size}"
163-
# get mem info old memfree = memdict['MemFree']
164-
# get mem info old
165-
# get mem info old
166-
# get mem info old
167-
# get mem info old
168-
# get mem info old perce= int(memavail) / int(memtotal) * 100
169-
# get mem info old memdict['Percentage']= round(perce)
170-
# get mem info old
171-
# get mem info old for x in device_list:
172-
# get mem info old if device_list[x]['ID'] == device:
173-
# get mem info old device_list[x].update({'MemAvailable':memavail})
174-
# get mem info old device_list[x].update({'MemFree':memfree})
175-
# get mem info old device_list[x].update({'Percentage':perce})
176-
# get mem info old # print(f"{x} Dictionary Updated with Memory Usage")
177-
# get mem info old
178-
# get mem info old return memdict
179-
# get mem info old
180-
# get mem info old except Exception as e:
181-
# get mem info old print(f"Error Getting Memory Info: {e}")
182-
# get mem info old return None
183-
184-
185-
186141

187142

188143
"""
@@ -191,50 +146,6 @@ def get_mem_info(device):
191146
-------------------------------------------------
192147
"""
193148

194-
## OLD WAY TO GET CPU USAGE with For loops..
195-
# def get_cpu_usge(device):
196-
# """
197-
# Get the CPU Usage of the Device(s)
198-
# - if cpuz doesnt calculate cpu then why should we???
199-
# """
200-
#
201-
# build = {}
202-
# thelist = {"cpu", "user", "nice", "sys", "idle"}
203-
# ok = device.shell("top -n1")
204-
#
205-
# split = ok.splitlines(-1)
206-
# complete = False
207-
# for line in split:
208-
# if not complete:
209-
# if "cpu" in line:
210-
# newline = line.split(" ")
211-
# complete = True
212-
# for x in newline:
213-
# if x:
214-
# final_split = x.split("%")
215-
# if final_split[-1] in thelist:
216-
# build[final_split[-1]] = final_split[0]
217-
#
218-
# result= int(build['user']) + int(build['sys'])
219-
# result = result / int(build['cpu'])
220-
# result=result*100
221-
# result = str(result)[0:2]
222-
#
223-
# if "." in result:
224-
# result = result.replace(".", "")
225-
#
226-
# """ Updating CPU Usage for Devices"""
227-
# for x in device_list:
228-
# if device_list[x]['ID'] == device:
229-
# device_list[x].update({'CPU USAGE':result})
230-
# # print(f"{x} Dictionary Updated with CPU Usage")
231-
# print(ok)
232-
#
233-
# print("---------")
234-
# return result
235-
236-
237-
238149
def get_cpu_usge(device):
239150
"""
240151
Get the CPU Usage of the Device(s)

0 commit comments

Comments
 (0)