e

rename tvpass.py -> tvapp.py
misc edits

M3U8/fetch.py

@@ -21,7 +21,7 @@ from scrapers import (
     streamhub,
     streamsgate,
     totalsportek,
-    tvpass,
+    tvapp,
     watchfooty,
     webcast,
     xstreameast,
@@ -71,7 +71,7 @@ async def main() -> None:
                 # asyncio.create_task(streamhub.scrape(xtrnl_brwsr)),
                 asyncio.create_task(streamsgate.scrape(xtrnl_brwsr)),
                 asyncio.create_task(totalsportek.scrape(hdl_brwsr)),
-                asyncio.create_task(tvpass.scrape(hdl_brwsr)),
+                asyncio.create_task(tvapp.scrape(hdl_brwsr)),
                 # asyncio.create_task(webcast.scrape(hdl_brwsr)),
             ]
 
@@ -114,7 +114,7 @@ async def main() -> None:
         | streamhub.urls
         | streamsgate.urls
         | totalsportek.urls
-        | tvpass.urls
+        | tvapp.urls
         | watchfooty.urls
         | webcast.urls
         | xstreameast.urls

M3U8/scrapers/livetvsx.py

@@ -165,19 +165,19 @@ async def get_events(cached_keys: list[str]) -> list[dict[str, str]]:
 
         XML_CACHE.write(events)
 
-    live = []
-
     start_ts = now.delta(hours=-1).timestamp()
     end_ts = now.delta(minutes=5).timestamp()
 
+    live = []
+
     for k, v in events.items():
         if k in cached_keys:
             continue
 
-        if not (
-            v["sport"] in VALID_SPORTS
-            or v["league"] in VALID_SPORTS
-            or v["event"].lower() == "olympic games"
+        if (
+            v["sport"] not in VALID_SPORTS
+            and v["league"] not in VALID_SPORTS
+            and v["event"].lower() != "olympic games"
         ):
             continue
 

M3U8/scrapers/tvapp.py

@@ -10,11 +10,11 @@ log = get_logger(__name__)
 
 urls: dict[str, dict[str, str | float]] = {}
 
-TAG = "TVPASS"
+TAG = "TVAPP"
 
 CACHE_FILE = Cache(TAG, exp=10_800)
 
-HTML_CACHE = Cache(f"{TAG}-html", exp=28_800)
+HTML_CACHE = Cache(f"{TAG}-html", exp=19_800)
 
 BASE_URL = "https://thetvapp.to"