Skip to content

Commit

Permalink
Merge pull request #924 from Guovin/dev
Browse files Browse the repository at this point in the history 
Release: v1.6.1
  • Loading branch information
@Guovin
Guovin authored Feb 21, 2025
2 parents 4439563 + a4fe182 commit bfa47bf
Show file tree
Hide file tree
Showing 29 changed files with 407 additions and 282 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: 'Update schedule'

on:
schedule:
- cron: '0 22 * * *'
- cron: '0 10 * * *'
- cron: '0 22,10 * * *'
workflow_dispatch:
branches:
- master
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
dist
build
result_new.log
updates/multicast/multicast_region_result.json
updates/multicast/multicast_region_result.json
.idea
37 changes: 37 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,42 @@
# 更新日志（Changelog）

## v1.6.1

### 2025/2/21

- 🎉 预告：💻[IPTV-Web](https://github.com/Guovin/iptv-web)：IPTV电视直播源管理平台，支持在线播放等功能，开发中...
- ✨ 新增支持`IPv6域名解析`，提升IPv6接口识别能力（#910）
- ✨ Docker更新时间环境变量精简为`UPDATE_CRON`，支持多个时间设置（#920）
- ✨ 更新组播源与酒店源离线数据
- 🪄 移除默认代理，由于集中访问压力过大，出现失效情况，建议自行定义订阅源和结果的代理地址，或关注公众号回复获取代理地址
- 🪄 重构频道数据格式`tuple`为`dict`，增加类型定义，优化数据处理，调整目录结构
- 🪄 正则匹配预编译，提升效率
- 🐛 调整Docker `FFmpeg`构建版本，解决部分域名无法获取分辨率问题（#864）
- 🐛 修复Docker重启时创建重复定时任务问题（#916）
- 🐛 合并默认与用户配置，用户配置只需填写变更项即可（#892，@wongsyrone）
- 🐛 修复结果生成失败问题（#863，#870，#875）

<details>
<summary>English</summary>

- 🎉 Preview: 💻[IPTV-Web](https://github.com/Guovin/iptv-web): IPTV live stream management platform, supports online
playback and other features, under development...
- ✨ Added support for `IPv6 domain name resolution`, improving IPv6 interface recognition capability (#910)
- ✨ Simplified Docker update time environment variable to `UPDATE_CRON`, supporting multiple time settings (#920)
- ✨ Updated offline data for multicast sources and hotel sources
- 🪄 Removed default proxy due to high access pressure causing failures, it is recommended to define your own proxy
address for subscription sources and results, or follow the public account to get the proxy address
- 🪄 Refactored channel data format from `tuple` to `dict`, added type definitions, optimized data processing, and
adjusted directory structure
- 🪄 Precompiled regex matching to improve efficiency
- 🐛 Adjusted Docker `FFmpeg` build version to resolve issues with some domain names not being able to get resolution (
#864)
- 🐛 Fixed issue of creating duplicate scheduled tasks when Docker restarts (#916)
- 🐛 Merged default and user configurations, users only need to fill in the changes (#892, @wongsyrone)
- 🐛 Fixed issue of result generation failure (#863, #870, #875)

</details>

## v1.6.0

### 2025/1/22
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ ENV APP_WORKDIR=$APP_WORKDIR
ENV LITE=$LITE
ENV APP_PORT=8000
ENV PATH="/.venv/bin:$PATH"
ENV UPDATE_CRON1="0 22 * * *"
ENV UPDATE_CRON2="0 10 * * *"
ENV UPDATE_CRON="0 22,10 * * *"

WORKDIR $APP_WORKDIR

Expand Down
7 changes: 3 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@ https://cdn.jsdelivr.net/gh/Guovin/iptv-api@gd/source.json
| open_filter_speed | 开启速率过滤，低于最小速率（min_speed）的接口将会被过滤 | True |
| open_hotel | 开启酒店源功能，关闭后所有酒店源工作模式都将关闭 | True |
| open_hotel_foodie | 开启 Foodie 酒店源工作模式 | True |
| open_hotel_fofa | 开启 FOFA、ZoomEye 酒店源工作模式 | True |
| open_hotel_fofa | 开启 FOFA、ZoomEye 酒店源工作模式 | False |
| open_keep_all | 开启保留所有检索结果，会保留非模板频道名称的结果，推荐手动维护时开启 | False |
| open_local | 开启本地源功能，将使用模板文件与本地源文件中的数据 | True |
| open_m3u_result | 开启转换生成 m3u 文件类型结果链接，支持显示频道图标 | True |
| open_multicast | 开启组播源功能，关闭后所有组播源工作模式都将关闭 | True |
| open_multicast_foodie | 开启 Foodie 组播源工作模式 | True |
| open_multicast_fofa | 开启 FOFA 组播源工作模式 | True |
| open_multicast_fofa | 开启 FOFA 组播源工作模式 | False |
| open_online_search | 开启关键字搜索源功能 | False |
| open_proxy | 开启代理，自动获取免费可用代理，若更新无数据可开启此模式 | False |
| open_request | 开启查询请求，数据来源于网络（仅针对酒店源与组播源） | False |
Expand Down Expand Up @@ -279,8 +279,7 @@ docker run -d -p 8000:8000 guovern/iptv-api:lite
- 定时执行时间

```bash
-e UPDATE_CRON1="0 22 * * *"
-e UPDATE_CRON2="0 10 * * *"
-e UPDATE_CRON="0 22,10 * * *"
```

#### 3. 更新结果
Expand Down
10 changes: 5 additions & 5 deletions README_en.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@

[中文](./README.md) | English

✨💻[IPTV-Web](https://github.com/Guovin/iptv-web): IPTV live stream management platform, supports online playback and other features, under development...
✨💻[IPTV-Web](https://github.com/Guovin/iptv-web): IPTV live stream management platform, supports online playback and
other features, under development...

- [✅ Features](#features)
- [🔗 Latest results](#latest-results)
Expand Down Expand Up @@ -114,13 +115,13 @@ https://cdn.jsdelivr.net/gh/Guovin/iptv-api@gd/source.json
| open_filter_speed | Enable speed filtering, interfaces with speed lower than the minimum speed (min_speed) will be filtered | True |
| open_hotel | Enable the hotel source function, after closing it all hotel source working modes will be disabled | True |
| open_hotel_foodie | Enable Foodie hotel source work mode | True |
| open_hotel_fofa | Enable FOFA、ZoomEye hotel source work mode | True |
| open_hotel_fofa | Enable FOFA、ZoomEye hotel source work mode | False |
| open_keep_all | Enable retain all search results, retain results with non-template channel names, recommended to be turned on when manually maintaining | False |
| open_local | Enable local source function, will use the data in the template file and the local source file | True |
| open_m3u_result | Enable the conversion to generate m3u file type result links, supporting the display of channel icons | True |
| open_multicast | Enable the multicast source function, after disabling it all multicast sources will stop working | True |
| open_multicast_foodie | Enable Foodie multicast source work mode | True |
| open_multicast_fofa | Enable FOFA multicast source work mode | True |
| open_multicast_fofa | Enable FOFA multicast source work mode | False |
| open_online_search | Enable keyword search source feature | False |
| open_proxy | Enable proxy, automatically obtains free available proxies, If there are no updates, this mode can be enabled | False |
| open_request | Enable query request, the data is obtained from the network (only for hotel sources and multicast sources) | False |
Expand Down Expand Up @@ -287,8 +288,7 @@ Taking the host path /etc/docker as an example:
- Scheduled execution time

```bash
-e UPDATE_CRON1="0 22 * * *"
-e UPDATE_CRON2="0 10 * * *"
-e UPDATE_CRON="0 22,10 * * *"
```

#### 3. Update results
Expand Down
4 changes: 2 additions & 2 deletions config/config.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ open_hotel = True
# 开启 Foodie 酒店源工作模式; 可选值: True, False | Enable Foodie hotel source working mode; Optional values: True, False
open_hotel_foodie = True
# 开启 FOFA、ZoomEye 酒店源工作模式; 可选值: True, False | Enable FOFA, ZoomEye hotel source working mode; Optional values: True, False
open_hotel_fofa = True
open_hotel_fofa = False
# 开启保留所有检索结果，会保留非模板频道名称的结果，推荐手动维护时开启; 可选值: True, False | Enable to keep all search results, will keep the results of non-template channel names, it is recommended to enable when manually maintaining; Optional values: True, False
open_keep_all = False
# 开启本地源功能，将使用模板文件与本地源文件（local.txt）中的数据；可选值: True, False | Enable local source function, will use the data in the template file and the local source file (local.txt); Optional values: True, False
Expand All @@ -24,7 +24,7 @@ open_multicast = True
# 开启 Foodie 组播源工作模式; 可选值: True, False | Enable Foodie multicast source working mode; Optional values: True, False
open_multicast_foodie = True
# 开启 FOFA 组播源工作模式; 可选值: True, False | Enable FOFA multicast source working mode; Optional values: True, False
open_multicast_fofa = True
open_multicast_fofa = False
# 开启关键字搜索源功能; 可选值: True, False | Enable keyword search source function; Optional values: True, False
open_online_search = False
# 开启代理，自动获取免费可用代理，若更新无数据可开启此模式; 可选值: True, False | Enable proxy, automatically obtain free available proxy, If there are no updates, this mode can be enabled; Optional values: True, False
Expand Down
Loading

0 comments on commit bfa47bf

Please sign in to comment.