einar/scripts
1
0
Fork 0
Code Releases Activity

Make sure the trip is properly merged

Browse source 
Clean up and make the code more readable.
This commit is contained in:
Luca Beltrame 2020-02-16 10:10:36 +01:00
parent b6180d2eef
commit e27f33b2d0
Signed by: einar
GPG key ID: 8DF631FD021DB0C5
1 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
tripit_add.py
View file

@ -78,6 +78,21 @@ def _convert_datetimes(segment: int) -> List[str]:
return date, time return date, time
def _parse_record(segment: dict) -> Tuple[str]:
start_station = segment["start_station"].title()
start_date, start_time = _convert_datetimes(segment["start_time"])
end_station = segment["end_station"].title()
end_date, end_time = _convert_datetimes(segment["end_time"])
train_type = segment["train_name"]
train_number = ("" if segment.get("train_number") is None
else segment["train_number"])
return (start_station, start_date, start_time, end_station, end_date,
end_time, train_type, train_number)
def parse_json(json_data: dict, carrier: str = None, def parse_json(json_data: dict, carrier: str = None,
result_number: int = None) -> str: result_number: int = None) -> str:
@ -89,47 +104,43 @@ def parse_json(json_data: dict, carrier: str = None,
iter_records = mlt.peekable(record["steps"]) iter_records = mlt.peekable(record["steps"])
previous_record = defaultdict(None) previous_record = None
for segment in iter_records: for segment in iter_records:
start_station = segment["start_station"].title() parsed = _parse_record(segment)
start_date, start_time = _convert_datetimes(segment["start_time"])
end_station = segment["end_station"].title()
end_date, end_time = _convert_datetimes(segment["end_time"])
start_station, start_date, start_time, *rest = parsed
end_station, end_date, end_time, *rest = rest
train_type, train_number = rest
# FIXME: Impossible to extract it from the current Hyperdia data # FIXME: Impossible to extract it from the current Hyperdia data
carrier = "" if carrier is None else carrier carrier = "" if carrier is None else carrier
train_type = segment["train_name"]
train_number = ("" if segment.get("train_number") is None
else segment["train_number"])
next_record = iter_records.peek(None) next_record = iter_records.peek(None)
if next_record is not None: if next_record is not None:
if segment["go_through"] and next_record["go_through"]:
# Nothing to be done here
continue
if not segment["go_through"] and next_record["go_through"]: if not segment["go_through"] and next_record["go_through"]:
# Next one is going through: set the start, # Next one is going through: set the start,
# but don't add anything # but don't add anything
previous_record["start_station"] = start_station previous_record = segment
previous_record["start_time"] = start_time
previous_record["start_date"] = start_date
previous_record["train_name"] = train_type
continue continue
elif not next_record["go_through"] and segment["go_through"]: elif not next_record["go_through"] and segment["go_through"]:
# The next one is a "real" one, set the end, and add # The next one is a "real" one, set the end, and add
# the record # use the existing record to extract the data
start_station = previous_record["start_station"] parsed = _parse_record(previous_record)
start_time = previous_record["start_time"] start_station, start_date, start_time, *_ = parsed
start_date = previous_record["start_date"] *_, train_type, train_number = parsed
train_type = previous_record["train_name"] previous_record = None
previous_record = dict.fromkeys(previous_record.keys(), None)
subdoc = add_train_segment(start_station, subdoc = add_train_segment(start_station,
end_station, end_station,
start_time, start_time,
end_time, end_time,
start_date, start_date,
train=train_type, train=train_type,