From 00000d90bc3c88ddb7507cc194746991a375e2fb Mon Sep 17 00:00:00 2001 From: doms9 <96013514+doms9@users.noreply.github.com> Date: Mon, 8 Sep 2025 11:49:52 -0400 Subject: [PATCH] e --- .github/workflows/epg.yml | 2 +- .github/workflows/health.yml | 2 +- .github/workflows/m3u8.yml | 2 +- M3U8/fetch.py | 8 +++----- M3U8/{scrape => scrapers}/ace.py | 0 M3U8/{scrape => scrapers}/caches/livetvsx.json | 0 M3U8/{scrape => scrapers}/caches/ppv.json | 0 M3U8/{scrape => scrapers}/caches/ppv_api.json | 0 M3U8/{scrape => scrapers}/caches/streambtw.json | 0 M3U8/{scrape => scrapers}/caches/tvpass.json | 0 M3U8/{scrape => scrapers}/fstv.py | 0 M3U8/{scrape => scrapers}/livetvsx.py | 0 M3U8/{scrape => scrapers}/ppv.py | 0 M3U8/{scrape => scrapers}/streambtw.py | 0 M3U8/{scrape => scrapers}/tvpass.py | 0 M3U8/{scrape => scrapers}/utils/__init__.py | 0 M3U8/{scrape => scrapers}/utils/config.py | 0 17 files changed, 6 insertions(+), 8 deletions(-) rename M3U8/{scrape => scrapers}/ace.py (100%) rename M3U8/{scrape => scrapers}/caches/livetvsx.json (100%) rename M3U8/{scrape => scrapers}/caches/ppv.json (100%) rename M3U8/{scrape => scrapers}/caches/ppv_api.json (100%) rename M3U8/{scrape => scrapers}/caches/streambtw.json (100%) rename M3U8/{scrape => scrapers}/caches/tvpass.json (100%) rename M3U8/{scrape => scrapers}/fstv.py (100%) rename M3U8/{scrape => scrapers}/livetvsx.py (100%) rename M3U8/{scrape => scrapers}/ppv.py (100%) rename M3U8/{scrape => scrapers}/streambtw.py (100%) rename M3U8/{scrape => scrapers}/tvpass.py (100%) rename M3U8/{scrape => scrapers}/utils/__init__.py (100%) rename M3U8/{scrape => scrapers}/utils/config.py (100%) diff --git a/.github/workflows/epg.yml b/.github/workflows/epg.yml index 5e80740..9e73cba 100644 --- a/.github/workflows/epg.yml +++ b/.github/workflows/epg.yml @@ -2,7 +2,7 @@ name: fetch epg on: schedule: - - cron: "30 2,10,18 * * *" + - cron: "45 2,10,18 * * *" workflow_dispatch: jobs: diff --git a/.github/workflows/health.yml b/.github/workflows/health.yml index 60294ff..f7f92f2 100644 --- a/.github/workflows/health.yml +++ b/.github/workflows/health.yml @@ -2,7 +2,7 @@ name: health check on: schedule: - - cron: "0 2,8,14,20 * * *" + - cron: "30 2,8,14,20 * * *" workflow_dispatch: jobs: diff --git a/.github/workflows/m3u8.yml b/.github/workflows/m3u8.yml index 806ca95..ed87277 100644 --- a/.github/workflows/m3u8.yml +++ b/.github/workflows/m3u8.yml @@ -79,7 +79,7 @@ jobs: uses: stefanzweifel/git-auto-commit-action@v6 with: commit_message: "update M3U8" - file_pattern: "M3U8/TV.m3u8 M3U8/scrape/caches/*.json" + file_pattern: "M3U8/TV.m3u8 M3U8/scrapers/caches/*.json" commit_author: "GitHub Actions Bot " commit_user_name: "GitHub Actions Bot" commit_user_email: "actions@github.com" diff --git a/M3U8/fetch.py b/M3U8/fetch.py index 8f4c8bf..fa89b75 100644 --- a/M3U8/fetch.py +++ b/M3U8/fetch.py @@ -3,8 +3,8 @@ import asyncio from pathlib import Path import httpx -from scrape import livetvsx, ppv, streambtw, tvpass -from scrape.utils import get_logger +from scrapers import livetvsx, ppv, streambtw, tvpass +from scrapers.utils import get_logger log = get_logger(__name__) @@ -31,11 +31,9 @@ async def vanilla_fetch() -> tuple[list[str], int]: log.error(f'Failed to fetch "{BASE_URL}"\n{e}') raise SystemExit(e) from e - d = r.text.splitlines()[1:] - last_chnl_num = int(r.text.split("tvg-chno=")[-1].split('"')[1]) - return d, last_chnl_num + return r.text.splitlines()[1:], last_chnl_num async def main() -> None: diff --git a/M3U8/scrape/ace.py b/M3U8/scrapers/ace.py similarity index 100% rename from M3U8/scrape/ace.py rename to M3U8/scrapers/ace.py diff --git a/M3U8/scrape/caches/livetvsx.json b/M3U8/scrapers/caches/livetvsx.json similarity index 100% rename from M3U8/scrape/caches/livetvsx.json rename to M3U8/scrapers/caches/livetvsx.json diff --git a/M3U8/scrape/caches/ppv.json b/M3U8/scrapers/caches/ppv.json similarity index 100% rename from M3U8/scrape/caches/ppv.json rename to M3U8/scrapers/caches/ppv.json diff --git a/M3U8/scrape/caches/ppv_api.json b/M3U8/scrapers/caches/ppv_api.json similarity index 100% rename from M3U8/scrape/caches/ppv_api.json rename to M3U8/scrapers/caches/ppv_api.json diff --git a/M3U8/scrape/caches/streambtw.json b/M3U8/scrapers/caches/streambtw.json similarity index 100% rename from M3U8/scrape/caches/streambtw.json rename to M3U8/scrapers/caches/streambtw.json diff --git a/M3U8/scrape/caches/tvpass.json b/M3U8/scrapers/caches/tvpass.json similarity index 100% rename from M3U8/scrape/caches/tvpass.json rename to M3U8/scrapers/caches/tvpass.json diff --git a/M3U8/scrape/fstv.py b/M3U8/scrapers/fstv.py similarity index 100% rename from M3U8/scrape/fstv.py rename to M3U8/scrapers/fstv.py diff --git a/M3U8/scrape/livetvsx.py b/M3U8/scrapers/livetvsx.py similarity index 100% rename from M3U8/scrape/livetvsx.py rename to M3U8/scrapers/livetvsx.py diff --git a/M3U8/scrape/ppv.py b/M3U8/scrapers/ppv.py similarity index 100% rename from M3U8/scrape/ppv.py rename to M3U8/scrapers/ppv.py diff --git a/M3U8/scrape/streambtw.py b/M3U8/scrapers/streambtw.py similarity index 100% rename from M3U8/scrape/streambtw.py rename to M3U8/scrapers/streambtw.py diff --git a/M3U8/scrape/tvpass.py b/M3U8/scrapers/tvpass.py similarity index 100% rename from M3U8/scrape/tvpass.py rename to M3U8/scrapers/tvpass.py diff --git a/M3U8/scrape/utils/__init__.py b/M3U8/scrapers/utils/__init__.py similarity index 100% rename from M3U8/scrape/utils/__init__.py rename to M3U8/scrapers/utils/__init__.py diff --git a/M3U8/scrape/utils/config.py b/M3U8/scrapers/utils/config.py similarity index 100% rename from M3U8/scrape/utils/config.py rename to M3U8/scrapers/utils/config.py