diff --git a/crawler.py b/crawler.py index 4fec1d9056e7ab1968f5eb0f7699d8ab9086edcd..c67f5cff1658949efa4345aa14812dda080222d2 100644 --- a/crawler.py +++ b/crawler.py @@ -92,7 +92,7 @@ def get_location_days( ( indicator for indicator in menu_item_indicators - if indicator.find_text in img["src"] + if indicator.find_text in img["title"] ), None, ) @@ -103,13 +103,23 @@ def get_location_days( ( indicator for indicator in menu_item_indicators - if indicator.find_text in child["src"] + if indicator.find_text in child["title"] ), None, ) if indicator is not None: item_indicators.add(indicator) elif child.text.strip() != "": + if child.text.startswith("\n"): + items.append( + MenuItem( + name=item_name, + indicators=frozenset(item_indicators), + ) + ) + item_name = None + item_indicators = set() + if item_name is not None: item_name += " " + child.text.strip() else: @@ -123,7 +133,7 @@ def get_location_days( menus.append( Menu(meal_name=title_node.text.strip().upper(), items=tuple(items)) ) - days.append(Day(date=date(y, m, d), date_raw=date_text, menus=menus)) + days.append(Day(date=date(y, m, d), date_raw=date_text.strip(), menus=menus)) cached_update_times[location] = datetime.now() location_days = LocationDays( diff --git a/seed.py b/seed.py index 553e6075355210675d5a3a3c03940940c775393f..ba7402eb24e6eca97d3df9049c781cd28e469748 100644 --- a/seed.py +++ b/seed.py @@ -135,55 +135,55 @@ def get_seed_menu_item_indicators(): ( "🌱", "Indicado para veganos", - "vegan", + "Indicado para veganos", 1, ), ( "🌾", "Contém glúten", - "gluten", + "Contém glúten", 2, ), ( "🥛", "Contém leite e/ou derivados", - "lactose", + "Contém leite e/ou derivados", 3, ), ( "🥩", "Contém produtos de origem animal", - "carne", + "Contêm produtos de origem animal", 4, ), ( "🥚", - "Contém ovo", - "ovo", + "Contêm ovos", + "Contêm ovos", 5, ), ( "🍯", "Contém mel", - "mel", + "Contém mel", 6, ), ( "⚠️", "Contém ingrediente(s) potencialmente alergênico(s)", - "daf04cd5-bacd-4ea4-91ce-48ea45cb0ac4", + "Contém ingrediente(s) potencialmente alergênico(s)", 7, ), ( "🐷", "Contém produtos de origem suína", - "476bf979-2cbb-476b-8739-02ed26485235", + "Contêm produtos de origem suína", 8, ), ( "🌶️", "Contém pimenta", - "mel", + "Contém pimenta", 9, ), ]