diff --git a/CHANGELOG.md b/CHANGELOG.md index 5811a7c2cfb..71e372f88b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # 更新日志(Changelog) +## v1.3.9 + +### 2024/8/30 + +- 酒店源新增 ZoomEye 数据源,开启 FOFA 配置即可使用(Added ZoomEye data source to hotel sources, can be used by enabling FOFA configuration) +- 酒店源、组播源地区选项增加“全部”选项(Added "all" option to the region selection for hotel sources and multicast sources) +- 调整默认运行配置:关闭订阅源更新、Tonkiang 酒店源更新(Adjusted default runtime configuration: disabled subscription source updates and Tonkiang hotel source updates) + ## v1.3.8 ### 2024/8/29 diff --git a/docs/config.md b/docs/config.md index 88a28366e8c..cf40d65a3d5 100644 --- a/docs/config.md +++ b/docs/config.md @@ -1,31 +1,31 @@ -| 配置项 | 默认值 | 描述 | -| ---------------------- | ------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | -| open_update | True | 开启更新,若关闭则只运行结果页面服务 | -| open_use_old_result | True | 开启使用历史更新结果,合并至本次更新中 | -| open_driver | False | 开启浏览器运行,若更新无数据可开启此模式,较消耗性能 | -| open_proxy | True | 开启代理,自动获取免费可用代理,若更新无数据可开启此模式 | -| source_file | config/demo.txt | 模板文件路径 | -| final_file | output/result.txt | 生成结果文件路径 | -| open_online_search | False | 开启线上检索源功能 | -| online_search_page_num | 5 | 在线检索频道获取分页数量 | -| urls_limit | 15 | 单个频道接口数量 | -| open_keep_all | False | 保留所有检索结果,会保留非模板频道名称的结果,推荐手动维护时开启 | -| open_sort | True | 开启排序功能(响应速度、日期、分辨率) | -| open_ffmpeg | True | 开启使用 FFmpeg 进行测速,获取更准确的速度与分辨率信息,需要提前手动安装 | -| open_m3u_result | True | 开启转换生成 m3u 文件类型结果链接,支持显示频道图标 | -| response_time_weight | 0.5 | 响应时间权重值(所有权重值总和应为 1) | -| resolution_weight | 0.5 | 分辨率权重值 (所有权重值总和应为 1) | -| recent_days | 30 | 获取最近时间范围内更新的接口(单位天),适当减小可避免出现匹配问题 | -| ipv_type | ipv4 | 生成结果中接口的类型,可选值:ipv4、ipv6、全部 | -| domain_blacklist | epg.pw | 接口域名黑名单,用于过滤低质量含广告类域名的接口 | -| url_keywords_blacklist | | 接口关键字黑名单,用于过滤含特定字符的接口 | -| open_subscribe | False | 开启订阅源功能 | -| subscribe_urls | https://m3u.ibert.me/txt/fmml_dv6.txt,
https://m3u.ibert.me/txt/o_cn.txt,
https://m3u.ibert.me/txt/j_iptv.txt | 订阅源列表 | -| open_multicast | True | 开启组播源功能 | -| multicast_region_list | 广东 | 组播源地区列表,[更多地区](../updates/multicast/multicast_map.json),"全部"表示所有地区 | -| multicast_page_num | 5 | 组播地区获取分页数量 | -| open_hotel | False | 开启酒店源功能 | -| open_hotel_tonkiang | True | 开启 Tonkiang 酒店源工作模式 | -| open_hotel_fofa | True | 开启 FOFA 酒店源工作模式 | -| hotel_region_list | 广东 | 酒店源地区列表,[更多地区](../updates/fofa/fofa_map.py),"全部"表示所有地区 | -| hotel_page_num | 5 | 酒店地区获取分页数量 | +| 配置项 | 默认值 | 描述 | +| ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | +| open_update | True | 开启更新,若关闭则只运行结果页面服务 | +| open_use_old_result | True | 开启使用历史更新结果,合并至本次更新中 | +| open_driver | True | 开启浏览器运行,若更新无数据可开启此模式,较消耗性能 | +| open_proxy | False | 开启代理,自动获取免费可用代理,若更新无数据可开启此模式 | +| source_file | config/demo.txt | 模板文件路径 | +| final_file | output/result.txt | 生成结果文件路径 | +| open_online_search | False | 开启线上检索源功能 | +| online_search_page_num | 3 | 在线检索频道获取分页数量 | +| urls_limit | 15 | 单个频道接口数量 | +| open_keep_all | False | 保留所有检索结果,会保留非模板频道名称的结果,推荐手动维护时开启 | +| open_sort | True | 开启排序功能(响应速度、日期、分辨率) | +| open_ffmpeg | True | 开启使用 FFmpeg 进行测速,获取更准确的速度与分辨率信息,需要提前手动安装 | +| open_m3u_result | True | 开启转换生成 m3u 文件类型结果链接,支持显示频道图标 | +| response_time_weight | 0.5 | 响应时间权重值(所有权重值总和应为 1) | +| resolution_weight | 0.5 | 分辨率权重值 (所有权重值总和应为 1) | +| recent_days | 30 | 获取最近时间范围内更新的接口(单位天),适当减小可避免出现匹配问题 | +| ipv_type | ipv4 | 生成结果中接口的类型,可选值:ipv4、ipv6、全部 | +| domain_blacklist | epg.pw | 接口域名黑名单,用于过滤低质量含广告类域名的接口 | +| url_keywords_blacklist | | 接口关键字黑名单,用于过滤含特定字符的接口 | +| open_subscribe | False | 开启订阅源功能 | +| subscribe_urls | 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://github.moeyy.xyz/https://raw.githubusercontent.com/PizazzGY/TVBox/main/live.txt | 订阅源列表 | +| open_multicast | False | 开启组播源功能 | +| multicast_region_list | 广东 | 组播源地区列表,[更多地区](../updates/multicast/multicast_map.json),"全部"表示所有地区 | +| multicast_page_num | 3 | 组播地区获取分页数量 | +| open_hotel | True | 开启酒店源功能 | +| open_hotel_tonkiang | False | 开启 Tonkiang 酒店源工作模式 | +| open_hotel_fofa | True | 开启 FOFA、ZoomEye 酒店源工作模式 | +| hotel_region_list | 全部 | 酒店源地区列表,[更多地区](../updates/fofa/fofa_map.py),"全部"表示所有地区 | +| hotel_page_num | 3 | 酒店地区获取分页数量 | diff --git a/docs/config_en.md b/docs/config_en.md index 56d3e814154..d43d1e77a2f 100644 --- a/docs/config_en.md +++ b/docs/config_en.md @@ -1,31 +1,31 @@ -| Configuration Item | Default Value | Description | -| ---------------------- | ------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | -| open_update | True | Enable updates, if disabled then only the result page service is run | -| open_use_old_result | True | Enable the use of historical update results and merge them into the current update | -| open_driver | False | Enable browser execution, If there are no updates, this mode can be enabled, which consumes more performance | -| open_proxy | True | Enable proxy, automatically obtains free available proxies, If there are no updates, this mode can be enabled | -| source_file | config/demo.txt | Template file path | -| final_file | output/result.txt | Generated result file path | -| open_online_search | False | Enable online search source feature | -| online_search_page_num | 5 | Page retrieval quantity for online search channels | -| urls_limit | 10 | Number of interfaces per channel | -| open_keep_all | False | Retain all search results, retain results with non-template channel names, recommended to be turned on when manually maintaining | -| open_sort | True | Enable the sorting function (response speed, date, resolution) | -| open_ffmpeg | True | Enable speed testing using FFmpeg to obtain more accurate speed and resolution information. Manual installation is required in advance. | -| open_m3u_result | True | Enable the conversion to generate m3u file type result links, supporting the display of channel icons | -| response_time_weight | 0.5 | Response time weight value (the sum of all weight values should be 1) | -| resolution_weight | 0.5 | Resolution weight value (the sum of all weight values should be 1) | -| recent_days | 30 | Retrieve interfaces updated within a recent time range (in days), reducing appropriately can avoid matching issues | -| ipv_type | ipv4 | The type of interface in the generated result, optional values: ipv4, ipv6, all | -| domain_blacklist | epg.pw | Interface domain blacklist, used to filter out interfaces with low-quality, ad-inclusive domains | -| url_keywords_blacklist | | Interface keyword blacklist, used to filter out interfaces containing specific characters | -| open_subscribe | True | Enable subscription source feature | -| subscribe_urls | https://m3u.ibert.me/txt/fmml_dv6.txt,
https://m3u.ibert.me/txt/o_cn.txt,
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](../updates/multicast/multicast_map.json, all means all regions) | -| multicast_page_num | 5 | Number of pages to retrieve for multicast regions | -| open_hotel | False | Enable hotel source feature | -| open_hotel_tonkiang | True | Enable Tonkiang hotel source work mode | -| open_hotel_fofa | True | Enable FOFA hotel source work mode | -| hotel_region_list | 广东 | List of hotel source regions, [more regions](../updates/fofa/fofa_map.py), 'all' indicates all regions | -| hotel_page_num | 5 | Number of pages to retrieve for hotel regions | +| Configuration Item | Default Value | Description | +| ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | +| open_update | True | Enable updates, if disabled then only the result page service is run | +| open_use_old_result | True | Enable the use of historical update results and merge them into the current update | +| open_driver | True | Enable browser execution, If there are no updates, this mode can be enabled, which consumes more performance | +| open_proxy | False | Enable proxy, automatically obtains free available proxies, If there are no updates, this mode can be enabled | +| source_file | config/demo.txt | Template file path | +| final_file | output/result.txt | Generated result file path | +| open_online_search | False | Enable online search source feature | +| online_search_page_num | 3 | Page retrieval quantity for online search channels | +| urls_limit | 15 | Number of interfaces per channel | +| open_keep_all | False | Retain all search results, retain results with non-template channel names, recommended to be turned on when manually maintaining | +| open_sort | True | Enable the sorting function (response speed, date, resolution) | +| open_ffmpeg | True | Enable speed testing using FFmpeg to obtain more accurate speed and resolution information. Manual installation is required in advance. | +| open_m3u_result | True | Enable the conversion to generate m3u file type result links, supporting the display of channel icons | +| response_time_weight | 0.5 | Response time weight value (the sum of all weight values should be 1) | +| resolution_weight | 0.5 | Resolution weight value (the sum of all weight values should be 1) | +| recent_days | 30 | Retrieve interfaces updated within a recent time range (in days), reducing appropriately can avoid matching issues | +| ipv_type | ipv4 | The type of interface in the generated result, optional values: ipv4, ipv6, all | +| domain_blacklist | epg.pw | Interface domain blacklist, used to filter out interfaces with low-quality, ad-inclusive domains | +| url_keywords_blacklist | | Interface keyword blacklist, used to filter out interfaces containing specific characters | +| open_subscribe | False | Enable subscription source feature | +| subscribe_urls | 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://github.moeyy.xyz/https://raw.githubusercontent.com/PizazzGY/TVBox/main/live.txt | Subscription source list | +| open_multicast | False | Enable multicast source function | +| region_list | 广东 | Multicast source region list, [more regions](../updates/multicast/multicast_map.json, all means all regions) | +| multicast_page_num | 3 | Number of pages to retrieve for multicast regions | +| open_hotel | True | Enable hotel source feature | +| open_hotel_tonkiang | False | Enable Tonkiang hotel source work mode | +| open_hotel_fofa | True | Enable FOFA、ZoomEye hotel source work mode | +| hotel_region_list | 全部 | List of hotel source regions, [more regions](../updates/fofa/fofa_map.py), 'all' indicates all regions | +| hotel_page_num | 3 | Number of pages to retrieve for hotel regions | diff --git a/version.json b/version.json index 07352f9439b..ccda17d0929 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.3.8", + "version": "1.3.9", "name": "电视直播源更新工具" } \ No newline at end of file