python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-06-19 00:17:51 +02:00
Code Issues Releases Activity

working parser

Browse Source
This commit is contained in:
Kelly Brazil
2021-03-11 20:43:31 -08:00
parent 58645301ec
commit 322da9ea6a
2 changed files with 59 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
jc/parsers/acpi.py
View File

@ -109,49 +109,62 @@ def parse(data, raw=False, quiet=False):
output_line = {} output_line = {}
line_state = '' line_state = ''
last_line_state = '' last_line_state = ''
obj_type = ''
obj_id = ''
trip_points_list = []
trip_points_dict = {}
messages_list = []
if jc.utils.has_data(data): if jc.utils.has_data(data):
for line in filter(None, data.splitlines()): for line in filter(None, data.splitlines()):
obj_type = line.split()[0]
obj_id = line.split()[1][:-1]
line_state = obj_type + obj_id
if line.startswith('Battery'): if line.startswith('Battery'):
line_state = 'battery'
if line_state != last_line_state: if line_state != last_line_state:
if output_line: if output_line:
raw_output.append(output_line) raw_output.append(output_line)
last_line_state = line_state last_line_state = line_state
output_line = {} output_line = {}
trip_points_list = []
messages_list = []
if line.startswith('Adapter'): if line.startswith('Adapter'):
line_state = 'adapter'
if line_state != last_line_state: if line_state != last_line_state:
if output_line: if output_line:
raw_output.append(output_line) raw_output.append(output_line)
last_line_state = line_state last_line_state = line_state
output_line = {} output_line = {}
trip_points_list = []
messages_list = []
if line.startswith('Thermal'): if line.startswith('Thermal'):
line_state = 'thermal'
if line_state != last_line_state: if line_state != last_line_state:
if output_line: if output_line:
raw_output.append(output_line) raw_output.append(output_line)
last_line_state = line_state last_line_state = line_state
output_line = {} output_line = {}
trip_points_list = []
messages_list = []
if line.startswith('Cooling'): if line.startswith('Cooling'):
line_state = 'cooling'
if line_state != last_line_state: if line_state != last_line_state:
if output_line: if output_line:
raw_output.append(output_line) raw_output.append(output_line)
last_line_state = line_state last_line_state = line_state
output_line = {} output_line = {}
trip_points_list = []
messages_list = []
if line_state == 'battery': if obj_type == 'Battery':
output_line['type'] = 'battery' output_line['type'] = obj_type
output_line['id'] = line.split()[1][:-1] output_line['id'] = obj_id
if 'Charging' in line: if 'Charging' in line:
output_line['state'] = line.split()[2][:-1] output_line['state'] = line.split()[2][:-1]
output_line['charge_percent'] = line.split()[3][:-2] output_line['charge_percent'] = line.split()[3][:-2]
@ -169,18 +182,48 @@ def parse(data, raw=False, quiet=False):
if 'rate information unavailable' not in line: if 'rate information unavailable' not in line:
output_line['charge_remaining'] = line.split()[4] output_line['charge_remaining'] = line.split()[4]
last_line_state = line_state
continue continue
if line_state == 'adapter': if obj_type == 'Adapter':
output_line['type'] = obj_type
output_line['id'] = obj_id
if 'on-line' in line:
output_line['on-line'] = True
else:
output_line['on-line'] = False
last_line_state = line_state
continue continue
if line_state == 'thermal': if obj_type == 'Thermal':
output_line['type'] = obj_type
output_line['id'] = obj_id
if 'trip point' not in line:
output_line['mode'] = line.split()[2][:-1]
output_line['temperature'] = line.split()[3]
output_line['temperature_unit'] = line.split()[-1]
else:
trip_points_dict = {
"id": line.split()[4],
"switches_to_mode": line.split()[8],
"temperature": line.split()[11],
"temperature_unit": line.split()[-1]
}
trip_points_list.append(trip_points_dict)
output_line['trip_points'] = trip_points_list
last_line_state = line_state
continue continue
if line_state == 'cooling': if obj_type == 'Cooling':
continue output_line['type'] = obj_type
output_line['id'] = obj_id
messages_list.append(line.split(maxsplit=2)[2])
output_line['messages'] = messages_list
last_line_state = line_state last_line_state = line_state
continue
if output_line: if output_line:
raw_output.append(output_line) raw_output.append(output_line)

4
tests/fixtures/generic/acpi-V.out vendored
View File

@ -8,9 +8,13 @@ Adapter 1: off-line
Thermal 0: ok, 46.0 degrees C Thermal 0: ok, 46.0 degrees C
Thermal 0: trip point 0 switches to mode critical at temperature 127.0 degrees C Thermal 0: trip point 0 switches to mode critical at temperature 127.0 degrees C
Thermal 0: trip point 1 switches to mode hot at temperature 127.0 degrees C Thermal 0: trip point 1 switches to mode hot at temperature 127.0 degrees C
Thermal 1: ok, 55.0 degrees C
Thermal 1: trip point 0 switches to mode critical at temperature 130.0 degrees C
Thermal 1: trip point 1 switches to mode hot at temperature 100.0 degrees C
Cooling 0: Processor 0 of 10 Cooling 0: Processor 0 of 10
Cooling 1: Processor 0 of 10 Cooling 1: Processor 0 of 10
Cooling 2: x86_pkg_temp no state information available Cooling 2: x86_pkg_temp no state information available
Cooling 3: Processor 0 of 10 Cooling 3: Processor 0 of 10
Cooling 4: intel_powerclamp no state information available Cooling 4: intel_powerclamp no state information available
Cooling 4: another message
Cooling 5: Processor 0 of 10 Cooling 5: Processor 0 of 10