From 00000d931d80dd36fecb9ec5634595248ef45c66 Mon Sep 17 00:00:00 2001 From: doms9 <96013514+doms9@users.noreply.github.com> Date: Tue, 28 Oct 2025 16:54:17 -0400 Subject: [PATCH] e --- M3U8/fetch.py | 6 +++--- M3U8/scrapers/streamed.py | 2 ++ M3U8/scrapers/{strfree.py => strmfree.py} | 8 +++----- 3 files changed, 8 insertions(+), 8 deletions(-) rename M3U8/scrapers/{strfree.py => strmfree.py} (95%) diff --git a/M3U8/fetch.py b/M3U8/fetch.py index 3b051bd..4c0131d 100644 --- a/M3U8/fetch.py +++ b/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 ) diff --git a/M3U8/scrapers/streamed.py b/M3U8/scrapers/streamed.py index 460a159..0d21377 100644 --- a/M3U8/scrapers/streamed.py +++ b/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)): diff --git a/M3U8/scrapers/strfree.py b/M3U8/scrapers/strmfree.py similarity index 95% rename from M3U8/scrapers/strfree.py rename to M3U8/scrapers/strmfree.py index c0fd960..4447c47 100644 --- a/M3U8/scrapers/strfree.py +++ b/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)