Revert "Fix parsing of numbers > 1000, add incidence"

This reverts commit 1e8a0bc.
foosel · Mar 21, 2020 · 05a0a36 · 05a0a36
1 parent 2c2ce2b
commit 05a0a36
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/custom_components/coronavirus_hessen/__init__.py b/custom_components/coronavirus_hessen/__init__.py
@@ -80,16 +80,25 @@ async def async_get_data():
 
             try:
                 county = line[0].text.strip()
-                cases = parse_num(line[1].text.strip())
-                deaths = parse_num(line[2].text.strip())
-                incidence = parse_num(line[3].text.strip(), t=float)
-            except:
+                cases_str = line[1].text.strip()
+                deaths_str = line[3].text.strip()
+
+                if len(cases_str) and cases_str != "-":
+                    cases = int(cases_str)
+                else:
+                    cases = 0
+
+                if len(deaths_str) and deaths_str != "-":
+                    deaths = int(deaths_str)
+                else:
+                    deaths = 0
+            except ValueError:
                 _LOGGER.error("Error processing line {}, skipping".format(line))
                 continue
 
             if county == "Gesamt":
                 county = OPTION_TOTAL
-            result[county] = dict(cases=cases, deaths=deaths, incidence=incidence)
+            result[county] = dict(cases=cases, deaths=deaths)
 
         _LOGGER.debug("Corona Hessen: {!r}".format(result))
         return result
@@ -103,10 +112,3 @@ async def async_get_data():
     )
     await hass.data[DOMAIN].async_refresh()
     return hass.data[DOMAIN]
-
-
-def parse_num(s, t=int):
-    if len(s) and s != "-":
-        return t(s.replace(".", "").replace(",", "."))
-    else:
-        return 0
diff --git a/custom_components/coronavirus_hessen/sensor.py b/custom_components/coronavirus_hessen/sensor.py
@@ -12,7 +12,6 @@
 _LOGGER = logging.getLogger(__name__)
 
 ATTR_DEATHS = "deaths"
-ATTR_INCIDENCE = "incidence"
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Defer sensor setup to the shared sensor module."""
@@ -55,9 +54,7 @@ def state(self):
 
     @property
     def device_state_attributes(self):
-        return {ATTR_ATTRIBUTION: ATTRIBUTION, 
-                ATTR_DEATHS: self.coordinator.data[self.county]["deaths"],
-                ATTR_INCIDENCE: self.coordinator.data[self.county]["incidence"]}
+        return {ATTR_ATTRIBUTION: ATTRIBUTION, ATTR_DEATHS: self.coordinator.data[self.county]["deaths"]}
 
     async def async_added_to_hass(self):
         """When entity is added to hass."""