Skip to content

Commit

Permalink
Merge pull request #118 from Guovin/dev
Browse files Browse the repository at this point in the history 
release:v1.1.6
  • Loading branch information
@Guovin
Guovin authored May 17, 2024
2 parents b8f0708 + 26a539e commit a524dae
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 16 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# 更新日志（Changelog）

## v1.1.6

### 2024/5/17

- 增加组播源可全地区运行更新（Added multicast sources to run region-wide updates）
- 修改默认值：关闭在线检索功能，组播源全地区更新（Change the default value: Disable the online search function and update the multicast source in all regions）

## v1.1.5

### 2024/5/17
Expand Down
4 changes: 2 additions & 2 deletions README-EN.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Customize channel menus and automatically obtain and update the latest live sour
| source_file | "demo.txt" | Template file name |
| final_file | "result.txt" | Generated file name |
| favorite_list | ["广东珠江","CCTV-1","CCTV-5","CCTV-5+","CCTV-13","广东体育","广东卫视","大湾区卫视","浙江卫视","湖南卫视","翡翠台"] | List of favorite channel names (used only to distinguish from regular channels, custom page retrieval quantity) |
| open_online_search | True | Enable online search source feature |
| open_online_search | False | Enable online search source feature |
| favorite_page_num | 5 | Page retrieval quantity for favorite channels |
| default_page_num | 3 | Page retrieval quantity for regular channels |
| urls_limit | 10 | Number of interfaces per channel |
Expand All @@ -39,7 +39,7 @@ Customize channel menus and automatically obtain and update the latest live sour
| open_subscribe | True | Enable subscription source feature |
| subscribe_urls | ["https://m3u.ibert.me/txt/fmml_dv6.txt",<br>"https://m3u.ibert.me/txt/o_cn.txt",<br>"https://m3u.ibert.me/txt/j_iptv.txt"] | Subscription source list |
| open_multicast | True | Enable multicast source function |
| region_list | ["广东"] | Multicast source region list, [more regions](./fofa_map.py) |
| region_list | ["all"] | Multicast source region list, [more regions](./fofa_map.py, "all" means all regions) |

## Quick Start

Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
| source_file | "demo.txt" | 模板文件名称 |
| final_file | "result.txt" | 生成文件名称 |
| favorite_list | ["广东珠江","CCTV-1","CCTV-5","CCTV-5+","CCTV-13","广东体育","广东卫视","大湾区卫视","浙江卫视","湖南卫视","翡翠台"] | 关注频道名称列表（仅用于与常规频道区分，自定义获取分页数量） |
| open_online_search | True | 开启线上检索源功能 |
| open_online_search | False | 开启线上检索源功能 |
| favorite_page_num | 5 | 关注频道获取分页数量 |
| default_page_num | 3 | 常规频道获取分页数量 |
| urls_limit | 10 | 单个频道接口数量 |
Expand All @@ -39,7 +39,7 @@
| open_subscribe | True | 开启订阅源功能 |
| subscribe_urls | ["https://m3u.ibert.me/txt/fmml_dv6.txt",<br>"https://m3u.ibert.me/txt/o_cn.txt",<br>"https://m3u.ibert.me/txt/j_iptv.txt"] | 订阅源列表 |
| open_multicast | True | 开启组播源功能 |
| region_list | ["广东"] | 组播源地区列表，[更多地区](./fofa_map.py) |
| region_list | ["all"] | 组播源地区列表，[更多地区](./fofa_map.py)，"all"表示所有地区 |

## 快速上手

Expand Down
6 changes: 3 additions & 3 deletions config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"湖南卫视",
"翡翠台",
]
open_online_search = True
open_online_search = False
favorite_page_num = 5
default_page_num = 3
urls_limit = 10
urls_limit = 15
open_sort = True
response_time_weight = 0.5
resolution_weight = 0.5
Expand All @@ -31,4 +31,4 @@
"https://m3u.ibert.me/txt/j_iptv.txt",
]
open_multicast = True
region_list = ["广东"]
region_list = ["all"]
4 changes: 2 additions & 2 deletions docs/tutorial-EN.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Adjust the configuration as needed. Below is the default configuration explanati
| source_file | "demo.txt" | Template file name |
| final_file | "result.txt" | Generated file name |
| favorite_list | ["广东珠江","CCTV-1","CCTV-5","CCTV-5+","CCTV-13","广东体育","广东卫视","大湾区卫视","浙江卫视","湖南卫视","翡翠台"] | List of favorite channel names (used only to distinguish from regular channels, custom page retrieval quantity) |
| open_online_search | True | Enable online search source feature |
| open_online_search | False | Enable online search source feature |
| favorite_page_num | 5 | Page retrieval quantity for favorite channels |
| default_page_num | 3 | Page retrieval quantity for regular channels |
| urls_limit | 10 | Number of interfaces per channel |
Expand All @@ -76,7 +76,7 @@ Adjust the configuration as needed. Below is the default configuration explanati
| open_subscribe | True | Enable subscription source feature |
| subscribe_urls | ["https://m3u.ibert.me/txt/fmml_dv6.txt",<br>"https://m3u.ibert.me/txt/o_cn.txt",<br>"https://m3u.ibert.me/txt/j_iptv.txt"] | Subscription source list |
| open_multicast | True | Enable multicast source function |
| region_list | ["广东"] | Multicast source region list, [more regions](./fofa_map.py) |
| region_list | ["all"] | Multicast source region list, [more regions](./fofa_map.py, "all" means all regions) |

## Step 4: Run Updates Locally (Recommended, Stable, Supports a large number of channel updates)

Expand Down
4 changes: 2 additions & 2 deletions docs/tutorial.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
| source_file | "demo.txt" | 模板文件名称 |
| final_file | "result.txt" | 生成文件名称 |
| favorite_list | ["广东珠江","CCTV-1","CCTV-5","CCTV-5+","CCTV-13","广东体育","广东卫视","大湾区卫视","浙江卫视","湖南卫视","翡翠台"] | 关注频道名称列表（仅用于与常规频道区分，自定义获取分页数量） |
| open_online_search | True | 开启线上检索源功能 |
| open_online_search | False | 开启线上检索源功能 |
| favorite_page_num | 5 | 关注频道获取分页数量 |
| default_page_num | 3 | 常规频道获取分页数量 |
| urls_limit | 10 | 单个频道接口数量 |
Expand All @@ -75,7 +75,7 @@
| open_subscribe | True | 开启订阅源功能 |
| subscribe_urls | ["https://m3u.ibert.me/txt/fmml_dv6.txt",<br>"https://m3u.ibert.me/txt/o_cn.txt",<br>"https://m3u.ibert.me/txt/j_iptv.txt"] | 订阅源列表 |
| open_multicast | True | 开启组播源功能 |
| region_list | ["广东"] | 组播源地区列表，[更多地区](./fofa_map.py) |
| region_list | ["all"] | 组播源地区列表，[更多地区](./fofa_map.py)，"all"表示所有地区 |

## 步骤四：本地运行更新（推荐，稳定，支持大量频道更新）

Expand Down
11 changes: 7 additions & 4 deletions utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,10 +472,13 @@ def getFOFAUrlsFromRegionList():
"""
region_list = getattr(config, "region_list", [])
urls = []
for region in region_list:
region_url = getattr(fofa_map, "region_url")
if region in region_url:
urls.append(region_url[region])
region_url = getattr(fofa_map, "region_url")
if "all" in region_list:
urls = [url for url in region_url.values() if url]
else:
for region in region_list:
if region in region_url:
urls.append(region_url[region])
return urls


Expand Down
2 changes: 1 addition & 1 deletion version.json
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.1.5"
"version": "1.1.6"
}

0 comments on commit a524dae

Please sign in to comment.