chore: Refactor duplicated HTTP fetching code

custom_components/home_assistant_covid19_augsburg/crawler.py

@@ -78,6 +78,22 @@ class CovidCrawler(CovidCrawlerBase):
     def __init__(self, hass=None) -> None:
         self.hass = hass
 
+    async def _fetch(self, url: str) -> str:
+        """Fetch a URL, using either the current Home Assistant instance or requests"""
+
+        if self.hass:
+            from homeassistant.helpers import aiohttp_client
+
+            result = await aiohttp_client.async_get_clientsession(self.hass).get(url)
+            soup = BeautifulSoup(await result.text(), "html.parser")
+        else:
+            import requests
+
+            result = requests.get(url)
+            result.raise_for_status()
+            soup = BeautifulSoup(result.text, "html.parser")
+        return soup
+
     async def crawl_incidence(self) -> IncidenceData:
         """
         Fetch COVID-19 infection data from the target website.
@@ -88,18 +104,7 @@ class CovidCrawler(CovidCrawlerBase):
         url = (
             "https://www.augsburg.de/umwelt-soziales/gesundheit/coronavirus/fallzahlen"
         )
-        if self.hass:
+        soup = await self._fetch(url)
-            from homeassistant.helpers import aiohttp_client
-
-            result = await aiohttp_client.async_get_clientsession(self.hass).get(url)
-            soup = BeautifulSoup(await result.text(), "html.parser")
-        else:
-            import requests
-
-            result = requests.get(url)
-            if not result.ok:
-                result.raise_for_status()
-            soup = BeautifulSoup(result.text, "html.parser")
 
         match = soup.find(class_="frame--type-textpic")
         text = match.p.text
@@ -153,22 +158,12 @@ class CovidCrawler(CovidCrawlerBase):
 
     async def crawl_vaccination(self) -> VaccinationData:
         _log.info("Fetching COVID-19 vaccination data update")
-        url = "https://www.augsburg.de/umwelt-sozgcoiales/gesundheit/coronavirus/impfzentrum"
+        url = (
+            "https://www.augsburg.de/umwelt-soziales/gesundheit/coronavirus/impfzentrum"
+        )
+        soup = await self._fetch(url)
+
         container_id = "c1088140"
-
-        if self.hass:
-            from homeassistant.helpers import aiohttp_client
-
-            result = await aiohttp_client.async_get_clientsession(self.hass).get(url)
-            soup = BeautifulSoup(await result.text(), "html.parser")
-        else:
-            import requests
-
-            result = requests.get(url)
-            if not result.ok:
-                result.raise_for_status()
-            soup = BeautifulSoup(result.text, "html.parser")
-
         result = soup.find(id=container_id)
         text = re.sub(r"\s+", " ", result.text)
         regexes = [

custom_components/home_assistant_covid19_augsburg/main.py

@@ -3,8 +3,8 @@ from .crawler import CovidCrawler
 
 async def main():
     crawler = CovidCrawler()
-    # result = await crawler.crawl()
+    result = await crawler.crawl_incidence()
-    # print(result)
+    print(result)
 
     result = await crawler.crawl_vaccination()
     print(result)