diff --git a/M3U8/scrapers/ppv.py b/M3U8/scrapers/ppv.py index 965f3a8..1cfad0f 100644 --- a/M3U8/scrapers/ppv.py +++ b/M3U8/scrapers/ppv.py @@ -59,7 +59,7 @@ def get_tvg(sport: str, event: str) -> str | None: return "Basketball.Dummy.us" case _: - return + return leagues.info(sport)[0] async def refresh_api_cache( @@ -218,13 +218,13 @@ async def scrape(client: httpx.AsyncClient) -> None: ) if url: - sport, event = ev["sport"], ev["event"] + sport, event, logo = ev["sport"], ev["event"], ev["logo"] key = f"[{sport}] {event} (PPV)" entry = { "url": url, - "logo": ev["logo"], + "logo": logo, "base": base_url, "timestamp": now.timestamp(), "id": get_tvg(sport, event) or "Live.Event.us", diff --git a/M3U8/scrapers/streambtw.py b/M3U8/scrapers/streambtw.py index b26983f..8a7795f 100644 --- a/M3U8/scrapers/streambtw.py +++ b/M3U8/scrapers/streambtw.py @@ -54,10 +54,6 @@ async def get_events(client: httpx.AsyncClient) -> list[dict[str, str]]: events = [] for card in soup.css("div.container div.card"): - img = card.css_first("img.league-logo") - - logo = img.attrs.get("src") if img else None - sport = card.css_first("h5.card-title").text(strip=True) name = card.css_first("p.card-text").text(strip=True) @@ -70,7 +66,6 @@ async def get_events(client: httpx.AsyncClient) -> list[dict[str, str]]: "sport": sport, "event": name, "link": urljoin(BASE_URL, href), - "logo": logo, } ) @@ -105,7 +100,7 @@ async def scrape(client: httpx.AsyncClient) -> None: entry = { "url": url, - "logo": ev["logo"] or logo, + "logo": logo, "base": BASE_URL, "timestamp": now.timestamp(), "id": tvg_id or "Live.Event.us", diff --git a/M3U8/scrapers/streameast.py b/M3U8/scrapers/streameast.py index 40f9d0c..a958ff5 100644 --- a/M3U8/scrapers/streameast.py +++ b/M3U8/scrapers/streameast.py @@ -187,8 +187,8 @@ async def scrape(client: httpx.AsyncClient) -> None: tvg_id, logo = leagues.info(sport) if sport == "NBA" and leagues.is_valid(event, "WNBA"): - sport, tvg_id = "WNBA", "WNBA.dummy.us" - logo = leagues.info("WNBA")[1] + sport = "WNBA" + tvg_id, logo = leagues.info("WNBA") key = f"[{sport}] {event} (SEAST)" diff --git a/M3U8/scrapers/utils/leagues.json b/M3U8/scrapers/utils/leagues.json index c8323c6..ef20f34 100644 --- a/M3U8/scrapers/utils/leagues.json +++ b/M3U8/scrapers/utils/leagues.json @@ -258,7 +258,7 @@ { "EREDIVISIE": { "logo": "https://a.espncdn.com/combiner/i?img=/i/leaguelogos/soccer/500/11.png", - "names": ["VRIENDENLOTERIJ EREDIVISIE"] + "names": ["NETHERLANDS EREDIVISIE", "VRIENDENLOTERIJ EREDIVISIE"] } }, { @@ -301,6 +301,12 @@ "names": ["GOOGLE PIXEL FRAUEN-BUNDESLIGA", "WOMEN'S FEDERAL LEAGUE"] } }, + { + "GREECE CUP": { + "logo": "https://i.gyazo.com/f80306df9b94a90f991b3cce386dc2b5.png", + "names": ["BETSSON GREECE UP", "GREEK CUP", "GREEK FOOTBALL CUP"] + } + }, { "J1 LEAGUE": { "logo": "https://a.espncdn.com/combiner/i?img=/i/leaguelogos/soccer/500/2199.png",