diff --git a/M3U8/fetch.py b/M3U8/fetch.py index 50a0d49..60667f3 100644 --- a/M3U8/fetch.py +++ b/M3U8/fetch.py @@ -8,7 +8,6 @@ from scrapers import ( lotus, pixel, ppv, - roxie, streambtw, streameast, strmd, @@ -47,7 +46,6 @@ async def main() -> None: asyncio.create_task(lotus.scrape(network.client)), asyncio.create_task(pixel.scrape(network.client)), asyncio.create_task(ppv.scrape(network.client)), - asyncio.create_task(roxie.scrape(network.client)), asyncio.create_task(streambtw.scrape(network.client)), asyncio.create_task(streameast.scrape(network.client)), asyncio.create_task(strmd.scrape(network.client)), @@ -63,7 +61,6 @@ async def main() -> None: | lotus.urls | pixel.urls | ppv.urls - | roxie.urls | streambtw.urls | streameast.urls | strmd.urls diff --git a/M3U8/scrapers/roxie.py b/M3U8/scrapers/old/roxie.py similarity index 100% rename from M3U8/scrapers/roxie.py rename to M3U8/scrapers/old/roxie.py diff --git a/M3U8/scrapers/strmfree.py b/M3U8/scrapers/strmfree.py index d2d915e..c896dbe 100644 --- a/M3U8/scrapers/strmfree.py +++ b/M3U8/scrapers/strmfree.py @@ -77,14 +77,11 @@ async def get_events( stream_url = stream["stream_key"] - stream_logo = stream["thumbnail_url"] - events.append( { "sport": sport, "event": name, "link": urljoin(url, f"player/{category}/{stream_url}"), - "logo": urljoin(url, stream_logo), "timestamp": event_dt.timestamp(), } ) @@ -130,20 +127,19 @@ async def scrape(client: httpx.AsyncClient) -> None: ) if url: - sport, event, logo, ts = ( + sport, event, ts = ( ev["sport"], ev["event"], - ev["logo"], ev["timestamp"], ) key = f"[{sport}] {event} (STRMFR)" - tvg_id, pic = leagues.get_tvg_info(sport, event) + tvg_id, logo = leagues.get_tvg_info(sport, event) entry = { "url": url.replace("540p", "720p"), - "logo": logo or pic, + "logo": logo, "base": "", "timestamp": ts, "id": tvg_id or "Live.Event.us",