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: v1.5.0 #453

Merged
merged 15 commits into from
Oct 25, 2024
Merged

Release: v1.5.0 #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
69b6451
chore:packages
Guovin Oct 24, 2024
681f4b8
chore:docker
Guovin Oct 24, 2024
10417ec
feat:ipv_num limit
Guovin Oct 24, 2024
551cedd
chore:update name
Guovin Oct 24, 2024
275f1da
chore:name
Guovin Oct 25, 2024
fa9b4e0
chore:ipv_type
Guovin Oct 25, 2024
ba5ab3d
feat:auto ipv_type_prefer
Guovin Oct 25, 2024
9e1117c
fix:ipv6 match (#452)
Guovin Oct 25, 2024
f28a9b1
chore:channel_name format
Guovin Oct 25, 2024
75a7be4
feat:subscribe_urls
Guovin Oct 25, 2024
bce483c
chore:docker
Guovin Oct 25, 2024
b83edbb
release:v1.5.0
Guovin Oct 25, 2024
b104b1e
feat:tkinter_ui prefer_icon
Guovin Oct 25, 2024
7e4344e
feat:about alipay img
Guovin Oct 25, 2024
8f68104
chore:time
Guovin Oct 25, 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
12 changes: 9 additions & 3 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
dist
build
.github
*.log
**/*.log
docs
tkinter
tkinter_ui
**/*.md
**/*.jpg
**/*.png
version.json
.git
.github
.gitignore
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'update schedule'
name: 'Update schedule'

on:
schedule:
Expand Down
36 changes: 36 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,41 @@
# 更新日志（Changelog）

## v1.5.0

### 2024/10/25

- ✨🛠 新增结果偏好设置：

1. 接口来源优先级（origin_type_prefer）与数量设置（hotel_num, multicast_num, subscribe_num, online_search_num）
2. IPv 类型优先级（ipv_type_prefer）与数量设置（ipv4_num, ipv6_num）

- ✨🛠 新增控制接口测速超时时间（sort_timeout）（#388）
- ✨🛠 新增控制是否开启页面服务（open_service）（青龙等平台可使用该配置实现任务执行完成后停止运行）
- ✨🛠 新增控制是否显示接口相关信息（open_url_info）（#431）
- ✨ 新增支持 m3u 地址订阅源（#389）
- ✨ 新增 🏛 经典剧场
- 🪄 优化 Docker ARM64 FFmpeg 支持（部分 ARM 设备无法运行 driver 镜像建议使用 requests 镜像）
- 🪄 优化组播获取非数值域名 ip 地址（#410）
- 🐛 修复对于非规范 txt 文本转换 m3u 报错问题（#422）
- 🐛 修复 IPv6 接口获取失败问题（#452）

<details>
<summary>English</summary>

- ✨🛠 Added result preference settings:
1. Source priority (origin_type_prefer) and quantity settings (hotel_num, multicast_num, subscribe_num, online_search_num)
2. IPv type priority (ipv_type_prefer) and quantity settings (ipv4_num, ipv6_num)
- ✨🛠 Added control for API speed test timeout (sort_timeout) (#388)
- ✨🛠 Added control to enable or disable page service (open_service) (this configuration can be used on platforms like QingLong to stop running after task completion)
- ✨🛠 Added control to show or hide API related information (open_url_info) (#431)
- ✨ Added support for m3u address subscription sources (#389)
- ✨ Added 🏛 Classic Theater
- 🪄 Optimized Docker ARM64 FFmpeg support (it is recommended to use the requests image for some ARM devices that cannot run the driver image)
- 🪄 Optimized obtaining non-numeric domain IP addresses for multicast (#410)
- 🐛 Fixed issues with converting non-standard txt files to m3u format (#422)
- 🐛 Fixed issues with failing to obtain IPv6 interface information (#452)
</details>

## v1.4.9

### 2024/10/11
Expand Down
6 changes: 2 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ COPY . $APP_WORKDIR

WORKDIR $APP_WORKDIR

RUN pip install -i https://mirrors.aliyun.com/pypi/simple pipenv

RUN pipenv install
RUN pip install -i https://mirrors.aliyun.com/pypi/simple pipenv \
&& pipenv install

RUN echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm main contrib non-free non-free-firmware\n \
deb-src https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm main contrib non-free non-free-firmware\n \
Expand All @@ -25,7 +24,6 @@ RUN echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm main contrib

RUN apt-get update && apt-get install -y --no-install-recommends \
cron \
xz-utils \
ffmpeg

ARG INSTALL_CHROMIUM=false
Expand Down
2 changes: 0 additions & 2 deletions Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ multicast_tmp = "python updates/multicast/update_tmp.py"

[packages]
requests = "*"
feedparser = "*"
pytz = "*"
selenium = "*"
bs4 = "*"
tqdm = "*"
Expand Down
929 changes: 523 additions & 406 deletions Pipfile.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
- 支持多种获取源方式：组播源、酒店源、订阅源、线上检索
- 接口测速验效，响应时间、分辨率优先级，过滤无效接口
- 定时执行，北京时间每日 6:00 与 18:00 执行更新
- 支持多种运行方式：工作流、命令行、界面软件、Docker(amd64/arm64)
- 支持多种运行方式：工作流、命令行、GUI 软件、Docker(amd64/arm64)
- 更多功能请见[配置参数](./docs/config.md)

## 最新结果：
Expand Down Expand Up @@ -118,11 +118,11 @@ pipenv install
pipenv run build
```

### 方式三：界面软件更新
### 方式三：GUI 软件更新

1. 下载[更新工具软件](https://github.com/Guovin/TV/releases)，打开软件，点击更新，即可完成更新

2. 或者在项目目录下运行以下命令，即可打开界面软件：
2. 或者在项目目录下运行以下命令，即可打开 GUI 软件：

```python
pipenv run ui
Expand All @@ -133,7 +133,7 @@ pipenv run ui
### 方式四：Docker 更新

- requests：轻量级，性能要求低，更新速度快，稳定性不确定（推荐订阅源使用此版本）
- driver：性能要求较高，更新速度较慢，稳定性、成功率高；修改配置 open_driver = False 可切换到 request 版本（推荐酒店源、组播源、在线搜索使用此版本）
- driver：性能要求较高，更新速度较慢，稳定性、成功率高；修改配置 open_driver = False 可切换到 request 版本（推荐酒店源、组播源、关键字搜索使用此版本）

建议都试用一次，选择自己合适的版本。

Expand Down
4 changes: 2 additions & 2 deletions config/config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ response_time_weight = 0.5
resolution_weight = 0.5
recent_days = 30
ipv_type = 全部
ipv_type_prefer = IPv4
ipv_type_prefer = 自动
ipv4_num = 15
ipv6_num = 15
domain_blacklist = epg.pw,skype.serv00.net,iptv.yjxfz.com,live-hls-web-ajb.getaj.net,live.goodiptv.club,hc73k3dhwo5gfkt.wcetv.com
open_m3u_result = True
url_keywords_blacklist =
open_subscribe = True
subscribe_urls = http://175.178.251.183:6689/live.txt,http://102.134.54.106:3099/live/全国酒店源mini.txt,https://ghproxy.net/https://raw.githubusercontent.com/kimwang1978/collect-tv-txt/main/merged_output.txt,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
subscribe_urls = http://175.178.251.183:6689/live.txt,http://102.134.54.106:3099/live/全国酒店源mini.txt,https://ghproxy.net/https://raw.githubusercontent.com/kimwang1978/collect-tv-txt/main/merged_output.txt,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,https://ghproxy.net/https://raw.githubusercontent.com/xzw832/cmys/main/S_CCTV.txt,https://ghproxy.net/https://raw.githubusercontent.com/xzw832/cmys/main/S_weishi.txt
open_multicast = True
open_multicast_tonkiang = True
open_multicast_fofa = True
Expand Down
10 changes: 5 additions & 5 deletions docs/config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
| open_proxy | False | 开启代理，自动获取免费可用代理，若更新无数据可开启此模式 |
| source_file | config/demo.txt | 模板文件路径 |
| final_file | output/result.txt | 生成结果文件路径 |
| open_online_search | False | 开启线上检索源功能 |
| online_search_page_num | 3 | 在线检索频道获取分页数量 |
| open_online_search | False | 开启关键字搜索源功能 |
| online_search_page_num | 3 | 关键字搜索频道获取分页数量 |
| urls_limit | 15 | 单个频道接口数量 |
| open_keep_all | False | 保留所有检索结果，会保留非模板频道名称的结果，推荐手动维护时开启 |
| open_sort | True | 开启排序功能（响应速度、日期、分辨率） |
Expand All @@ -21,7 +21,7 @@
| resolution_weight | 0.5 | 分辨率权重值 （所有权重值总和应为 1） |
| recent_days | 30 | 获取最近时间范围内更新的接口（单位天），适当减小可避免出现匹配问题 |
| ipv_type | ipv4 | 生成结果中接口的协议类型，可选值：ipv4、ipv6、全部 |
| ipv_type_prefer | IPv4 | 接口协议类型偏好，优先将该类型的接口排在结果前面，可选值：IPv4、IPv6、随机 |
| ipv_type_prefer | IPv4 | 接口协议类型偏好，优先将该类型的接口排在结果前面，可选值：IPv4、IPv6、自动 |
| ipv4_num | 15 | 结果中偏好的 IPv4 接口数量 |
| ipv6_num | 15 | 结果中偏好的 IPv6 接口数量 |
| domain_blacklist | epg.pw | 接口域名黑名单，用于过滤低质量含广告类域名的接口 |
Expand All @@ -39,9 +39,9 @@
| hotel_region_list | 全部 | 酒店源地区列表，[更多地区](../updates/fofa/fofa_map.py)，"全部"表示所有地区 |
| hotel_page_num | 3 | 酒店地区获取分页数量 |
| request_timeout | 10 | 查询请求超时时长，单位秒(s)，用于控制查询接口文本链接的超时时长以及重试时长，调整此值能优化更新时间 |
| origin_type_prefer | hotel,multicast,subscribe,online_search | 结果偏好的接口来源，结果优先按该顺序进行排序，hotel：酒店源，multicast：组播源，subscribe：订阅源，online_search：在线搜索 |
| origin_type_prefer | hotel,multicast,subscribe,online_search | 结果偏好的接口来源，结果优先按该顺序进行排序，hotel：酒店源，multicast：组播源，subscribe：订阅源，online_search：关键字搜索 |
| hotel_num | 10 | 结果中偏好的酒店源接口数量 |
| multicast_num | 10 | 结果中偏好的组播源接口数量 |
| subscribe_num | 10 | 结果中偏好的订阅源接口数量 |
| online_search_num | 10 | 结果中偏好的在线搜索接口数量 |
| online_search_num | 10 | 结果中偏好的关键字搜索接口数量 |
| open_url_info | True | 开启显示接口说明信息，用于控制是否显示分辨率、接口协议类型等信息，为$符号后的内容，播放软件使用该信息对接口进行描述 |
Loading