health log

- edit scraping for mainportal.py

M3U8/scrapers/mainportal.py

@@ -1,4 +1,6 @@
 import asyncio
+import json
+import re
 from functools import partial
 from urllib.parse import urljoin
 
@@ -53,35 +55,30 @@ async def process_event(
     return m3u8_url
 
 
-async def get_api_data() -> dict[str, dict[str, list[dict]]]:
-    tasks = [
-        (
-            sport,
-            network.request(
-                urljoin(url, "api/v2/stateshot"),
-                log=log,
-            ),
-        )
-        for sport, url in API_URLS.items()
-    ]
-
-    results = await asyncio.gather(*(task for _, task in tasks))
-
-    return {sport: r.json() for (sport, _), r in zip(tasks, results) if r}
-
-
 async def get_events(cached_keys: list[str]) -> list[dict[str, str]]:
-    now = Time.clean(Time.now())
+    tasks = [network.request(url, log=log) for url in BASE_URLS.values()]
 
-    api_data = await get_api_data()
+    results = await asyncio.gather(*tasks)
 
     events = []
 
+    if not (html_data := [(html.text, html.url) for html in results if html]):
+        return events
+
+    now = Time.clean(Time.now())
+
+    stateshot_ptrn = re.compile(r"var\s+stateshot\s+=\s+(.*);", re.I)
+
     start_dt = now.delta(hours=-1)
     end_dt = now.delta(minutes=1)
 
-    for sport in api_data:
-        data = api_data[sport]
+    for content, url in html_data:
+        sport = next((k for k, v in BASE_URLS.items() if v == url), "Live Event")
+
+        if not (match := stateshot_ptrn.search(content)):
+            continue
+
+        data: dict = json.loads(f"{match[1]}")
 
         teams = data.get("teams", {})
 

M3U8/scrapers/watchfooty.py

@@ -16,7 +16,7 @@ TAG = "WATCHFTY"
 
 CACHE_FILE = Cache(TAG, exp=10_800)
 
-BASE_DOMAIN = "watchfooty.st"
+BASE_DOMAIN = "watchfooty.ru"
 
 API_URL, BASE_URL = f"https://api.{BASE_DOMAIN}", f"https://www.{BASE_DOMAIN}"
 

readme.md

@@ -1,7 +1,13 @@
-## Base Log @ 2026-05-15 16:20 UTC
+## Base Log @ 2026-05-16 21:10 UTC
 
-### ✅ Working Streams: 160<br>❌ Dead Streams: 0
+### ✅ Working Streams: 156<br>❌ Dead Streams: 4
 
+| Channel | Error (Code) | Link |
+| ------- | ------------ | ---- |
+| ABC | HTTP Error (404) | `http://stream.cammonitorplus.net/1809/index.m3u8` |
+| Comedy TV | HTTP Error (403) | `http://realsport.scalecdn.co:8080/live/supersonicstreams/cUewZolveU8Jh18jk34BDJ/77411.ts` |
+| Fox | HTTP Error (404) | `http://stream.cammonitorplus.net/1752/index.m3u8` |
+| NBC | HTTP Error (404) | `http://stream.cammonitorplus.net/1812/index.m3u8` |
 ---
 #### Base Channels URL
 ```