Fixed Error fetching dpc data: 'vigilance'

Fixed the regex to extrapolate vigilance id.
caiosweet · Oct 9, 2023 · 18c304a · 18c304a
1 parent 5c575fd
commit 18c304a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/custom_components/dpc/api.py b/custom_components/dpc/api.py
@@ -2,10 +2,10 @@
 from __future__ import annotations
 
 import asyncio
+from datetime import date, datetime, time, timedelta
 import json
 import re
 import socket
-from datetime import date, datetime, time, timedelta
 
 import aiohttp
 import async_timeout
@@ -153,7 +153,7 @@
     },
 }
 
-REGEX_DPC_ID = re.compile(r'href=[\'"]?([^\'" >]+\/)([0-9]+.[0-9]+).zip', re.IGNORECASE)
+REGEX_DPC_ID = re.compile(r'([0-9]{8})(.json)', re.IGNORECASE)
 REGEX_DPC_ID_DATETIME = re.compile(r'[0-9]{8}_[0-9]{4}', re.IGNORECASE)
 TIMEOUT = 30
 
@@ -306,7 +306,7 @@ async def get_id_from_site(self, bulletin: str) -> str | None:
         resp = await self.api_fetch(url)
         html = resp.get(url, "")
         if VIGILANCE in bulletin:
-            id_pub = [match[1] for match in REGEX_DPC_ID.findall(html)]
+            id_pub = [match[0] for match in REGEX_DPC_ID.findall(html)]
         else:
             id_pub = REGEX_DPC_ID_DATETIME.findall(html)
         if id_pub:

diff --git a/custom_components/dpc/const.py b/custom_components/dpc/const.py
@@ -13,7 +13,7 @@
 ISSUE_URL = "https://github.com/caiosweet/Home-Assistant-custom-components-DPC-Alert/issues"
 NAME = "Dipartimento Protezione Civile"
 MANUFACTURER = "Italian Government"
-VERSION = "2022.3.0"
+VERSION = "2023.10.0"
 
 # Config
 CONF_MUNICIPALITY = "municipality"

diff --git a/custom_components/dpc/manifest.json b/custom_components/dpc/manifest.json
@@ -7,5 +7,5 @@
 	"iot_class": "cloud_polling",
 	"issue_tracker": "https://github.com/caiosweet/Home-Assistant-custom-components-DPC-Alert/issues",
 	"requirements": [],
-	"version": "2022.3.0"
+	"version": "2023.10.0"
 }