lhpapi 1.0.7__tar.gz → 1.0.9__tar.gz

{lhpapi-1.0.7 → lhpapi-1.0.9}/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.0.9 (2025-12-18)
+### Fixed
+- Fix SH pegel page scraping
+
+## 1.0.8 (2025-12-09)
+### Fixed
+- Fix TH pegel page scraping
+
 ## 1.0.7 (2025-11-23)
 ### Fixed
 - Fix HE without flow

{lhpapi-1.0.7 → lhpapi-1.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lhpapi
-Version: 1.0.7
+Version: 1.0.9
 Summary: API to retrieve data from the Länderübergreifendes Hochwasser Portal (LHP)
 Project-URL: Homepage, https://github.com/stephan192/lhpapi
 Project-URL: Issues, https://github.com/stephan192/lhpapi/issues

{lhpapi-1.0.7 → lhpapi-1.0.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "lhpapi"
-version = "1.0.7"
+version = "1.0.9"
 authors = [
     { name="stephan192", email="stephan192@outlook.com" },
 ]

{lhpapi-1.0.7 → lhpapi-1.0.9}/src/lhpapi/sh_api.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from datetime import datetime
+
 from .api_utils import (
     DynamicData,
     LHPError,
@@ -13,6 +15,21 @@ from .api_utils import (
 )
 
 
+def parse_timestamp(parts: list[str]) -> datetime:
+    """Parse timestamp with optional timezone."""
+    if len(parts) >= 5:
+        timezone = parts[4].strip("()")
+    else:
+        timezone = None
+    base_time = parts[2] + parts[3]
+
+    if timezone == "MEZ":
+        return convert_to_datetime(f"{base_time}+0100", "%d.%m.%Y%H:%M%z")
+    if timezone == "MESZ":
+        return convert_to_datetime(f"{base_time}+0200", "%d.%m.%Y%H:%M%z")
+    return convert_to_datetime(base_time, "%d.%m.%Y%H:%M")
+
+
 def init_SH(ident: str) -> StaticData:  # pylint: disable=invalid-name
     """Init data for Schleswig-Holstein."""
     try:
@@ -67,28 +84,15 @@ def update_SH(static_data: StaticData) -> DynamicData:  # pylint: disable=invali
                 and element.attrs["class"][0] == "tooltip-content__w"
             ):
                 element_text = element.getText().split()
-                if element_text[1] == "cm":
+                if len(element_text) >= 4 and element_text[1] == "cm":
                     level = convert_to_float(element_text[0], True)
-                    if element_text[4] == "(MEZ)":
-                        last_update = convert_to_datetime(
-                            element_text[2] + element_text[3] + "+0100",
-                            "%d.%m.%Y%H:%M%z",
-                        )
-                    elif element_text[4] == "(MESZ)":
-                        last_update = convert_to_datetime(
-                            element_text[2] + element_text[3] + "+0200",
-                            "%d.%m.%Y%H:%M%z",
-                        )
-                    else:
-                        last_update = convert_to_datetime(
-                            element_text[2] + element_text[3], "%d.%m.%Y%H:%M"
-                        )
+                    last_update = parse_timestamp(element_text)
             if (
                 element.name == "dd"
                 and element.attrs["class"][0] == "tooltip-content__q"
             ):
                 element_text = element.getText().split()
-                if element_text[1] == "m3/s":
+                if len(element_text) >= 2 and element_text[1] == "m3/s":
                     flow = convert_to_float(element_text[0], True)
         return DynamicData(level=level, stage=stage, flow=flow, last_update=last_update)
     except Exception as err:

{lhpapi-1.0.7 → lhpapi-1.0.9}/src/lhpapi/th_api.py

@@ -23,7 +23,7 @@ def init_TH(ident: str) -> StaticData:  # pylint: disable=invalid-name
         # Parse data
         for row in trs:
             tds = row.find_all("td")
-            if len(tds) > 10:
+            if len(tds) > 3:
                 if tds[1].getText().strip() != ident[3:]:
                     continue
                 links = tds[1].find_all("a")
@@ -49,10 +49,10 @@ def update_TH(static_data: StaticData) -> DynamicData:  # pylint: disable=invali
         # Parse data
         for row in trs:
             tds = row.find_all("td")
-            if len(tds) > 10:
+            if len(tds) > 11:
                 if tds[1].getText().strip() != static_data.ident[3:]:
                     continue
-                if str(tds[6]).find("Hochwassermeldepegel") != -1:
+                if str(tds[7]).find("Hochwassermeldepegel") != -1:
                     if "w3-purple" in row["class"]:
                         stage = 4
                     elif "w3-red" in row["class"]:
@@ -66,10 +66,10 @@ def update_TH(static_data: StaticData) -> DynamicData:  # pylint: disable=invali
                 else:
                     stage = None
                 last_update = convert_to_datetime(
-                    tds[7].getText().strip(), "%d.%m.%Y %H:%M"
+                    tds[8].getText().strip(), "%d.%m.%Y %H:%M"
                 )
-                level = convert_to_float(tds[8].getText().strip(), True)
-                flow = convert_to_float(tds[10].getText().strip(), True)
+                level = convert_to_float(tds[9].getText().strip(), True)
+                flow = convert_to_float(tds[11].getText().strip(), True)
                 return DynamicData(
                     level=level, stage=stage, flow=flow, last_update=last_update
                 )