Merge branch 'dev'

This commit is contained in:
guorong.zheng 2025-01-07 10:18:48 +08:00
commit a736fdc266
4 changed files with 19 additions and 16 deletions

@ -111,11 +111,11 @@
- 接口源:
```bash
https://ghgo.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.m3u
https://ghproxy.1888866.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.m3u
```
```bash
https://ghgo.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.txt
https://ghproxy.1888866.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.txt
```
@ -131,7 +131,7 @@ https://cdn.jsdelivr.net/gh/Guovin/iptv-api@gd/output/result.txt
- 数据源:
```bash
https://ghgo.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/source.json
https://ghproxy.1888866.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/source.json
```

@ -111,11 +111,11 @@
- Interface source:
```bash
https://ghgo.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.m3u
https://ghproxy.1888866.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.m3u
```
```bash
https://ghgo.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.txt
https://ghproxy.1888866.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.txt
```
or
@ -131,7 +131,7 @@ https://cdn.jsdelivr.net/gh/Guovin/iptv-api@gd/output/result.txt
- Data source:
```bash
https://ghgo.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/source.json
https://ghproxy.1888866.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/source.json
```
or

@ -1,19 +1,19 @@
# 这是订阅源列表,每行一个订阅地址
# This is a list of subscription sources, with one subscription address per line
https://iptv.b2og.com/txt/fmml_ipv6.txt
https://ghgo.xyz/raw.githubusercontent.com/suxuang/myIPTV/main/ipv6.m3u
https://ghproxy.1888866.xyz/raw.githubusercontent.com/suxuang/myIPTV/main/ipv6.m3u
https://live.zbds.top/tv/iptv6.txt
https://live.zbds.top/tv/iptv4.txt
https://live.fanmingming.cn/tv/m3u/ipv6.m3u
https://ghgo.xyz/raw.githubusercontent.com/joevess/IPTV/main/home.m3u8
https://ghproxy.1888866.xyz/raw.githubusercontent.com/joevess/IPTV/main/home.m3u8
https://aktv.top/live.txt
http://175.178.251.183:6689/live.txt
https://ghgo.xyz/raw.githubusercontent.com/kimwang1978/collect-tv-txt/main/merged_output.txt
https://ghproxy.1888866.xyz/raw.githubusercontent.com/kimwang1978/collect-tv-txt/main/merged_output.txt
https://m3u.ibert.me/txt/fmml_dv6.txt
https://m3u.ibert.me/txt/o_cn.txt
https://m3u.ibert.me/txt/j_iptv.txt
https://ghgo.xyz/raw.githubusercontent.com/xzw832/cmys/main/S_CCTV.txt
https://ghgo.xyz/raw.githubusercontent.com/xzw832/cmys/main/S_weishi.txt
https://ghgo.xyz/raw.githubusercontent.com/asdjkl6/tv/tv/.m3u/整套直播源/测试/整套直播源/l.txt
https://ghgo.xyz/raw.githubusercontent.com/asdjkl6/tv/tv/.m3u/整套直播源/测试/整套直播源/kk.txt
https://ghgo.xyz/raw.githubusercontent.com/yuanzl77/IPTV/master/live.txt
https://ghproxy.1888866.xyz/raw.githubusercontent.com/xzw832/cmys/main/S_CCTV.txt
https://ghproxy.1888866.xyz/raw.githubusercontent.com/xzw832/cmys/main/S_weishi.txt
https://ghproxy.1888866.xyz/raw.githubusercontent.com/asdjkl6/tv/tv/.m3u/整套直播源/测试/整套直播源/l.txt
https://ghproxy.1888866.xyz/raw.githubusercontent.com/asdjkl6/tv/tv/.m3u/整套直播源/测试/整套直播源/kk.txt
https://ghproxy.1888866.xyz/raw.githubusercontent.com/yuanzl77/IPTV/master/live.txt

@ -1,4 +1,5 @@
import asyncio
import http.cookies
import json
import re
import subprocess
@ -13,6 +14,8 @@ import utils.constants as constants
from utils.config import config
from utils.tools import is_ipv6, remove_cache_info, get_resolution_value
http.cookies._is_legal_key = lambda _: True
async def get_speed_with_download(url: str, session: ClientSession = None, timeout: int = config.sort_timeout) -> dict[
str, float | None]:
@ -30,8 +33,8 @@ async def get_speed_with_download(url: str, session: ClientSession = None, timeo
created_session = False
try:
async with session.get(url, timeout=timeout) as response:
if response.status == 404:
raise Exception("404")
if response.status != 200:
raise Exception("Invalid response")
info['delay'] = int(round((time() - start_time) * 1000))
async for chunk in response.content.iter_any():
if chunk: