Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release #694

Merged
merged 7 commits into from
Dec 16, 2024
Merged

release #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a70fcdf
feat:tkinter
Guovin Dec 13, 2024
b9b9e78
feat:blacklist and ui
Guovin Dec 16, 2024
5ce3c4d
feat:ipv6_support force config
Guovin Dec 16, 2024
bdda9d7
chore:proxy
Guovin Dec 16, 2024
e589437
release:v1.5.6
Guovin Dec 16, 2024
d06c24a
update:README
Guovin Dec 16, 2024
a113832
Merge pull request #693 from Guovin/dev
Guovin Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,60 @@
# 更新日志（Changelog）

## v1.5.6

### 2024/12/16

- ❤️ 推荐关注微信公众号（Govin），订阅更新通知与使用技巧等文章推送，还可进行答疑和交流讨论
- ⚠️ 本次更新涉及配置变更，以最新 `config/config.ini` 为准，工作流用户需复制最新配置至`user_config.ini`
- ✨ 新增白名单列表功能，支持自定义接口和订阅源关键字白名单，文件位于`config/whitelist.txt`，工作流用户为了避免冲突覆盖，建议文件重命名添加
`user_`前缀（#584,#599）
- ✨ 新增黑名单列表功能，支持接口关键字黑名单，文件位于`config/blacklist.txt`，工作流用户为了避免冲突覆盖，建议文件重命名添加
`user_`前缀
- ✨ 新增订阅源列表功能，文件位于`config/subscribe.txt`，工作流用户为了避免冲突覆盖，建议文件重命名添加`user_`前缀
- ✨ 新增支持获取接口速率、最低速率过滤（`open_filter_speed`、`min_speed`）
- ✨ 新增支持修改Docker服务端口环境变量（`APP_PORT`）（#619）
- ✨ 新增jsdelivr代理地址，支持TLSv1.1 和 TLSv1.2 协议（#639）
- ✨ 新增离线数据和网络数据查询开关（`open_use_cache`, `open_request`）
- ✨ 新增控制是否使用离线数据和网络数据查询（`open_use_cache`、`open_request`）
- ✨ 新增支持跳过检查是否支持ipv6（`ipv6_support`）
- ✨ 调整GUI界面布局，新增测速设置页面，跳转编辑白/黑名单、订阅源列表文本
- 🐛 修复部分m3u8接口测速导致任务超时（#621）
- 🐛 修复GUI日志线程占用问题（#655）
- 🐛 补充显示更新时间配置文档（#622）
- 🪄 优化接口测速方法，移除`yt-dlp`（#621）
- 🗑️ 移除配置：`open_ffmpeg`、`subscribe_urls`、`resolution_weight`、`response_time_weight`、`url_keywords_blacklist`

<details>
<summary>English</summary>

- ❤️ Recommend following the WeChat public account (Govin) to subscribe to update notifications and articles on usage
tips, as well as for Q&A and discussion.
- ⚠️ This update involves configuration changes. Refer to the latest `config/config.ini`. Workflow users need to copy
the latest configuration to `user_config.ini`.
- ✨ Added whitelist feature, supporting custom interface and subscription source keyword whitelists. The file is located
at `config/whitelist.txt`. To avoid conflict, workflow users are advised to rename the file with a `user_` prefix (
#584, #599).
- ✨ Added blacklist feature, supporting interface keyword blacklists. The file is located at `config/blacklist.txt`. To
avoid conflict, workflow users are advised to rename the file with a `user_` prefix.
- ✨ Added subscription source list feature. The file is located at `config/subscribe.txt`. To avoid conflict, workflow
users are advised to rename the file with a `user_` prefix.
- ✨ Added support for fetching interface speed and minimum speed filtering (`open_filter_speed`, `min_speed`).
- ✨ Added support for modifying Docker server port environment variable (`APP_PORT`) (#619).
- ✨ Added jsdelivr proxy address, supporting TLSv1.1 and TLSv1.2 protocols (#639).
- ✨ Added switches for offline data and network data queries (`open_use_cache`, `open_request`).
- ✨ Added control for whether to use offline data and network data queries (`open_use_cache`, `open_request`).
- ✨ Added support for skipping the check for IPv6 support (`ipv6_support`).
- ✨ Adjusted GUI layout, added speed test settings page, and links to edit whitelist/blacklist and subscription source
list text files.
- 🐛 Fixed issue where some m3u8 interface speed tests caused task timeouts (#621).
- 🐛 Fixed GUI log thread occupation issue (#655).
- 🐛 Added display of update time in configuration documentation (#622).
- 🪄 Optimized interface speed test method, removed `yt-dlp` (#621).
- 🗑️ Removed configurations: `open_ffmpeg`, `subscribe_urls`, `resolution_weight`, `response_time_weight`,
`url_keywords_blacklist`.

</details>

## v1.5.5

### 2024/12/2
Expand Down
28 changes: 4 additions & 24 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,6 @@

- 接口源：

```bash
https://ghp.ci/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.m3u
```

```bash
https://ghp.ci/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.txt
```

或

```bash
https://cdn.jsdelivr.net/gh/Guovin/iptv-api@gd/output/result.m3u
```
Expand All @@ -130,12 +120,6 @@ https://cdn.jsdelivr.net/gh/Guovin/iptv-api@gd/output/result.txt

- 数据源：

```bash
https://ghp.ci/raw.githubusercontent.com/Guovin/iptv-api/gd/source.json
```

或

```bash
https://cdn.jsdelivr.net/gh/Guovin/iptv-api@gd/source.json
```
Expand All @@ -144,9 +128,8 @@ https://cdn.jsdelivr.net/gh/Guovin/iptv-api@gd/source.json

| 配置项 | 描述 | 默认值 |
|:-----------------------|:------------------------------------------------------------------------------------------|:----------------------------------------|
| open_driver | 开启浏览器运行，若更新无数据可开启此模式，较消耗性能 | True |
| open_driver | 开启浏览器运行，若更新无数据可开启此模式，较消耗性能 | False |
| open_empty_category | 开启无结果频道分类，自动归类至底部 | False |
| open_ffmpeg | 开启使用 FFmpeg 进行测速，获取更准确的速度与分辨率信息，需要提前手动安装 | True |
| open_filter_resolution | 开启分辨率过滤，低于最小分辨率（min_resolution）的接口将会被过滤 | True |
| open_filter_speed | 开启速率过滤，低于最小速率（min_speed）的接口将会被过滤 | True |
| open_hotel | 开启酒店源功能，关闭后所有酒店源工作模式都将关闭 | True |
Expand All @@ -159,22 +142,22 @@ https://cdn.jsdelivr.net/gh/Guovin/iptv-api@gd/source.json
| open_multicast_fofa | 开启 FOFA 组播源工作模式 | True |
| open_online_search | 开启关键字搜索源功能 | False |
| open_proxy | 开启代理，自动获取免费可用代理，若更新无数据可开启此模式 | False |
| open_request | 开启查询请求，数据来源于网络 | False |
| open_request | 开启查询请求，数据来源于网络（仅针对酒店源与组播源） | False |
| open_service | 开启页面服务，用于控制是否启动结果页面服务；如果使用青龙等平台部署，有专门设定的定时任务，需要更新完成后停止运行，可以关闭该功能 | True |
| open_sort | 开启排序功能（响应速度、日期、分辨率） | True |
| open_subscribe | 开启订阅源功能 | False |
| open_update | 开启更新，用于控制是否更新接口，若关闭则所有工作模式（获取接口和测速）均停止 | True |
| open_update_time | 开启显示更新时间 | True |
| open_url_info | 开启显示接口说明信息，用于控制是否显示分辨率、接口协议类型等信息，为$符号后的内容，播放软件使用该信息对接口进行描述 | True |
| open_use_cache | 开启使用本地缓存数据，适用于查询请求失败场景 | True |
| open_use_cache | 开启使用本地缓存数据，适用于查询请求失败场景（仅针对酒店源与组播源） | True |
| open_use_old_result | 开启使用历史更新结果（包含模板与结果文件的接口），合并至本次更新中 | True |
| delay_weight | 响应时间权重值（所有权重值总和应为 1） | 0.25 |
| final_file | 生成结果文件路径 | output/result.txt |
| hotel_num | 结果中偏好的酒店源接口数量 | 4 |
| hotel_page_num | 酒店地区获取分页数量 | 1 |
| hotel_region_list | 酒店源地区列表，"全部"表示所有地区 | 全部 |
| ipv4_num | 结果中偏好的 IPv4 接口数量 | 5 |
| ipv6_num | 结果中偏好的 IPv6 接口数量 | 5 |
| ipv6_support | 强制认为当前网络支持IPv6，跳过检测 | False |
| ipv_type | 生成结果中接口的协议类型，可选值：ipv4、ipv6、全部、all | 全部 |
| ipv_type_prefer | 接口协议类型偏好，优先将该类型的接口排在结果前面，可选值：IPv4、IPv6、自动、auto | 自动 |
| min_resolution | 接口最小分辨率，需要开启 open_filter_resolution 才能生效 | 1920x1080 |
Expand All @@ -187,12 +170,9 @@ https://cdn.jsdelivr.net/gh/Guovin/iptv-api@gd/source.json
| origin_type_prefer | 结果偏好的接口来源，结果优先按该顺序进行排序，hotel：酒店源，multicast：组播源，subscribe：订阅源，online_search：关键字搜索 | hotel,multicast,subscribe,online_search |
| recent_days | 获取最近时间范围内更新的接口（单位天），适当减小可避免出现匹配问题 | 30 |
| request_timeout | 查询请求超时时长，单位秒(s)，用于控制查询接口文本链接的超时时长以及重试时长，调整此值能优化更新时间 | 10 |
| resolution_weight | 分辨率权重值 （所有权重值总和应为 1） | 0.25 |
| sort_timeout | 单个接口测速超时时长，单位秒(s)；数值越大测速所属时间越长，能提高获取接口数量，但质量会有所下降；数值越小测速所需时间越短，能获取低延时的接口，质量较好；调整此值能优化更新时间 | 10 |
| source_file | 模板文件路径 | config/demo.txt |
| speed_weight | 速率权重值（所有权重值总和应为 1） | 0.5 |
| subscribe_num | 结果中偏好的订阅源接口数量 | 3 |
| url_keywords_blacklist | 接口关键字黑名单，用于过滤含特定字符的接口 | |
| urls_limit | 单个频道接口数量 | 10 |

## 快速上手
Expand Down
Loading