refactor ipswich_qld_gov_au

mampfes · Apr 23, 2022 · f54cc0d · f54cc0d
1 parent 312ef6c
commit f54cc0d
Showing 1 changed file with 24 additions and 22 deletions.
diff --git a/...mponents/waste_collection_schedule/waste_collection_schedule/source/ipswich_qld_gov_au.py b/...mponents/waste_collection_schedule/waste_collection_schedule/source/ipswich_qld_gov_au.py
@@ -1,22 +1,31 @@
 import datetime
 import urllib
 from html.parser import HTMLParser
-import requests
 
+import requests
 from waste_collection_schedule import Collection
 
 TITLE = "Ipswich City Council"
 DESCRIPTION = "Source for Ipswich City Council rubbish collection."
 URL = "https://www.ipswich.qld.gov.au/live/waste-and-recycling/bin-collection-calendar"
 TEST_CASES = {
     "Camira State School": {"street": "184-202 Old Logan Rd", "suburb": "Camira"},
-    "Random": {"street":"50 Brisbane Road", "suburb": "Redbank"}
+    "Random": {"street": "50 Brisbane Road", "suburb": "Redbank"},
 }
 
+
+ICONS = {
+    "Waste Bin": "mdi:trash-can",
+    "Recycle Bin": "mdi:recycle",
+    "FOGO Bin": "mdi:leaf",
+}
+
+
 def toDate(dateStr: str):
     items = dateStr.split("-")
     return datetime.date(int(items[1]), int(items[2]), int(items[3]))
 
+
 class IpswichGovAuParser(HTMLParser):
     def __init__(self):
         super().__init__()
@@ -45,10 +54,10 @@ def handle_endtag(self, tag):
             self._span_level -= 1
 
     def handle_starttag(self, tag, attrs):
-        
+
         d = dict(attrs)
         cls = d.get("class", "")
-        
+
         if tag == "li":
             self._li_level += 1
             if self._li_level == 1 and cls == "WBD-result-item":
@@ -65,30 +74,26 @@ def handle_starttag(self, tag, attrs):
             if self._li_valid and self._span_level == 3 and cls == "WBD-bin-text":
                 self._load_bin = True
 
-
     def handle_data(self, data):
-
         if not self._li_valid:
             return
 
         if self._load_date:
             self._load_date = False
 
             items = data.strip().split("-")
-            self._loaded_date = datetime.date(int(items[0]), int(items[1]), int(items[2]))
+            self._loaded_date = datetime.date(
+                int(items[0]), int(items[1]), int(items[2])
+            )
 
         if self._load_bin:
             self._load_bin = False
 
-            if data == "Waste Bin":
-                self._entries.append(Collection(self._loaded_date, "Rubbish", icon="mdi:trash-can"))
-
-            if data == "Recycle Bin":
-                self._entries.append(Collection(self._loaded_date, "Recycling", icon="mdi:recycle"))
-
-            if data == "FOGO Bin":
-                self._entries.append(Collection(self._loaded_date, "Garden", icon="mdi:leaf"))        
-
+            self._entries.append(
+                Collection(
+                    self._loaded_date, data, icon=ICONS.get(data, "mdi:trash-can")
+                )
+            )
 
 
 class Source:
@@ -104,13 +109,10 @@ def fetch(self):
             "agendaResultLimit": "3",
             "dateFormat": "yyyy-MM-dd",
             "displayFormat": "agenda",
-            "address": f"{address}+QLD%2C+Australia"
+            "address": f"{address}+QLD%2C+Australia",
         }
 
-        r = requests.get(
-            "https://console.whatbinday.com/api/search",
-            params=params
-        )
+        r = requests.get("https://console.whatbinday.com/api/search", params=params)
         p = IpswichGovAuParser()
         p.feed(r.text)
-        return p.entries
+        return p.entries