Use async and add support for second counter

Author: v411e

maubot.yaml

@@ -5,7 +5,7 @@ maubot: 0.1.0
 id: com.valentinriess.mensa
 
 # A PEP 440 compliant version string.
-version: 0.0.4
+version: 0.0.5
 
 # The SPDX license identifier for the plugin. https://spdx.org/licenses/
 # Optional, assumes all rights reserved if omitted.

mensabot.py

@@ -3,7 +3,6 @@
 from mautrix.types import TextMessageEventContent, MessageType, Format, RelatesTo, RelationType
 from maubot import Plugin, MessageEvent
 from maubot.handlers import command
-import requests
 
 URL = 'https://www.studentenwerk-magdeburg.de/mensen-cafeterien/mensa-unicampus/'
 
@@ -13,7 +12,8 @@ class MensaBot(Plugin):
     @command.new("hunger", help="Show the meals")
     @command.argument("message", pass_raw=True, required=False)
     async def hunger_handler(self, evt: MessageEvent, message: str = "") -> None:
-        menu: Menu = Menu(URL)
+        menu: Menu = Menu()
+        await menu.init(self, URL)
         content = TextMessageEventContent(
             msgtype=MessageType.NOTICE, format=Format.HTML,
             body=f"{menu}",
@@ -35,12 +35,15 @@ def __init__(self, name: str, price: str):
         self.name = name
         self.price = price
 
+
     def __str__(self) -> str:
         return self.name + "\n" + self.price
 
+
     def to_list(self) -> List:
         return [self.name, self.price]
 
+
     def to_dict(self) -> Dict:
         return {
             "name": self.name,
@@ -53,35 +56,42 @@ class Menu:
     day: str = ""
     meals: List[Meal] = []
 
-    def __init__(self, url: str):
+    async def init(self, mensabot: Plugin, url: str) -> None:
         self.meals = []
-        page = requests.get(url)
-        soup = BeautifulSoup(page.content, 'html.parser')
-        div_mensa = soup.find("div", class_="mensa")
-        self.day = div_mensa.find("table").find("thead").find("tr").find("td").string
-        for element in div_mensa.find("table").find("tbody").find_all("tr"):
-            meal = Meal(element.find_all("td").pop(0).find("strong").contents.pop(0).string,
-                        element.find_all("td").pop(0).contents.pop(2).string)
-            self.meals.append(meal)
+        async with mensabot.http.get(url) as resp:
+            page = await resp.text()
+        mensabot.log.info(page)
+        soup = BeautifulSoup(page, 'html.parser')
+        div_mensa = soup.find_all("div", class_="mensa")
+        self.day = div_mensa[0].find("table").find("thead").find("tr").find("td").string
+        for mensa_table in div_mensa:
+            for element in mensa_table.find("table").find("tbody").find_all("tr"):
+                meal = Meal(element.find_all("td").pop(0).find("strong").contents.pop(0).string,
+                            element.find_all("td").pop(0).contents.pop(2).string)
+                self.meals.append(meal)
+
 
     def __str__(self) -> str:
         plain_text = ""
         for meal in self.meals:
             plain_text += "\n----------\n" + str(meal)
         return f'Speiseplan für {self.day}:{plain_text}'
 
+
     def to_html(self) -> str:
         plain_text = ""
         for meal in self.meals:
             plain_text += "<hr><br><strong>" + meal.name + "</strong><br>" + meal.price
         return f'<h3>Speiseplan für {self.day}:</h3>{plain_text}'
 
+
     def to_list(self) -> List[List]:
         result = []
         for meal in self.meals:
             result.append(meal.to_list())
         return result
 
+
     def to_dict(self) -> Dict:
         result = {}
         for i in range(len(self.meals)):

requirements.txt

@@ -1,4 +1,3 @@
-requests~=2.25.1
 beautifulsoup4~=4.9.3
 mautrix~=0.9.5
 maubot~=0.1.2