Merge pull request #304 from custom-components/fixup-dst

fix for dst
custom-components · Mar 26, 2023 · 2b4ed5c · 2b4ed5c
2 parents 57be772 + 37817ca
commit 2b4ed5c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/custom_components/nordpool/aio_price.py b/custom_components/nordpool/aio_price.py
@@ -131,8 +131,15 @@ def join_result_for_correct_time(results, dt):
 
             for val in values:
                 local = val["start"].astimezone(zone)
+                local_end = val["end"].astimezone(zone)
                 if start_of_day <= local and local <= end_of_day:
-                    fin["areas"][key]["values"].append(val)
+                    if local == local_end:
+                        _LOGGER.info(
+                            "Hour has the same start and end, most likly due to dst change %s exluded this hour",
+                            val,
+                        )
+                    else:
+                        fin["areas"][key]["values"].append(val)
 
     # _LOGGER.debug("Combines result: %s", fin)
 
@@ -202,7 +209,7 @@ async def fetch(self, data_type, end_date=None, areas=None):
 
         # compare utc offset
         if self.timeezone == tz.gettz("Europe/Stockholm"):
-            data = await self._fetch_json(data_type, end_date, areas)
+            data = await self._fetch_json(data_type, end_date)
             return self._parse_json(data, areas)
         else:
             yesterday = datetime.now() - timedelta(days=1)

diff --git a/custom_components/nordpool/test_parser.py b/custom_components/nordpool/test_parser.py
@@ -134,7 +134,9 @@ def join_result_for_correct_time(results):
 
             for val in values:
                 local = val["start"].astimezone(zone)
+                local_end = val["end"].astimezone(zone)
                 if start_of_day <= local and local <= end_of_day:
+
                     #
                     if n == 1:
                         # this is yesterday
@@ -169,13 +171,14 @@ def manual_check(region, currency, vat):
         today = spot.hourly(end_date=dt_today)
         tomorrow = spot.hourly(end_date=dt_today + timedelta(days=1))
         #print(today)
-        print(pprint(today.get("areas")))
-        return
+        #print(pprint(today.get("areas")))
+        #return
 
         results = [yesterday, today, tomorrow]
 
         data = join_result_for_correct_time(results)
         values = []
+        return
         for key, value in data["areas"].items():
             values = []
             if key == region or region is None: