update M3U8

- edit scraping for ovogoal.py
- misc edits.

M3U8/base.m3u8

@@ -409,16 +409,16 @@ http://mytvstream.net:8080/live/56481106/11185695/21842.m3u8
 http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/30847.ts
 
 #EXTINF:-1 tvg-chno="137" tvg-id="Sportsnet.360.HD.ca2" tvg-name="Sportsnet 360" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s49952_dark_360w_270h.png" group-title="TV",Sportsnet 360
-https://stream.decentdoubts.net/803/index.m3u8
+http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/3377.ts
 
 #EXTINF:-1 tvg-chno="138" tvg-id="Sportsnet.East.ca2" tvg-name="Sportsnet East" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s62109_dark_360w_270h.png" group-title="TV",Sportsnet East
-https://stream.decentdoubts.net/801/index.m3u8
+http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/1720.ts
 
 #EXTINF:-1 tvg-chno="139" tvg-id="SNY.SportsNet.New.York.HD.us2" tvg-name="SportsNet New York" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s50038_dark_360w_270h.png" group-title="TV",SportsNet New York
 http://212.102.60.231/SNY/index.m3u8
 
 #EXTINF:-1 tvg-chno="140" tvg-id="Sportsnet.One.ca2" tvg-name="Sportsnet One" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s68859_dark_360w_270h.png" group-title="TV",Sportsnet One
-https://stream.decentdoubts.net/808/index.m3u8
+http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/3378.ts
 
 #EXTINF:-1 tvg-chno="141" tvg-id="SportsNet.Pittsburgh.HD.us2" tvg-name="SportsNet Pittsburgh" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s26028_dark_360w_270h.png" group-title="TV",SportsNet Pittsburgh
 http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/59945.ts
@@ -451,10 +451,10 @@ https://turnerlive.warnermediacdn.com/hls/live/2023168/tnteast/slate/VIDEO_0_356
 https://turnerlive.warnermediacdn.com/hls/live/2023176/trueast/slate/VIDEO_0_3564000.m3u8
 
 #EXTINF:-1 tvg-chno="151" tvg-id="TSN.1.ca2" tvg-name="TSN1" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s11182_dark_360w_270h.png" group-title="TV",TSN1
-https://stream.decentdoubts.net/805/index.m3u8
+http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/770.ts
 
 #EXTINF:-1 tvg-chno="152" tvg-id="TSN.2.ca2" tvg-name="TSN2" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s61474_dark_360w_270h.png" group-title="TV",TSN2
-https://stream.decentdoubts.net/806/index.m3u8
+http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/771.ts
 
 #EXTINF:-1 tvg-chno="153" tvg-id="Turner.Classic.Movies.HD.us2" tvg-name="Turner Classic Movies" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s12852_dark_360w_270h.png" group-title="TV",Turner Classic Movies
 https://turnerlive.warnermediacdn.com/hls/live/2023186/tcmeast/noslate/VIDEO_1_5128000.m3u8

M3U8/fetch.py

@@ -62,7 +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(cdnlivetv.scrape(hdl_brwsr)),
                 asyncio.create_task(embedhd.scrape(hdl_brwsr)),
                 # asyncio.create_task(fsports.scrape(xtrnl_brwsr)),
                 asyncio.create_task(ppv.scrape(xtrnl_brwsr)),
@@ -75,12 +75,12 @@ async def main() -> None:
                 asyncio.create_task(istreameast.scrape()),
                 # asyncio.create_task(listapreta.scrape()),
                 asyncio.create_task(mainportal.scrape()),
-                # asyncio.create_task(ovogoal.scrape()),
+                asyncio.create_task(ovogoal.scrape()),
                 asyncio.create_task(pawa.scrape()),
                 asyncio.create_task(shark.scrape()),
                 asyncio.create_task(streamcenter.scrape()),
                 # asyncio.create_task(streamhub.scrape()),
-                # asyncio.create_task(streamsgate.scrape()),
+                asyncio.create_task(streamsgate.scrape()),
                 asyncio.create_task(streamtpnew.scrape()),
                 asyncio.create_task(totalsportek.scrape()),
                 asyncio.create_task(tvapp.scrape()),

M3U8/scrapers/cdnlivetv.py

@@ -15,7 +15,7 @@ CACHE_FILE = Cache(TAG, exp=10_800)
 
 API_FILE = Cache(f"{TAG}-api", exp=19_800)
 
-API_URL = "https://api.cdn-live.tv"
+API_URL = "https://api.cdnlivetv.tv"
 
 
 async def get_events(cached_keys: list[str]) -> list[dict[str, str]]:

M3U8/scrapers/fawa.py

@@ -76,7 +76,7 @@ async def get_events(cached_hrefs: set[str]) -> list[dict[str, str]]:
             {
                 "sport": sport,
                 "event": clean_event.sub("", event_name),
-                "link": urljoin(BASE_URL, href),
+                "link": urljoin(f"{html_data.url}", href),
                 "href": href,
             }
         )

M3U8/scrapers/istreameast.py

@@ -1,4 +1,3 @@
-import base64
 import re
 from functools import partial
 
@@ -17,39 +16,36 @@ CACHE_FILE = Cache(TAG, exp=10_800)
 BASE_URL = "https://istreameast.app"
 
 
-async def process_event(url: str, url_num: int) -> str | None:
+async def process_event(url: str, url_num: int) -> tuple[str | None, str | None]:
+    nones = None, None
+
     if not (event_data := await network.request(url, log=log)):
         log.warning(f"URL {url_num}) Failed to load url.")
-
-        return
+        return nones
 
     soup = HTMLParser(event_data.content)
 
     if not (iframe := soup.css_first("iframe#wp_player")):
         log.warning(f"URL {url_num}) No iframe element found.")
-
-        return
+        return nones
 
     if not (iframe_src := iframe.attributes.get("src")):
         log.warning(f"URL {url_num}) No iframe source found.")
-
-        return
+        return nones
 
     if not (iframe_src_data := await network.request(iframe_src, log=log)):
         log.warning(f"URL {url_num}) Failed to load iframe source.")
+        return nones
 
-        return
-
-    pattern = re.compile(r"source:\s*window\.atob\(\s*'([^']+)'\s*\)", re.I)
+    pattern = re.compile(r'const\s+source\s+=\s+"([^"]*)"', re.I)
 
     if not (match := pattern.search(iframe_src_data.text)):
         log.warning(f"URL {url_num}) No Clappr source found.")
-
-        return
+        return nones
 
     log.info(f"URL {url_num}) Captured M3U8")
 
-    return base64.b64decode(match[1]).decode("utf-8")
+    return match[1], iframe_src
 
 
 async def get_events(cached_keys: list[str]) -> list[dict[str, str]]:
@@ -124,7 +120,7 @@ async def scrape() -> None:
                 url_num=i,
             )
 
-            url = await network.safe_process(
+            url, iframe = await network.safe_process(
                 handler,
                 url_num=i,
                 semaphore=network.HTTP_S,
@@ -140,7 +136,7 @@ async def scrape() -> None:
             entry = {
                 "url": url,
                 "logo": logo,
-                "base": "https://gooz.aapmains.net",
+                "base": iframe,
                 "timestamp": now.timestamp(),
                 "id": tvg_id or "Live.Event.us",
                 "link": link,

M3U8/scrapers/ovogoal.py

@@ -1,5 +1,6 @@
 import re
 from functools import partial
+from urllib.parse import urljoin
 
 from selectolax.parser import HTMLParser
 
@@ -13,11 +14,7 @@ TAG = "OVO"
 
 CACHE_FILE = Cache(TAG, exp=28_800)
 
-BASE_URL = "https://orbixa.top"
-
-
-def fix_league(s: str) -> str:
-    return " ".join(x.capitalize() for x in s.split()) if len(s) > 5 else s.upper()
+BASE_URL = "https://ovogoaal.com"
 
 
 async def process_event(url: str, url_num: int) -> tuple[str | None, str | None]:
@@ -64,34 +61,31 @@ async def get_events(cached_keys: list[str]) -> list[dict[str, str]]:
 
     soup = HTMLParser(html_data.content)
 
-    sport = None
+    sport = "Live Event"
 
-    for node in soup.css(".wrapper *"):
-        if (cls := node.attributes.get("class")) == "section-title":
-            sport = fix_league(node.text(strip=True))
+    for card in soup.css(".main-content .stream-row"):
+        if (not (watch_btn_elem := card.css_first(".watch-btn"))) or (
+            not (onclick := watch_btn_elem.attributes.get("onclick"))
+        ):
+            continue
 
-        if node.tag == "a" and cls == "match":
-            if not sport:
-                continue
+        if not (event_name_elem := card.css_first(".stream-info")):
+            continue
 
-            if not (team_elems := node.css(".team")):
-                continue
+        href = onclick.split(".href=")[-1].replace("'", "")
 
-            if not (href := node.attributes.get("href")):
-                continue
+        event_name = event_name_elem.text(strip=True)
 
-            event_name = " vs ".join(team.text(strip=True) for team in team_elems)
+        if f"[{sport}] {event_name} ({TAG})" in cached_keys:
+            continue
 
-            if f"[{sport}] {event_name} ({TAG})" in cached_keys:
-                continue
-
-            events.append(
-                {
-                    "sport": sport,
-                    "event": event_name,
-                    "link": href,
-                }
-            )
+        events.append(
+            {
+                "sport": sport,
+                "event": event_name,
+                "link": urljoin(f"{html_data.url}", href),
+            }
+        )
 
     return events
 

M3U8/scrapers/ppv.py

@@ -18,7 +18,7 @@ API_FILE = Cache(f"{TAG}-api", exp=19_800)
 API_MIRRORS = [
     "https://api.ppv.to/api/streams",
     "https://api.ppv.cx/api/streams",
-    "https://api.ppv.sh/api/streams",
+    # "https://api.ppv.sh/api/streams",
     # "https://api.ppv.la/api/streams",
 ]
 

M3U8/scrapers/streamsgate.py

@@ -80,7 +80,7 @@ async def process_event(url: str, url_num: int) -> tuple[str | None, str | None]
 
     log.info(f"URL {url_num}) Captured M3U8")
 
-    return match[2]
+    return match[2], ifr_src
 
 
 async def refresh_api_cache(now_ts: float) -> list[dict[str, Any]]:
@@ -178,7 +178,7 @@ async def scrape() -> None:
                 url_num=i,
             )
 
-            url = await network.safe_process(
+            url, iframe = await network.safe_process(
                 handler,
                 url_num=i,
                 semaphore=network.PW_S,
@@ -198,7 +198,7 @@ async def scrape() -> None:
             entry = {
                 "url": url,
                 "logo": logo,
-                "base": "https://streamfree.click",
+                "base": iframe,
                 "timestamp": ts,
                 "id": tvg_id or "Live.Event.us",
                 "link": link,

M3U8/scrapers/totalsportek.py

@@ -113,7 +113,7 @@ async def get_events(cached_keys: list[str]) -> list[dict[str, str]]:
             {
                 "sport": sport,
                 "event": event_name,
-                "link": urljoin(BASE_URL, href),
+                "link": urljoin(f"{html_data.url}", href),
             }
         )
 

M3U8/scrapers/tvapp.py

@@ -66,7 +66,7 @@ async def get_events() -> list[dict[str, str]]:
                 {
                     "sport": sport,
                     "event": event_name,
-                    "link": urljoin(BASE_URL, href),
+                    "link": urljoin(f"{html_data.url}", href),
                 }
             )
 

readme.md

@@ -1,12 +1,22 @@
-## Base Log @ 2026-04-10 15:12 UTC
+## Base Log @ 2026-04-11 15:01 UTC
 
-### ✅ Working Streams: 158<br>❌ Dead Streams: 3
+### ✅ Working Streams: 148<br>❌ Dead Streams: 13
 
 | Channel | Error (Code) | Link |
 | ------- | ------------ | ---- |
+| FDSN Southeast | HTTP Error (404) | `http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/82301.ts` |
 | FX Movie Channel | HTTP Error (404) | `http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/39873.ts` |
-| TV One | HTTP Error (404) | `http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/13010.ts` |
+| Grit TV | HTTP Timeout (408) | `http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/15086.ts` |
+| HBO Family | HTTP Timeout (408) | `http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/760.ts` |
+| Hallmark Family | HTTP Timeout (408) | `http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/304609.ts` |
+| Hallmark Mystery | HTTP Timeout (408) | `http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/3388.ts` |
+| History Channel | HTTP Timeout (408) | `http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/761.ts` |
+| ION TV | HTTP Timeout (408) | `http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/147661.ts` |
+| Investigation Discovery | HTTP Timeout (408) | `http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/8557.ts` |
+| Lifetime | HTTP Timeout (408) | `http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/4667.ts` |
+| Marquee Sports Network | HTTP Timeout (408) | `http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/150609.ts` |
 | YES Network | HTTP Error (404) | `http://23.237.104.106:8080/USA_YES_NETWORK/index.m3u8` |
+| getTV | HTTP Error (404) | `http://iptvtree.net:8080/live/7e4b0dbd/1dd755dc3f/194187.ts` |
 ---
 #### Base Channels URL
 ```