Merge pull request #1577 from robbrad/aug_25_release

robbrad · web-flow · commit 591cf11673f7 · 2025-08-25T11:53:05.000+01:00
Aug 25 release
diff --git a/.github/workflows/behave_pull_request.yml b/.github/workflows/behave_pull_request.yml
@@ -14,7 +14,7 @@ jobs:
     name: Setup Environment
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install Poetry
         run: pipx install poetry==1.8.4
@@ -61,7 +61,7 @@ jobs:
         python-version: [3.12]
         poetry-version: [1.8.4]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: actions/setup-python@v5
         with:
@@ -92,7 +92,7 @@ jobs:
         python-version: [3.12]
         poetry-version: [1.8.4]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: actions/setup-python@v5
         with:
@@ -125,7 +125,7 @@ jobs:
         ports:
           - 4444:4444
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: actions/setup-python@v5
         with:
diff --git a/.github/workflows/behave_schedule.yml b/.github/workflows/behave_schedule.yml
@@ -10,7 +10,7 @@ jobs:
     name: Setup Environment
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install Poetry
         run: pipx install poetry==1.8.4
@@ -43,7 +43,7 @@ jobs:
         python-version: [3.12]
         poetry-version: [1.8.4]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: actions/setup-python@v5
         with:
@@ -74,7 +74,7 @@ jobs:
         python-version: [3.12]
         poetry-version: [1.8.4]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: actions/setup-python@v5
         with:
@@ -107,7 +107,7 @@ jobs:
         ports:
           - 4444:4444
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: actions/setup-python@v5
         with:
diff --git a/.github/workflows/bump.yml b/.github/workflows/bump.yml
@@ -19,7 +19,7 @@ jobs:
       id-token: write
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"
           fetch-depth: 0
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -47,7 +47,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -22,7 +22,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Publish to Registry
       uses: elgohr/Publish-Docker-Github-Action@v5
       with:
diff --git a/.github/workflows/hacs_validation.yml b/.github/workflows/hacs_validation.yml
@@ -11,7 +11,7 @@ jobs:
     name: HassFest Validation
     runs-on: "ubuntu-latest"
     steps:
-      - uses: "actions/checkout@v4"
+      - uses: "actions/checkout@v5"
       - uses: home-assistant/actions/hassfest@master
   hacs:
     name: HACS Action Validation
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
     name: Lint Commit Messages
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - run: "echo \"export default {extends: ['@commitlint/config-conventional'], rules: { 'subject-case': [0], 'body-max-line-length': [0], 'footer-max-line-length': [0] }}\" > commitlint.config.mjs"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
       id-token: write
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-python@v5
         with:
           python-version: '3.12'
diff --git a/.github/workflows/wiki.yml b/.github/workflows/wiki.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: wiki
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: actions/setup-python@v5
       with:
         python-version: '3.12'
diff --git a/custom_components/uk_bin_collection/__init__.py b/custom_components/uk_bin_collection/__init__.py
@@ -283,15 +283,28 @@ def build_ukbcd_args(config_data: dict) -> list:
     """Build the argument list for UKBinCollectionApp from config data."""
     council = config_data.get("original_parser") or config_data.get("council", "")
     url = config_data.get("url", "")
-
     args = [council, url]
 
+    # Per-key formatters: return a list of CLI args for that key
+    def _format_headless(v):
+        return ["--headless"] if v else ["--not-headless"]
+
+    def _format_web_driver(v):
+        return [f"--web_driver={v.rstrip('/')}"] if v is not None else []
+
+    formatters = {
+        "headless": _format_headless,
+        "web_driver": _format_web_driver,
+    }
+
     for key, value in config_data.items():
         if key in EXCLUDED_ARG_KEYS:
             continue
-        if key == "web_driver" and value is not None:
-            value = value.rstrip("/")
-        args.append(f"--{key}={value}")
+        fmt = formatters.get(key)
+        if fmt:
+            args.extend(fmt(value))
+        else:
+            args.append(f"--{key}={value}")
 
     return args
 
diff --git a/custom_components/uk_bin_collection/const.py b/custom_components/uk_bin_collection/const.py
@@ -31,7 +31,6 @@
     "council",
     "url",
     "skip_get_url",
-    "headless",
     "local_browser",
     "timeout",
     "icon_color_mapping",
diff --git a/uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py b/uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py
@@ -245,25 +245,39 @@ def parse_data(self, page: str, **kwargs: str) -> dict[str, list[dict[str, str]]
             # extract table body
             for row in table.find_all("tr")[1:]:
                 if row.find_all("td")[1].text.strip() == "Normal collection day":
-                    bh_dict[
-                        parse(
-                            row.find_all("td")[0].text.strip(),
-                            dayfirst=True,
-                            fuzzy=True,
-                        ).date()
-                    ] = parse(
-                        row.find_all("td")[0].text.strip(), dayfirst=True, fuzzy=True
-                    ).date()
+                    try:
+                        # Check for normal collection day (no change)
+                        if row.find_all("td")[0].text.strip() == "Normal collection":
+                            continue
+                        else:
+                            bh_dict[
+                                parse(
+                                    row.find_all("td")[0].text.strip(),
+                                    dayfirst=True,
+                                    fuzzy=True,
+                                ).date()
+                            ] = parse(
+                                row.find_all("td")[0].text.strip(), dayfirst=True, fuzzy=True
+                            ).date()
+                    except:
+                        continue
                 else:
-                    bh_dict[
-                        parse(
-                            row.find_all("td")[0].text.strip(),
-                            dayfirst=True,
-                            fuzzy=True,
-                        ).date()
-                    ] = parse(
-                        row.find_all("td")[1].text.strip(), dayfirst=True, fuzzy=True
-                    ).date()
+                    try:
+                        # Check for normal collection day (no change)
+                        if row.find_all("td")[1].text.strip() == "Normal collection":
+                            continue
+                        else:
+                            bh_dict[
+                                parse(
+                                    row.find_all("td")[0].text.strip(),
+                                    dayfirst=True,
+                                    fuzzy=True,
+                                ).date()
+                            ] = parse(
+                                row.find_all("td")[1].text.strip(), dayfirst=True, fuzzy=True
+                            ).date()
+                    except:
+                        continue
 
         for refuse_date in refuse_dates:
             collection_date = (datetime.strptime(refuse_date, "%d/%m/%Y") + timedelta(
diff --git a/uk_bin_collection/uk_bin_collection/councils/RochfordCouncil.py b/uk_bin_collection/uk_bin_collection/councils/RochfordCouncil.py
@@ -33,10 +33,9 @@ def parse_data(self, page: str, **kwargs) -> dict:
                     "tr", {"class": "govuk-table__row"}
                 ):
                     week_text = week.get_text().strip().split("\n")
+                    date_str = week_text[0].split(" - ")[0].split("–")[0].strip()
                     collection_date = datetime.strptime(
-                        remove_ordinal_indicator_from_date_string(
-                            week_text[0].split(" - ")[0]
-                        ).strip(),
+                        remove_ordinal_indicator_from_date_string(date_str),
                         "%A %d %B",
                     )
                     next_collection = collection_date.replace(year=datetime.now().year)
