Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix timeslot parsing #82

Merged
merged 4 commits into from
Nov 30, 2024
Merged

Fix timeslot parsing #82

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95cb9c7
Fix timeslot parsing
psvenk Nov 28, 2024
e266b31
Update docstring
psvenk Nov 30, 2024
7696721
Use !r in fstring
psvenk Nov 30, 2024
d620364
Be more explicit about documenting exceptions
psvenk Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions scrapers/fireroad.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,34 +26,43 @@
URL = "https://fireroad.mit.edu/courses/all?full=true"


def parse_timeslot(day, slot):
"""Parses a timeslot. Example: parse_timeslot("M", "10-11.30") -> [4, 3]
def parse_timeslot(day, slot, pm):
psvenk marked this conversation as resolved.
Show resolved Hide resolved
"""Parses a timeslot. Example: parse_timeslot("M", "10-11.30", False) -> [4, 3]

Args:
* day (str): The day as a string
* slot (str): The slot as a string
* pm (bool): Whether the timeslot is in the evening

Returns:
* list[int]: The parsed day and timeslot
"""
pm, slot = slot.endswith(" PM"), slot.rstrip(" PM")
assert pm == slot.endswith(" PM")
psvenk marked this conversation as resolved.
Show resolved Hide resolved
slot = slot.rstrip(" PM")

if "-" in slot:
start, end = slot.split("-")
start_slot = utils.find_timeslot(day, start, pm)
end_slot = utils.find_timeslot(day, end, pm)
try:
start_slot = utils.find_timeslot(day, start, pm)
end_slot = utils.find_timeslot(day, end, pm)
except KeyError:
# Maybe the start time is AM but the end time is PM
start_slot = utils.find_timeslot(day, start, False)
end_slot = utils.find_timeslot(day, end, True)
else:
start_slot = utils.find_timeslot(day, slot, pm)
# Slot is one hour long, so length is 2.
end_slot = start_slot + 2

assert end_slot > start_slot

return [start_slot, end_slot - start_slot]


def parse_section(section):
"""Parses a section string.
Example: "32-123/TR/0/11/F/0/2" -> [[[36, 2], [96, 2], [132, 2]], '32-123']

Args:
* section (str): The section given as a string

Expand All @@ -63,11 +72,11 @@ def parse_section(section):
place, *infos = section.split("/")
slots = []

for weekdays, _, slot in utils.grouper(infos, 3):
for weekdays, pm, slot in utils.grouper(infos, 3):
for day in weekdays:
if day == "S":
continue # TODO: handle saturday
slots.append(parse_timeslot(day, slot))
slots.append(parse_timeslot(day, slot, bool(int(pm))))

return [slots, place]

Expand Down Expand Up @@ -222,7 +231,7 @@ def get_course_data(courses, course):
raw_class.update(parse_schedule(course))
except Exception as e:
# if we can't parse the schedule, warn
print(f"Can't parse schedule {course_code}: {e}")
print(f"Can't parse schedule {course_code}: {repr(e)}")
psvenk marked this conversation as resolved.
Show resolved Hide resolved
return False

# hh, ha, hs, he, ci, cw, re, la, pl
Expand Down
4 changes: 0 additions & 4 deletions scrapers/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@
"4.30": 17,
"5": 18,
"5.30": 19,
"6": 20,
"6.30": 21,
"7": 22,
"7.30": 23,
}

EVE_TIMES = {
Expand Down