vergnet/application-amicale-serveur
1
0
Fork 1
Code Issues Pull requests 1 Releases Wiki Activity

Prevent duplicate machines

Browse source
This commit is contained in:
Arnaud Vergnet 2021-05-09 11:03:23 +02:00
parent 091bed7fa5
commit 33fd3a4668
1 changed files with 38 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
washinsa/washinsa_handler.py
View file

@ -181,40 +181,51 @@ def get_machine_remaining_time(row):
return time return time
def is_machine_parsed(dryers, washers, number):
for m in dryers:
if m["number"] == number:
return True
for m in washers:
if m["number"] == number:
return True
return False
def get_parsed_data(rows): def get_parsed_data(rows):
""" """
Gets the parsed data from the web page, farmatting it in a easy to use object Gets the parsed data from the web page, formatting it in a easy to use object
""" """
dryers = [] dryers = []
washers = [] washers = []
for row in rows: for row in rows:
state = get_machine_state(row) machine_number = get_machine_number(row)
machine = { if not is_machine_parsed(dryers, washers, machine_number):
"number": get_machine_number(row), state = get_machine_state(row)
"state": state.value, machine = {
"maxWeight": get_machine_weight(row), "number": machine_number,
"startTime": "", "state": state.value,
"endTime": "", "maxWeight": get_machine_weight(row),
"donePercent": "", "startTime": "",
"remainingTime": "", "endTime": "",
"program": "", "donePercent": "",
} "remainingTime": "",
if state == State.RUNNING: "program": "",
machine_times = get_machine_times(row) }
machine["startTime"] = machine_times[0] if state == State.RUNNING:
machine["endTime"] = machine_times[1] machine_times = get_machine_times(row)
if len(machine_times[0]) == 0: machine["startTime"] = machine_times[0]
state = State.RUNNING_NOT_STARTED machine["endTime"] = machine_times[1]
machine["state"] = state.value if len(machine_times[0]) == 0:
machine["program"] = get_machine_program(row) state = State.RUNNING_NOT_STARTED
machine["donePercent"] = get_machine_done_percent(row) machine["state"] = state.value
machine["remainingTime"] = get_machine_remaining_time(row) machine["program"] = get_machine_program(row)
machine["donePercent"] = get_machine_done_percent(row)
if is_machine_dryer(row): machine["remainingTime"] = get_machine_remaining_time(row)
dryers.append(machine)
else:
washers.append(machine)
if is_machine_dryer(row):
dryers.append(machine)
else:
washers.append(machine)
return { return {
"dryers": dryers, "dryers": dryers,
"washers": washers "washers": washers