e

re-add watchfooty
misc. edits

M3U8/fetch.py

@@ -18,6 +18,7 @@ from scrapers import (
     strmd,
     time4tv,
     tvpass,
+    watchfooty,
     webcast,
 )
 from scrapers.utils import get_logger, network
@@ -61,6 +62,7 @@ async def main() -> None:
         asyncio.create_task(strmd.scrape()),
         asyncio.create_task(time4tv.scrape()),
         asyncio.create_task(tvpass.scrape()),
+        asyncio.create_task(watchfooty.scrape()),
         asyncio.create_task(webcast.scrape()),
     ]
 
@@ -81,6 +83,7 @@ async def main() -> None:
         | streamsgate.urls
         | time4tv.urls
         | tvpass.urls
+        | watchfooty.urls
         | webcast.urls
     )
 

M3U8/scrapers/streamsgate.py

@@ -83,7 +83,7 @@ async def get_events(cached_keys: list[str]) -> list[dict[str, str]]:
     end_dt = now.delta(minutes=5)
 
     for stream_group in api_data:
-        event_ts = stream_group.get("ts")
+        date = stream_group.get("time")
 
         sport = stream_group.get("league")
 
@@ -91,16 +91,13 @@ async def get_events(cached_keys: list[str]) -> list[dict[str, str]]:
 
         event = get_event(t1, t2)
 
-        if not (event_ts and sport):
+        if not (date and sport):
-            continue
-
-        if "F1 Abu Dhabi" in event:  # api bug
             continue
 
         if f"[{sport}] {event} ({TAG})" in cached_keys:
             continue
 
-        event_dt = Time.from_ts(event_ts)
+        event_dt = Time.from_str(date, timezone="UTC")
 
         if not start_dt <= event_dt <= end_dt:
             continue

M3U8/scrapers/utils/config.py

@@ -89,6 +89,7 @@ class Time(datetime):
 
         else:
             formats = [
+                "%b %d, %Y %H:%M %Z",
                 "%B %d, %Y %H:%M",
                 "%B %d, %Y %I:%M %p",
                 "%B %d, %Y %I:%M:%S %p",
@@ -98,9 +99,10 @@ class Time(datetime):
                 "%Y-%m-%d %H:%M:%S",
                 "%Y-%m-%d %I:%M %p",
                 "%Y-%m-%d %H:%M %p",
+                "%Y-%m-%dT%H:%M:%S",
+                "%Y-%m-%dT%H:%M:%S.%fZ",
                 "%Y/%m/%d %H:%M",
                 "%Y/%m/%d %H:%M:%S",
-                "%Y-%m-%dT%H:%M:%S",
                 "%Y/%m/%dT%H:%M:%S.%fZ",
                 "%m/%d/%Y %H:%M",
                 "%m/%d/%Y %I:%M %p",

M3U8/scrapers/watchfooty.py

@@ -0,0 +1,323 @@
+import asyncio
+import re
+from functools import partial
+from itertools import chain
+from typing import Any
+from urllib.parse import urljoin
+
+from playwright.async_api import BrowserContext, async_playwright
+
+from .utils import Cache, Time, get_logger, leagues, network
+
+log = get_logger(__name__)
+
+urls: dict[str, dict[str, str | float]] = {}
+
+TAG = "WATCHFTY"
+
+CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=10_800)
+
+API_FILE = Cache(f"{TAG.lower()}-api.json", exp=19_800)
+
+API_URL = "https://api.watchfooty.st"
+
+BASE_MIRRORS = [
+    "https://www.watchfooty.top",
+    "https://www.watchfooty.st",
+    "https://www.watchfooty.su",
+]
+
+VALID_SPORTS = [
+    "american-football",
+    # "australian-football",
+    # "baseball",
+    "basketball",
+    # "cricket",
+    # "darts",
+    "fighting",
+    "football",
+    "golf",
+    "hockey",
+    "racing",
+    # "rugby",
+    # "tennis",
+    # "volleyball",
+]
+
+
+async def refresh_api_cache(now: Time) -> list[dict[str, Any]]:
+    log.info("Refreshing API cache")
+
+    tasks = [
+        network.request(
+            urljoin(API_URL, "api/v1/matches/all"),
+            log=log,
+            params={"date": d.date()},
+        )
+        for d in [now, now.delta(days=1)]
+    ]
+
+    results = await asyncio.gather(*tasks)
+
+    if not (data := [*chain.from_iterable(r.json() for r in results if r)]):
+        return []
+
+    for ev in data:
+        ev["ts"] = ev.pop("timestamp")
+
+        data[-1]["timestamp"] = now.timestamp()
+
+    return data
+
+
+async def process_event(
+    url: str,
+    url_num: int,
+    context: BrowserContext,
+) -> tuple[str | None, str | None]:
+
+    pattern = re.compile(r"\((\d+)\)")
+
+    page = await context.new_page()
+
+    captured: list[str] = []
+
+    got_one = asyncio.Event()
+
+    handler = partial(
+        network.capture_req,
+        captured=captured,
+        got_one=got_one,
+    )
+
+    page.on("request", handler)
+
+    try:
+        await page.goto(
+            url,
+            wait_until="domcontentloaded",
+            timeout=15_000,
+        )
+
+        await page.wait_for_timeout(2_000)
+
+        try:
+            header = await page.wait_for_selector(
+                "text=/Stream Links/i",
+                timeout=5_000,
+            )
+
+            text = await header.inner_text()
+        except TimeoutError:
+            log.warning(f"URL {url_num}) Can't find stream links header.")
+
+            return None, None
+
+        if not (match := pattern.search(text)) or int(match[1]) == 0:
+            log.warning(f"URL {url_num}) No available stream links.")
+
+            return None, None
+
+        try:
+            first_available = await page.wait_for_selector(
+                'a[href*="/stream/"]',
+                timeout=3_000,
+            )
+        except TimeoutError:
+            log.warning(f"URL {url_num}) No available stream links.")
+
+            return None, None
+
+        if not (href := await first_available.get_attribute("href")):
+            log.warning(f"URL {url_num}) No available stream links.")
+
+            return None, None
+
+        await page.goto(
+            href,
+            wait_until="domcontentloaded",
+            timeout=5_000,
+        )
+
+        if not (iframe := await page.query_selector("iframe")):
+            log.warning(f"URL {url_num}) No iframe found.")
+
+            return None, None
+
+        if not (iframe_src := await iframe.get_attribute("src")):
+            log.warning(f"URL {url_num}) No iframe source found.")
+
+            return None, None
+
+        wait_task = asyncio.create_task(got_one.wait())
+
+        try:
+            await asyncio.wait_for(wait_task, timeout=6)
+        except asyncio.TimeoutError:
+            log.warning(f"URL {url_num}) Timed out waiting for M3U8.")
+
+            return None, None
+
+        finally:
+            if not wait_task.done():
+                wait_task.cancel()
+
+                try:
+                    await wait_task
+                except asyncio.CancelledError:
+                    pass
+
+        if captured:
+            log.info(f"URL {url_num}) Captured M3U8")
+
+            return captured[-1], iframe_src
+
+        log.warning(f"URL {url_num}) No M3U8 captured after waiting.")
+
+        return None, None
+
+    except Exception as e:
+        log.warning(f"URL {url_num}) Exception while processing: {e}")
+
+        return None, None
+
+    finally:
+        page.remove_listener("request", handler)
+
+        await page.close()
+
+
+async def get_events(base_url: str, cached_keys: list[str]) -> list[dict[str, str]]:
+    now = Time.clean(Time.now())
+
+    if not (api_data := API_FILE.load(per_entry=False, index=-1)):
+        api_data = await refresh_api_cache(now)
+
+        API_FILE.write(api_data)
+
+    events = []
+
+    pattern = re.compile(r"\-+|\(")
+
+    start_dt = now.delta(minutes=-30)
+    end_dt = now.delta(minutes=5)
+
+    for event in api_data:
+        match_id = event.get("matchId")
+
+        name = event.get("title")
+
+        league = event.get("league")
+
+        if not (match_id and name and league):
+            continue
+
+        if event["sport"] not in VALID_SPORTS:
+            continue
+
+        sport = pattern.split(league, 1)[0].strip()
+
+        if f"[{sport}] {name} ({TAG})" in cached_keys:
+            continue
+
+        if not (date := event.get("date")):
+            continue
+
+        event_dt = Time.from_str(date, timezone="UTC")
+
+        if not start_dt <= event_dt <= end_dt:
+            continue
+
+        logo = urljoin(API_URL, poster) if (poster := event.get("poster")) else None
+
+        events.append(
+            {
+                "sport": sport,
+                "event": name,
+                "link": urljoin(base_url, f"stream/{match_id}"),
+                "logo": logo,
+                "timestamp": event_dt.timestamp(),
+            }
+        )
+
+    return events
+
+
+async def scrape() -> 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")
+
+    if not (base_url := await network.get_base(BASE_MIRRORS)):
+        log.warning("No working Watch Footy mirrors")
+
+        CACHE_FILE.write(cached_urls)
+
+        return
+
+    log.info(f'Scraping from "{base_url}"')
+
+    events = await get_events(base_url, cached_urls.keys())
+
+    log.info(f"Processing {len(events)} new URL(s)")
+
+    if events:
+        async with async_playwright() as p:
+            browser, context = await network.browser(p, browser="external")
+
+            for i, ev in enumerate(events, start=1):
+                handler = partial(
+                    process_event,
+                    url=ev["link"],
+                    url_num=i,
+                    context=context,
+                )
+
+                url, iframe = await network.safe_process(
+                    handler,
+                    url_num=i,
+                    log=log,
+                )
+
+                sport, event, logo, ts, link = (
+                    ev["sport"],
+                    ev["event"],
+                    ev["logo"],
+                    ev["timestamp"],
+                    ev["link"],
+                )
+
+                key = f"[{sport}] {event} ({TAG})"
+
+                tvg_id, pic = leagues.get_tvg_info(sport, event)
+
+                entry = {
+                    "url": url,
+                    "logo": logo or pic,
+                    "base": iframe,
+                    "timestamp": ts,
+                    "id": tvg_id or "Live.Event.us",
+                    "link": link,
+                }
+
+                cached_urls[key] = entry
+
+                if url:
+                    valid_count += 1
+                    urls[key] = entry
+
+            await browser.close()
+
+    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)