From 00000d93c6e6a1b9b149e61084c3a326454d11ce Mon Sep 17 00:00:00 2001 From: doms9 <96013514+doms9@users.noreply.github.com> Date: Sat, 23 Aug 2025 15:15:47 -0400 Subject: [PATCH] e --- M3U8/fetch.py | 2 +- M3U8/scrape/fstv.py | 7 ++++++- M3U8/scrape/tvpass.py | 8 ++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/M3U8/fetch.py b/M3U8/fetch.py index d9f2a84..43b4d0e 100644 --- a/M3U8/fetch.py +++ b/M3U8/fetch.py @@ -42,7 +42,7 @@ def main() -> None: base_m3u8, chnl_number = vanilla_fetch() - additions = {**tvpass.urls, **fstv.urls} + additions = tvpass.urls | fstv.urls lines = [] diff --git a/M3U8/scrape/fstv.py b/M3U8/scrape/fstv.py index 3406f8d..e54fb8c 100644 --- a/M3U8/scrape/fstv.py +++ b/M3U8/scrape/fstv.py @@ -5,7 +5,12 @@ from bs4 import BeautifulSoup urls: dict[str, str] = {} -mirrors = {"https://fstv.online", "https://fstv.space", "https://fstv.zip"} +mirrors = { + "https://fstv.online", + "https://fstv.space", + "https://fstv.zip", + "https://fstv.us", +} def check_status(client: httpx.Client, url: str) -> bool: diff --git a/M3U8/scrape/tvpass.py b/M3U8/scrape/tvpass.py index fe40a2e..bf22c3e 100644 --- a/M3U8/scrape/tvpass.py +++ b/M3U8/scrape/tvpass.py @@ -18,12 +18,12 @@ TZ = pytz.timezone("America/New_York") def cache_expired(t: float) -> bool: now = datetime.now(TZ) - r = now.replace(hour=11, minute=0, second=0, microsecond=0) + eleven = now.replace(hour=11, minute=0, second=0, microsecond=0) - if now < r: - r -= timedelta(days=1) + if now < eleven: + eleven -= timedelta(days=1) - return t < r.timestamp() + return t < eleven.timestamp() def load_cache() -> dict[str, str]: