From 61e2ff7080c1efc0769cf839f09a6fec59f9c651 Mon Sep 17 00:00:00 2001 From: "guorong.zheng" <360996299@qq.com> Date: Mon, 12 Aug 2024 18:08:06 +0800 Subject: [PATCH] release:v1.3.5 --- CHANGELOG.md | 10 +++++++++ README.md | 15 ++++++++------ README_en.md | 15 ++++++++------ docs/config.md | 50 ++++++++++++++++++++++----------------------- docs/config_en.md | 50 ++++++++++++++++++++++----------------------- docs/tutorial.md | 21 +++++++++++-------- docs/tutorial_en.md | 21 +++++++++++-------- tkinter_ui.py | 2 +- version.json | 2 +- 9 files changed, 104 insertions(+), 82 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b2bb9d2d70..73cb79b8a2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # 更新日志（Changelog） +## v1.3.5 + +### 2024/8/12 + +- 新增支持地区组播 ip 更新，调整默认以此模式运行，基本实现高清流畅播放（#225） +- 新增支持使用 FFmpeg 进行测速排序、获取分辨率信息 +- 接口源增加分辨率信息，用于源切换时显示 +- 调整配置文件与结果文件路径（config、output 目录），方便 docker 卷挂载（#226） +- 修改配置文件类型（config.ini） + ## v1.3.4 ### 2024/7/31 diff --git a/README.md b/README.md index 18474641c5f..f4c9ed130d9 100644 --- a/README.md +++ b/README.md @@ -59,10 +59,10 @@ pipenv run ui ### 方式三：Docker 更新 -- requests：轻量级，性能要求低，更新速度快，稳定性不确定（推荐订阅源使用此版本） -- driver：性能要求较高，更新速度较慢，稳定性、成功率高（在线搜索、组播源使用此版本） +- requests：轻量级，性能要求低，更新速度快，稳定性不确定（推荐组播源、订阅源使用此版本） +- driver：性能要求较高，更新速度较慢，稳定性、成功率高（推荐在线搜索使用此版本） -建议都试用一次，选择自己合适的版本，在线搜索和组播源使用 requests 能拿到结果的话，优先选择 requests 版本。 +建议都试用一次，选择自己合适的版本，在线搜索使用 requests 能拿到结果的话，优先选择 requests 版本。 ```bash 1. 拉取镜像： @@ -76,10 +76,13 @@ docker pull guovern/tv-driver:latest docker run -d -p 8000:8000 guovern/tv-requests 或 tv-driver 卷挂载参数（可选）： --v 宿主机路径/TV:/tv-requests 或 tv-driver - 实现宿主机文件与容器文件同步，修改模板、配置、获取更新结果文件可直接在宿主机文件夹下操作 -注：使用此命令运行容器，请务必先clone本项目至宿主机 + +配置文件： +-v 宿主机路径/config:/tv-requests/config 或 tv-driver/config + +结果文件： +-v 宿主机路径/output:/tv-requests/output 或 tv-driver/output 3. 查看更新结果：访问（域名:8000） ``` diff --git a/README_en.md b/README_en.md index dfff727bd20..849fd1f1dd2 100644 --- a/README_en.md +++ b/README_en.md @@ -59,10 +59,10 @@ pipenv run ui ### Method 3: Docker Update -- requests: Lightweight, low performance requirements, fast update speed, stability uncertain (Recommend using this version for the subscription source) -- driver: Higher performance requirements, slower update speed, high stability, high success rate (Online search, multicast source use this version) +- requests: Lightweight, low performance requirements, fast update speed, stability uncertain (Recommend using this version for the multicast source and the subscription source) +- driver: Higher performance requirements, slower update speed, high stability, high success rate (Online search use this version) -It's recommended to try each one and choose the version that suits you. If you can get results with requests for online searches and multicast sources, prioritize choosing the version that uses requests. +It's recommended to try each one and choose the version that suits you. If you can get results with requests for online searches, prioritize choosing the version that uses requests. ```bash 1. Pull the image: @@ -76,10 +76,13 @@ docker pull guovern/tv-driver:latest docker run -d -p 8000:8000 guovern/tv-requests or driver Volume Mount Parameter (Optional): --v host path/TV:/tv-requests or tv-driver - This allows synchronization of files between the host machine and the container. Modifying templates, configurations, and retrieving updated result files can be directly operated in the host machine's folder. -Note: Before running the container with this command, be sure to first clone this project to the host machine. + +config: +-v /config:/tv-requests/config or tv-driver/config + +result: +-v /output:/tv-requests/output or tv-driver/output 3. Check the update results: Visit (domain:8000) ``` diff --git a/docs/config.md b/docs/config.md index 626b3a834b6..53611fb5860 100644 --- a/docs/config.md +++ b/docs/config.md @@ -1,25 +1,25 @@ -| 配置项 | 默认值 | 描述 | -| ---------------------- | --------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------ | -| open_update | True | 开启更新，若关闭则只运行结果页面服务 | -| open_use_old_result | True | 开启使用历史更新结果，合并至本次更新中 | -| open_driver | False | 开启浏览器运行，若更新无数据可开启此模式，较消耗性能 | -| open_proxy | True | 开启代理，自动获取免费可用代理，若更新无数据可开启此模式 | -| source_file | "demo.txt" | 模板文件名称 | -| final_file | "result.txt" | 生成文件名称 | -| favorite_list | ["广东珠江","CCTV-1","CCTV-5","CCTV-5+","CCTV-13","广东体育","广东卫视","大湾区卫视","浙江卫视","湖南卫视","翡翠台"] | 关注频道名称列表（仅用于与常规频道区分，自定义获取分页数量） | -| open_online_search | False | 开启线上检索源功能 | -| favorite_page_num | 5 | 关注频道获取分页数量 | -| default_page_num | 3 | 常规频道获取分页数量 | -| urls_limit | 10 | 单个频道接口数量 | -| open_keep_all | False | 保留所有检索结果，会保留非模板频道名称的结果，推荐手动维护时开启 | -| open_sort | True | 开启排序功能（响应速度、日期、分辨率） | -| response_time_weight | 0.5 | 响应时间权重值（所有权重值总和应为 1） | -| resolution_weight | 0.5 | 分辨率权重值 （所有权重值总和应为 1） | -| recent_days | 30 | 获取最近时间范围内更新的接口（单位天），适当减小可避免出现匹配问题 | -| ipv_type | "ipv4" | 生成结果中接口的类型，可选值："ipv4"、"ipv6"、"all" | -| domain_blacklist | ["epg.pw"] | 接口域名黑名单，用于过滤低质量含广告类域名的接口 | -| url_keywords_blacklist | [] | 接口关键字黑名单，用于过滤含特定字符的接口 | -| open_subscribe | True | 开启订阅源功能 | -| 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 | 开启组播源功能 | -| region_list | ["all"] | 组播源地区列表，[更多地区](../multicast/multicast_map.json)，"all"表示所有地区 | +| 配置项 | 默认值 | 描述 | +| ---------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- | +| open_update | True | 开启更新，若关闭则只运行结果页面服务 | +| open_use_old_result | True | 开启使用历史更新结果，合并至本次更新中 | +| open_driver | False | 开启浏览器运行，若更新无数据可开启此模式，较消耗性能 | +| open_proxy | True | 开启代理，自动获取免费可用代理，若更新无数据可开启此模式 | +| source_file | config/demo.txt | 模板文件名称 | +| final_file | output/result.txt | 生成文件名称 | +| favorite_list | 广东珠江,CCTV-1,CCTV-5,CCTV-5+,CCTV-13,广东体育,广东卫视,大湾区卫视,浙江卫视,湖南卫视,翡翠台 | 关注频道名称列表（仅用于与常规频道区分，自定义获取分页数量） | +| open_online_search | False | 开启线上检索源功能 | +| favorite_page_num | 5 | 关注频道获取分页数量 | +| default_page_num | 3 | 常规频道获取分页数量 | +| urls_limit | 10 | 单个频道接口数量 | +| open_keep_all | False | 保留所有检索结果，会保留非模板频道名称的结果，推荐手动维护时开启 | +| open_sort | True | 开启排序功能（响应速度、日期、分辨率） | +| response_time_weight | 0.5 | 响应时间权重值（所有权重值总和应为 1） | +| resolution_weight | 0.5 | 分辨率权重值 （所有权重值总和应为 1） | +| recent_days | 30 | 获取最近时间范围内更新的接口（单位天），适当减小可避免出现匹配问题 | +| ipv_type | ipv4 | 生成结果中接口的类型，可选值：ipv4、ipv6、all | +| domain_blacklist | epg.pw | 接口域名黑名单，用于过滤低质量含广告类域名的接口 | +| url_keywords_blacklist | | 接口关键字黑名单，用于过滤含特定字符的接口 | +| open_subscribe | True | 开启订阅源功能 | +| 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 | 开启组播源功能 | +| region_list | 广东 | 组播源地区列表，[更多地区](../updates/multicast/multicast_map.json)，all 表示所有地区 | diff --git a/docs/config_en.md b/docs/config_en.md index ebdcec280ee..3934e919940 100644 --- a/docs/config_en.md +++ b/docs/config_en.md @@ -1,25 +1,25 @@ -| 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 | "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 | 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 | -| 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) | -| 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 | ["all"] | Multicast source region list, [more regions](../multicast/multicast_map.json, "all" means all 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 | 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 name | +| final_file | output/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 | 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 | +| 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) | +| 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) | diff --git a/docs/tutorial.md b/docs/tutorial.md index 5a8f58df13b..6faab4a73d5 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -38,20 +38,20 @@ 跟编辑模板一样，修改运行配置 -### 1. 点击 config.py 配置文件： +### 1. 点击 config.ini 配置文件： -![config.py入口](./images/config-btn.png 'config.py入口') +![config.ini入口](./images/config-btn.png 'config.ini入口') ### 2. 复制默认配置文件内容： -![copy config.py](./images/copy-config.png '复制默认模板') +![copy config.ini](./images/copy-config.png '复制默认模板') -### 3. 新建个人配置文件 user_config.py： +### 3. 新建个人配置文件 user_config.ini： -![创建user_config.py](./images/edit-user-config.png '创建user_config.py') +![创建user_config.ini](./images/edit-user-config.png '创建user_config.ini') 1. 创建文件 -2. 配置文件命名为 user_config.py +2. 配置文件命名为 user_config.ini 3. 粘贴默认模板，修改 source_file = "user_demo.txt"；final_file = "user_result.txt" 4. 点击 Commit changes...进行保存 @@ -102,10 +102,13 @@ docker pull guovern/tv-driver:latest docker run -d -p 8000:8000 guovern/tv-requests 或 tv-driver 卷挂载参数（可选）： --v 宿主机路径/TV:/tv-requests 或 tv-driver - 实现宿主机文件与容器文件同步，修改模板、配置、获取更新结果文件可直接在宿主机文件夹下操作 -注：使用此命令运行容器，请务必先clone本项目至宿主机 + +配置文件： +-v 宿主机路径/config:/tv-requests/config 或 tv-driver/config + +结果文件： +-v 宿主机路径/output:/tv-requests/output 或 tv-driver/output 3. 查看更新结果：访问（域名:8000） ``` diff --git a/docs/tutorial_en.md b/docs/tutorial_en.md index eac0d6ab45e..71a98629509 100644 --- a/docs/tutorial_en.md +++ b/docs/tutorial_en.md @@ -38,20 +38,20 @@ When you click to confirm and create in step one, you will be automatically redi Similar to editing the template, modify the running configuration -### 1. Click on the config.py configuration file: +### 1. Click on the config.ini configuration file: -![config.py Entrance](./images/config-btn.png 'config.py Entrance') +![config.ini Entrance](./images/config-btn.png 'config.ini Entrance') ### 2. Copy the default configuration file content: -![Copy config.py](./images/copy-config.png 'Copy default template') +![Copy config.ini](./images/copy-config.png 'Copy default template') -### 3. Create a personal configuration file user_config.py: +### 3. Create a personal configuration file user_config.ini: -![Create user_config.py](./images/edit-user-config.png 'Create user_config.py') +![Create user_config.ini](./images/edit-user-config.png 'Create user_config.ini') 1. Create file -2. Name the configuration file user_config.py +2. Name the configuration file user_config.ini 3. Paste the default template, modify source_file = "user_demo.txt"; final_file = "user_result.txt" 4. Click Commit changes... to save. @@ -102,10 +102,13 @@ docker pull guovern/tv-driver:latest docker run -d -p 8000:8000 guovern/tv-requests or driver Volume Mount Parameter (Optional): --v host path/TV:/tv-requests or tv-driver - This allows synchronization of files between the host machine and the container. Modifying templates, configurations, and retrieving updated result files can be directly operated in the host machine's folder. -Note: Before running the container with this command, be sure to first clone this project to the host machine. + +config: +-v /config:/tv-requests/config or tv-driver/config + +result: +-v /output:/tv-requests/output or tv-driver/output 3. Check the update results: Visit (domain:8000) ``` diff --git a/tkinter_ui.py b/tkinter_ui.py index 4e22c037789..5742f1a4fcf 100644 --- a/tkinter_ui.py +++ b/tkinter_ui.py @@ -18,7 +18,7 @@ class TkinterUI: def __init__(self, root): self.root = root self.root.title("直播源接口更新工具") - self.version = "v1.3.4" + self.version = "v1.3.5" self.update_source = UpdateSource() self.update_running = False self.config_entrys = [ diff --git a/version.json b/version.json index 7c32fcf6b20..f70330ea802 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "1.3.4" + "version": "1.3.5" } \ No newline at end of file