update M3U8

M3U8/base.m3u8

@@ -58,7 +58,7 @@ http://41.205.93.154/BRAVO/index.m3u8
 https://buzzrota-web.amagi.tv/playlist.m3u8
 
 #EXTINF:-1 tvg-chno="20" tvg-id="CSPAN.us2" tvg-name="C-SPAN" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s10161_dark_360w_270h.png" group-title="TV",C-SPAN
-http://mytvstream.net:8080/live/30550113/30550113/136589.m3u8
+http://mytvstream.net:8080/live/bn80NG/909467/136589.m3u8
 
 #EXTINF:-1 tvg-chno="21" tvg-id="Cartoon.Network.HD.us2" tvg-name="Cartoon Network" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s12131_dark_360w_270h.png" group-title="TV",Cartoon Network
 http://23.237.104.106:8080/USA_CARTOON_NETWORK/index.m3u8
@@ -127,7 +127,7 @@ http://hardcoremedia.xyz/live/rabdsbmz/3731346838/129866.ts
 http://hardcoremedia.xyz/live/rabdsbmz/3731346838/129867.ts
 
 #EXTINF:-1 tvg-chno="43" tvg-id="Disney.Channel.HD.us2" tvg-name="Disney" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s10171_dark_360w_270h.png" group-title="TV",Disney Channel
-http://104.255.88.155/disney/index.m3u8
+http://hardcoremedia.xyz/live/rabdsbmz/3731346838/257087.ts
 
 #EXTINF:-1 tvg-chno="44" tvg-id="Disney.XD.HD.us2" tvg-name="Disney XD" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s18279_dark_360w_270h.png" group-title="TV",Disney XD
 http://hardcoremedia.xyz/live/rabdsbmz/3731346838/130092.ts
@@ -148,40 +148,40 @@ http://23.237.104.106:8080/USA_ESPNU/index.m3u8
 http://snowbank.houseinventer.com/6501/index.m3u8?token=M1lDdWljYkdyZGFhZzVxeGc2Mkt5OGJicWNxd2xheDkzWWVieEt5b3lZVERxNEduaVp1UnBxU2VlWmF0ZnRlRGxaMm1zNStDbnJOOXFZMlhtcStybmc9PQ==
 
 #EXTINF:-1 tvg-chno="50" tvg-id="FanDuel.Sports.Network.Detroit.24/7.HDTV.us" tvg-name="FDSN Detroit" tvg-logo="https://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s54286_dark_360w_270h.png" group-title="TV",FDSN Detroit
-http://mytvstream.net:8080/live/30550113/30550113/20930.m3u8
+http://mytvstream.net:8080/live/bn80NG/909467/20930.m3u8
 
 #EXTINF:-1 tvg-chno="51" tvg-id="FanDuel.Sports.Network.Florida.HDTV.(Out.of.Market).us" tvg-name="FDSN Florida" tvg-logo="https://i.gyazo.com/fad701fbaaafe161b13b23ed9b50179b.png" group-title="TV",FDSN Florida
-http://mytvstream.net:8080/live/30550113/30550113/46794.m3u8
+http://mytvstream.net:8080/live/bn80NG/909467/46794.m3u8
 
 #EXTINF:-1 tvg-chno="52" tvg-id="FanDuel.Sports.Network.Midwest.24/7.HDTV.us" tvg-name="FDSN Midwest" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s11058_dark_360w_270h.png" group-title="TV",FDSN Midwest
-http://mytvstream.net:8080/live/30550113/30550113/66795.m3u8
+http://mytvstream.net:8080/live/bn80NG/909467/66795.m3u8
 
 #EXTINF:-1 tvg-chno="53" tvg-id="FanDuel.Sports.Network.North.HDTV.us" tvg-name="FDSN North" tvg-logo="https://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s10977_dark_360w_270h.png" group-title="TV",FDSN North
-http://mytvstream.net:8080/live/30550113/30550113/58827.m3u8
+http://mytvstream.net:8080/live/bn80NG/909467/58827.m3u8
 
 #EXTINF:-1 tvg-chno="54" tvg-id="FanDuel.Sports.Network.Ohio.(Cleveland).HDTV.us" tvg-name="FDSN Ohio" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s49691_dark_360w_270h.png" group-title="TV",FDSN Ohio
-http://mytvstream.net:8080/live/30550113/30550113/17752.m3u8
+http://mytvstream.net:8080/live/bn80NG/909467/17752.m3u8
 
 #EXTINF:-1 tvg-chno="55" tvg-id="FanDuel.Sports.Network.Oklahoma.24/7.HDTV.(Tulsa).us" tvg-name="FDSN Oklahoma" tvg-logo="https://i.gyazo.com/80ad6fd142cd67f06eef58d9ce5aa72b.png" group-title="TV",FDSN Oklahoma
-http://mytvstream.net:8080/live/30550113/30550113/20934.m3u8
+http://mytvstream.net:8080/live/bn80NG/909467/20934.m3u8
 
 #EXTINF:-1 tvg-chno="56" tvg-id="FanDuel.Sports.Network.SoCal.HDTV.us" tvg-name="FDSN SoCal" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s16743_dark_360w_270h.png" group-title="TV",FDSN SoCal
-http://mytvstream.net:8080/live/30550113/30550113/221151.m3u8
+http://mytvstream.net:8080/live/bn80NG/909467/221151.m3u8
 
 #EXTINF:-1 tvg-chno="57" tvg-id="FanDuel.Sports.Network.Southeast.HDTV.(Mont./Birm./Dothan/Mobile.AL).us" tvg-name="FDSN Southeast" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s20789_dark_360w_270h.png" group-title="TV",FDSN Southeast
-http://mytvstream.net:8080/live/30550113/30550113/2213.m3u8
+http://mytvstream.net:8080/live/bn80NG/909467/2213.m3u8
 
 #EXTINF:-1 tvg-chno="58" tvg-id="FanDuel.Sports.Network.Southwest.HDTV.24/7.(Main).us" tvg-name="FDSN Southwest" tvg-logo="https://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s59629_dark_360w_270h.png" group-title="TV",FDSN Southwest
-http://mytvstream.net:8080/live/30550113/30550113/21843.m3u8
+http://mytvstream.net:8080/live/bn80NG/909467/21843.m3u8
 
 #EXTINF:-1 tvg-chno="59" tvg-id="FanDuel.Sports.Network.Sun.South.24/7.HDTV.(South.Marlins,.Rays,.Heat).us" tvg-name="FDSN Sun" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s61084_dark_360w_270h.png" group-title="TV",FDSN Sun
-http://mytvstream.net:8080/live/30550113/30550113/104917.m3u8
+http://mytvstream.net:8080/live/bn80NG/909467/104917.m3u8
 
 #EXTINF:-1 tvg-chno="60" tvg-id="FanDuel.Sports.Network.West.HDTV.us" tvg-name="FDSN West" tvg-logo="https://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s59627_dark_360w_270h.png" group-title="TV",FDSN West
-http://mytvstream.net:8080/live/30550113/30550113/20932.m3u8
+http://mytvstream.net:8080/live/bn80NG/909467/20932.m3u8
 
 #EXTINF:-1 tvg-chno="61" tvg-id="FanDuel.Sports.Network.Wisconsin.24/7.HDTV.us" tvg-name="FDSN Wisconsin" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s16348_dark_360w_270h.png" group-title="TV",FDSN Wisconsin
-http://mytvstream.net:8080/live/30550113/30550113/78599.m3u8
+http://mytvstream.net:8080/live/bn80NG/909467/78599.m3u8
 
 #EXTINF:-1 tvg-chno="62" tvg-id="plex.tv.FIFA+.plex" tvg-name="FIFA+ TV" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s136235_dark_360w_270h.png" group-title="TV",FIFA+ TV
 https://jmp2.uk/stvp-IN270000230
@@ -253,7 +253,7 @@ http://23.237.104.106:8080/USA_HBO2/index.m3u8
 http://hardcoremedia.xyz/live/rabdsbmz/3731346838/129990.ts
 
 #EXTINF:-1 tvg-chno="85" tvg-id="HBO.Drama.us2" tvg-name="HBO Family" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s34879_dark_360w_270h.png" group-title="TV",HBO Family
-http://mytvstream.net:8080/live/30550113/30550113/17772.m3u8
+http://mytvstream.net:8080/live/bn80NG/909467/17772.m3u8
 
 #EXTINF:-1 tvg-chno="86" tvg-id="HBO.Zone.HD.us2" tvg-name="HBO Zone" tvg-logo="https://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s18431_dark_360w_270h.png" group-title="TV",HBO Zone
 http://hardcoremedia.xyz/live/rabdsbmz/3731346838/129995.ts
@@ -307,10 +307,10 @@ http://212.102.60.231/NBA_TV/index.m3u8
 http://stream.cammonitorplus.net/1842/index.m3u8?token=MnE3ZWg1YkgxdFdWZlo2c2hLMkltWnJhcFo1OHhxcXVyb2pKazZXaWxZRERxNEduaVp1UnBxU2VlWmF0ZnRlRGxaMm1zNStDbnJOOXFZMlhtcStybmc9PQ==
 
 #EXTINF:-1 tvg-chno="103" tvg-id="NBC.Sports.Bay.Area.HD.us2" tvg-name="NBC Sports Bay Area" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s63138_dark_360w_270h.png" group-title="TV",NBC Sports Bay Area
-http://mytvstream.net:8080/live/30550113/30550113/9900.m3u8
+http://mytvstream.net:8080/live/bn80NG/909467/9900.m3u8
 
 #EXTINF:-1 tvg-chno="104" tvg-id="NBC.Sports.Boston.HD.us2" tvg-name="NBC Sports Boston" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s49198_dark_360w_270h.png" group-title="TV",NBC Sports Boston
-http://mytvstream.net:8080/live/30550113/30550113/20939.m3u8
+http://mytvstream.net:8080/live/bn80NG/909467/20939.m3u8
 
 #EXTINF:-1 tvg-chno="105" tvg-id="NBC.Sports.California.SAT.us2" tvg-name="NBC Sports California" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s45540_dark_360w_270h.png" group-title="TV",NBC Sports California
 http://hardcoremedia.xyz/live/rabdsbmz/3731346838/136474.ts

M3U8/fetch.py

@@ -5,6 +5,7 @@ from pathlib import Path
 
 from playwright.async_api import async_playwright
 from scrapers import (
+    cdnlivetv,
     embedhd,
     fawa,
     istreameast,
@@ -61,6 +62,7 @@ async def main() -> None:
             xtrnl_brwsr = await network.browser(p, external=True)
 
             pw_tasks = [
+                asyncio.create_task(cdnlivetv.scrape(hdl_brwsr)),
                 asyncio.create_task(embedhd.scrape(hdl_brwsr)),
                 asyncio.create_task(pixel.scrape(hdl_brwsr)),
                 asyncio.create_task(ppv.scrape(xtrnl_brwsr)),
@@ -98,7 +100,8 @@ async def main() -> None:
             await network.client.aclose()
 
     additions = (
-        embedhd.urls
+        cdnlivetv.urls
+        | embedhd.urls
         | fawa.urls
         | istreameast.urls
         | livetvsx.urls

M3U8/scrapers/cdnlivetv.py

@@ -0,0 +1,151 @@
+from functools import partial
+from urllib.parse import urljoin
+
+from playwright.async_api import Browser
+
+from .utils import Cache, Time, get_logger, leagues, network
+
+log = get_logger(__name__)
+
+urls: dict[str, dict[str, str | float]] = {}
+
+TAG = "CDNTV"
+
+CACHE_FILE = Cache(TAG, exp=10_800)
+
+API_FILE = Cache(f"{TAG}-api", exp=19_800)
+
+API_URL = "https://api.cdn-live.tv"
+
+
+async def get_events(cached_keys: list[str]) -> list[dict[str, str]]:
+    now = Time.clean(Time.now())
+
+    events = []
+
+    if not (api_data := API_FILE.load(per_entry=False)):
+        log.info("Refreshing API cache")
+
+        if r := await network.request(
+            urljoin(API_URL, "api/v1/events/sports"),
+            log=log,
+            params={"user": "cdnlivetv", "plan": "free"},
+        ):
+            api_data = r.json().get("cdn-live-tv", {"timestamp": now.timestamp()})
+
+        API_FILE.write(api_data)
+
+    start_dt = now.delta(minutes=-30)
+    end_dt = now.delta(minutes=30)
+
+    sports = [key for key in api_data.keys() if not key.islower()]
+
+    for sport in sports:
+        event_info = api_data[sport]
+
+        for event in event_info:
+            t1, t2 = event["awayTeam"], event["homeTeam"]
+
+            name = f"{t1} vs {t2}"
+
+            league = event["tournament"]
+
+            if f"[{league}] {name} ({TAG})" in cached_keys:
+                continue
+
+            event_dt = Time.from_str(event["start"], timezone="UTC")
+
+            if not start_dt <= event_dt <= end_dt:
+                continue
+
+            if not (channels := event.get("channels")):
+                continue
+
+            event_links: list[str] = [channel["url"] for channel in channels]
+
+            # if not (
+            #     link := (
+            #         event_links[0]
+            #         if len(event_links) == 1
+            #         else await network.get_base(event_links)
+            #     )
+            # ):
+            #     continue
+
+            link = event_links[0]
+
+            events.append(
+                {
+                    "sport": league,
+                    "event": name,
+                    "link": link,
+                    "timestamp": event_dt.timestamp(),
+                }
+            )
+
+    return events
+
+
+async def scrape(browser: Browser) -> None:
+    cached_urls = CACHE_FILE.load()
+
+    cached_count = len(cached_urls)
+
+    urls.update(cached_urls)
+
+    log.info(f"Loaded {cached_count} event(s) from cache")
+
+    log.info(f'Scraping from "{API_URL}"')
+
+    events = await get_events(cached_urls.keys())
+
+    if events:
+        log.info(f"Processing {len(events)} new URL(s)")
+
+        async with network.event_context(browser) as context:
+            for i, ev in enumerate(events, start=1):
+                async with network.event_page(context) as page:
+                    handler = partial(
+                        network.process_event,
+                        url=(link := ev["link"]),
+                        url_num=i,
+                        page=page,
+                        log=log,
+                    )
+
+                    url = await network.safe_process(
+                        handler,
+                        url_num=i,
+                        semaphore=network.PW_S,
+                        log=log,
+                    )
+
+                    if url:
+                        sport, event, ts = (
+                            ev["sport"],
+                            ev["event"],
+                            ev["timestamp"],
+                        )
+
+                        key = f"[{sport}] {event} ({TAG})"
+
+                        tvg_id, logo = leagues.get_tvg_info(sport, event)
+
+                        entry = {
+                            "url": url,
+                            "logo": logo,
+                            "base": link,
+                            "timestamp": ts,
+                            "id": tvg_id or "Live.Event.us",
+                            "link": link,
+                        }
+
+                        urls[key] = cached_urls[key] = entry
+
+    if new_count := len(cached_urls) - cached_count:
+        log.info(f"Collected and cached {new_count} new event(s)")
+
+    else:
+        log.info("No new events found")
+
+    CACHE_FILE.write(cached_urls)