e

M3U8/fetch.py

@@ -8,8 +8,8 @@ from scrapers import (
     streambtw,
     streameast,
     streamed,
-    strfree,
     strmd,
+    strmfree,
     tvpass,
     watchfooty,
 )
@@ -43,8 +43,8 @@ async def main() -> None:
         asyncio.create_task(streambtw.scrape(network.client)),
         asyncio.create_task(streameast.scrape(network.client)),
         asyncio.create_task(streamed.scrape(network.client)),
-        asyncio.create_task(strfree.scrape(network.client)),
         asyncio.create_task(strmd.scrape(network.client)),
+        asyncio.create_task(strmfree.scrape(network.client)),
         asyncio.create_task(tvpass.scrape(network.client)),
         asyncio.create_task(watchfooty.scrape(network.client)),
     ]
@@ -57,8 +57,8 @@ async def main() -> None:
         | streambtw.urls
         | streameast.urls
         | streamed.urls
-        | strfree.urls
         | strmd.urls
+        | strmfree.urls
         | tvpass.urls
         | watchfooty.urls
     )

M3U8/scrapers/streamed.py

@@ -107,6 +107,8 @@ async def refresh_html_cache(client: httpx.AsyncClient, url: str) -> dict[str, s
 
         sport, event = league.text(strip=True), title.text(strip=True)
 
+        sport = sport.split("—")[-1].strip()
+
         onclick = hds_a.attributes.get("onclick", "")
 
         if not (m := re.search(r"openPlayerPopup\(\s*(\d+)\s*\)", onclick)):

M3U8/scrapers/strmfree.py

@@ -119,17 +119,15 @@ async def get_events(
         if not streams:
             continue
 
-        sport = "American Football" if category == "football" else category.capitalize()
-
         for stream in streams:
             event_dt = Time.from_ts(stream["match_timestamp"])
 
             if not start_dt <= event_dt <= end_dt:
                 continue
 
-            name = stream["name"]
+            sport, name = stream["league"], stream["name"]
 
-            key = f"[{sport}] {name} (STRFREE)"
+            key = f"[{sport}] {name} (STRMFR)"
 
             if cached_keys & {key}:
                 continue
@@ -184,7 +182,7 @@ async def scrape(client: httpx.AsyncClient) -> None:
                     ev["timestamp"],
                 )
 
-                key = f"[{sport}] {event} (STRFREE)"
+                key = f"[{sport}] {event} (STRMFR)"
 
                 tvg_id, pic = leagues.get_tvg_info(sport, event)