update M3U8

fix scraping for streambtw.py

M3U8/base.m3u8

@@ -235,8 +235,7 @@ https://fl1.moveonjoy.com/HALLMARK_MOVIES_MYSTERIES/index.m3u8
 http://fl1.moveonjoy.com/HBO/index.m3u8
 
 #EXTINF:-1 tvg-chno="79" tvg-id="HBO2.HD.us2" tvg-name="HBO 2" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s68140_dark_360w_270h.png" group-title="TV",HBO 2
-#EXTVLCOPT:http-user-agent=curl/8.5.0
-http://lucidhosting.xyz:82/sandriassoc@gmail.com/Sm8G4ddxoW/2071
+http://fl1.moveonjoy.com/HBO_2/index.m3u8
 
 #EXTINF:-1 tvg-chno="80" tvg-id="HBO.Comedy.HD.us2" tvg-name="HBO Comedy" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s59839_dark_360w_270h.png" group-title="TV",HBO Comedy
 http://fl1.moveonjoy.com/HBO_COMEDY/index.m3u8
@@ -251,7 +250,7 @@ https://fl1.moveonjoy.com/HBO_ZONE/index.m3u8
 https://fl1.moveonjoy.com/history_channel/index.m3u8
 
 #EXTINF:-1 tvg-chno="84" tvg-id="HLN.HD.us2" tvg-name="HLN TV" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s10145_dark_360w_270h.png" group-title="TV",HLN TV
-https://turnerlive.warnermediacdn.com/hls/live/586496/cnngo/hln/VIDEO_0_3564000.m3u8
+http://fl1.moveonjoy.com/HLN/index.m3u8
 
 #EXTINF:-1 tvg-chno="85" tvg-id="Investigation.Discovery.HD.us2" tvg-name="Investigation Discovery" tvg-logo="http://schedulesdirect-api20141201-logos.s3.dualstack.us-east-1.amazonaws.com/stationLogos/s16615_dark_360w_270h.png" group-title="TV",Investigation Discovery
 https://fl1.moveonjoy.com/INVESTIGATION_DISCOVERY/index.m3u8

M3U8/fetch.py

@@ -21,7 +21,6 @@ from scrapers import (
     streamfree,
     streamhub,
     streamsgate,
-    totalsportek,
     tvpass,
     watchfooty,
     webcast,
@@ -64,7 +63,6 @@ async def main() -> None:
             pw_tasks = [
                 asyncio.create_task(cdnlivetv.scrape(hdl_brwsr)),
                 asyncio.create_task(embedhd.scrape(hdl_brwsr)),
-                asyncio.create_task(livetvsx.scrape(hdl_brwsr)),
                 asyncio.create_task(pixel.scrape(hdl_brwsr)),
                 asyncio.create_task(ppv.scrape(xtrnl_brwsr)),
                 asyncio.create_task(roxie.scrape(hdl_brwsr)),
@@ -72,17 +70,15 @@ async def main() -> None:
                 asyncio.create_task(streamcenter.scrape(xtrnl_brwsr)),
                 # asyncio.create_task(streamhub.scrape(xtrnl_brwsr)),
                 asyncio.create_task(streamsgate.scrape(xtrnl_brwsr)),
-                asyncio.create_task(totalsportek.scrape(hdl_brwsr)),
                 asyncio.create_task(webcast.scrape(hdl_brwsr)),
-                asyncio.create_task(watchfooty.scrape(xtrnl_brwsr)),
             ]
 
             httpx_tasks = [
                 asyncio.create_task(fawa.scrape()),
                 asyncio.create_task(istreameast.scrape()),
-                # asyncio.create_task(pawa.scrape()),
+                asyncio.create_task(pawa.scrape()),
                 asyncio.create_task(shark.scrape()),
-                # asyncio.create_task(streambtw.scrape()),
+                asyncio.create_task(streambtw.scrape()),
                 asyncio.create_task(streamfree.scrape()),
                 asyncio.create_task(tvpass.scrape()),
                 asyncio.create_task(xstreameast.scrape()),
@@ -90,6 +86,10 @@ async def main() -> None:
 
             await asyncio.gather(*(pw_tasks + httpx_tasks))
 
+            # others
+            await watchfooty.scrape(xtrnl_brwsr)
+            await livetvsx.scrape(hdl_brwsr)
+
         finally:
             await hdl_brwsr.close()
 
@@ -114,7 +114,6 @@ async def main() -> None:
         | streamfree.urls
         | streamhub.urls
         | streamsgate.urls
-        | totalsportek.urls
         | tvpass.urls
         | watchfooty.urls
         | webcast.urls

M3U8/scrapers/streambtw.py

@@ -15,7 +15,7 @@ TAG = "STRMBTW"
 
 CACHE_FILE = Cache(TAG, exp=3_600)
 
-BASE_URLS = ["https://hiteasport.info/", "https://streambtw.com/"]
+BASE_URL = "https://hiteasport.info/"
 
 
 def fix_league(s: str) -> str:
@@ -45,36 +45,37 @@ async def process_event(url: str, url_num: int) -> str | None:
     return stream_link
 
 
-async def get_events(url: str) -> list[dict[str, str]]:
+async def get_events() -> list[dict[str, str]]:
     events = []
 
-    if not (html_data := await network.request(url, log=log)):
+    if not (html_data := await network.request(BASE_URL, log=log)):
         return events
 
     soup = HTMLParser(html_data.content)
 
-    for card in soup.css(".league"):
-        if not (league_elem := card.css_first(".league-header h4")):
+    for event in soup.css(".t-item"):
+        if not (league_elem := event.css_first(".t-league")):
             continue
 
-        for event in card.css(".match"):
-            if not (event_elem := event.css_first(".match-title")):
-                continue
+        if not (event_elem := event.css_first(".t-match")):
+            continue
 
-            if not (watch_btn := event.css_first(".watch-btn")) or not (
-                href := watch_btn.attributes.get("href")
-            ):
-                continue
+        if not (watch_btn := event.css_first("a.t-watch")) or not (
+            href := watch_btn.attributes.get("href")
+        ):
+            continue
 
-            league, name = league_elem.text(strip=True), event_elem.text(strip=True)
+        league = league_elem.text(strip=True)
 
-            events.append(
-                {
-                    "sport": fix_league(league),
-                    "event": name,
-                    "link": urljoin(url, href),
-                }
-            )
+        event = event_elem.text(strip=True)
+
+        events.append(
+            {
+                "sport": fix_league(league),
+                "event": event,
+                "link": urljoin(BASE_URL, href),
+            }
+        )
 
     return events
 
@@ -87,16 +88,9 @@ async def scrape() -> None:
 
         return
 
-    if not (base_url := await network.get_base(BASE_URLS)):
-        log.warning("No working StreamBTW mirrors")
+    log.info(f'Scraping from "{BASE_URL}"')
 
-        CACHE_FILE.write(urls)
-
-        return
-
-    log.info(f'Scraping from "{base_url}"')
-
-    events = await get_events(base_url)
+    events = await get_events()
 
     log.info(f"Processing {len(events)} new URL(s)")
 

M3U8/scrapers/totalsportek.py

@@ -1,147 +0,0 @@
-from functools import partial
-from urllib.parse import urljoin, urlparse
-
-from playwright.async_api import Browser
-from selectolax.parser import HTMLParser
-
-from .utils import Cache, Time, get_logger, leagues, network
-
-log = get_logger(__name__)
-
-urls: dict[str, dict[str, str | float]] = {}
-
-TAG = "TOTALSPRTK"
-
-CACHE_FILE = Cache(TAG, exp=28_800)
-
-BASE_URL = "https://live3.totalsportek777.com/"
-
-
-def fix_txt(s: str) -> str:
-    s = " ".join(s.split())
-
-    return s.upper() if s.islower() else s
-
-
-async def get_events(cached_keys: list[str]) -> list[dict[str, str]]:
-    events = []
-
-    if not (html_data := await network.request(BASE_URL, log=log)):
-        return events
-
-    soup = HTMLParser(html_data.content)
-
-    sport = "Live Event"
-
-    for node in soup.css("a"):
-        if not node.attributes.get("class"):
-            continue
-
-        if (parent := node.parent) and "my-1" in parent.attributes.get("class", ""):
-            if span := node.css_first("span"):
-                sport = span.text(strip=True)
-
-        sport = fix_txt(sport)
-
-        if not (teams := [t.text(strip=True) for t in node.css(".col-7 .col-12")]):
-            continue
-
-        if not (href := node.attributes.get("href")):
-            continue
-
-        href = urlparse(href).path if href.startswith("http") else href
-
-        if not (time_node := node.css_first(".col-3 span")):
-            continue
-
-        if time_node.text(strip=True) != "MatchStarted":
-            continue
-
-        event_name = fix_txt(" vs ".join(teams))
-
-        if f"[{sport}] {event_name} ({TAG})" in cached_keys:
-            continue
-
-        events.append(
-            {
-                "sport": sport,
-                "event": event_name,
-                "link": urljoin(BASE_URL, href),
-            }
-        )
-
-    return events
-
-
-async def scrape(browser: Browser) -> None:
-    cached_urls = CACHE_FILE.load()
-
-    valid_urls = {k: v for k, v in cached_urls.items() if v["url"]}
-
-    valid_count = cached_count = len(valid_urls)
-
-    urls.update(valid_urls)
-
-    log.info(f"Loaded {cached_count} event(s) from cache")
-
-    log.info(f'Scraping from "{BASE_URL}"')
-
-    events = await get_events(cached_urls.keys())
-
-    log.info(f"Processing {len(events)} new URL(s)")
-
-    if events:
-        now = Time.clean(Time.now())
-
-        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=ev["link"],
-                        url_num=i,
-                        page=page,
-                        log=log,
-                    )
-
-                    url = await network.safe_process(
-                        handler,
-                        url_num=i,
-                        semaphore=network.PW_S,
-                        log=log,
-                        timeout=6,
-                    )
-
-                    sport, event, link = (
-                        ev["sport"],
-                        ev["event"],
-                        ev["link"],
-                    )
-
-                    key = f"[{sport}] {event} ({TAG})"
-
-                    tvg_id, logo = leagues.get_tvg_info(sport, event)
-
-                    entry = {
-                        "url": url,
-                        "logo": logo,
-                        "base": link,
-                        "timestamp": now.timestamp(),
-                        "id": tvg_id or "Live.Event.us",
-                        "link": link,
-                    }
-
-                    cached_urls[key] = entry
-
-                    if url:
-                        valid_count += 1
-
-                        urls[key] = entry
-
-    if new_count := valid_count - 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)

readme.md

@@ -1,13 +1,10 @@
-## Base Log @ 2026-02-02 04:35 UTC
+## Base Log @ 2026-02-03 04:25 UTC
 
-### ✅ Working Streams: 142<br>❌ Dead Streams: 4
+### ✅ Working Streams: 145<br>❌ Dead Streams: 1
 
 | Channel | Error (Code) | Link |
 | ------- | ------------ | ---- |
-| HBO 2 | HTTP Error (000) | `http://lucidhosting.xyz:82/sandriassoc@gmail.com/Sm8G4ddxoW/2071` |
-| HLN TV | HTTP Error (000) | `https://turnerlive.warnermediacdn.com/hls/live/586496/cnngo/hln/VIDEO_0_3564000.m3u8` |
 | Premier Sports 2 | HTTP Error (000) | `http://hardcoremedia.xyz:80/NW3Vk7xXwW/8375773282/117038` |
-| Sony Movie Channel | HTTP Error (404) | `http://fl1.moveonjoy.com/Sony_Movie_Channel/index.m3u8` |
 ---
 #### Base Channels URL
 ```