AlexYU/AlexLive
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
guorong.zheng 2024-12-24 17:10:01 +08:00
commit 9a8bc2640a
3 changed files with 3 additions and 4 deletions

1
config/subscribe.txt

@ -16,3 +16,4 @@ 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

2
utils/channel.py

@ -630,7 +630,7 @@ def write_channel_to_file(data, ipv6=False, callback=None):
open_empty_category = config.open_empty_category
ipv_type_prefer = list(config.ipv_type_prefer)
if any(pref in ipv_type_prefer for pref in ["自动", "auto"]) or not ipv_type_prefer:
ipv_type_prefer = ["ipv6", "ipv4"] if (ipv6 or os.environ.get("GITHUB_ACTIONS")) else ["ipv4", "ipv6"]
ipv_type_prefer = ["ipv6", "ipv4"] if ipv6 else ["ipv4", "ipv6"]
origin_type_prefer = config.origin_type_prefer
if config.open_update_time:
now = datetime.datetime.now()

4
utils/speed.py

@ -345,9 +345,7 @@ def sort_urls(name, data, supply=config.open_supply, filter_speed=config.open_fi
if origin == "whitelist":
return float("inf")
else:
speed = speed if speed is not None else float("-inf")
resolution = get_resolution_value(resolution)
return speed + resolution
return (speed if speed is not None else float("-inf")) + get_resolution_value(resolution)
filter_data.sort(key=combined_key, reverse=True)
return [