Skip to content

Commit

Permalink
Merge pull request #257 from Guovin/master
Browse files Browse the repository at this point in the history 
Release
  • Loading branch information
@Guovin
Guovin authored Aug 22, 2024
2 parents 5a6f206 + 9272b97 commit 975e5c2
Show file tree
Hide file tree
Showing 41 changed files with 1,951 additions and 1,249 deletions.
6 changes: 6 additions & 0 deletions .dockerignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
dist
build
.github
*.log
docs
tkinter
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
dist
build
build
result_new.log
5 changes: 0 additions & 5 deletions .idea/.gitignore
View file

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/TV.iml
View file

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/UniappTool.xml
View file

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml
View file

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml
View file

This file was deleted.

11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# 更新日志（Changelog）

## v1.3.6

### 2024/8/22

- 新增酒店源更新，支持 Tonkiang、FOFA 两种工作模式（Added hotel source updates, supporting Tonkiang and FOFA working modes）
- 重构 UI 界面软件，新增帮助-关于、获取频道名称编辑、酒店源相关配置、软件图标（Refactored UI interface software, added Help-About, channel name editing, hotel source related configuration, and software icon）
- 移除关注频道相关配置（Removed configuration related to followed channels）
- 修复 Docker 定时任务未执行问题（Fixed issue with Docker scheduled tasks not executing）
- 修复使用历史结果时频道数据异常问题（Fixed issue with channel data anomalies when using historical results）
- 优化 UI 界面软件运行生成配置目录，方便查看与修改（Optimized UI interface software to generate configuration directory for easier viewing and modification）

## v1.3.5

### 2024/8/14
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ RUN (crontab -l ; \
echo "0 22 * * * cd $APP_WORKDIR && /usr/local/bin/pipenv run python main.py scheduled_task"; \
echo "0 10 * * * cd $APP_WORKDIR && /usr/local/bin/pipenv run python main.py scheduled_task") | crontab -

CMD ["cron", "-f"]

EXPOSE 8000

COPY entrypoint.sh /tv_entrypoint.sh
Expand Down
3 changes: 2 additions & 1 deletion Pipfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ verify_ssl = true

[scripts]
build = "python main.py"
ui = "python tkinter_ui.py"
ui = "python tkinter_ui/tkinter_ui.py"

[dev-packages]

Expand All @@ -22,6 +22,7 @@ aiohttp = "*"
flask = "*"
opencc-python-reimplemented = "*"
fake-useragent = "*"
gunicorn = "*"

[requires]
python_version = "3.8"
576 changes: 293 additions & 283 deletions Pipfile.lock
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
## 特点

- 自定义模板，生成您想要的频道分类与频道顺序
- 支持多种获取源方式：线上检索、组播源、酒店源、订阅源
- 支持多种获取源方式：组播源、酒店源、订阅源、线上检索
- 接口测速验效，响应时间、分辨率优先级，过滤无效接口
- 定时执行，北京时间每日 6:00 与 18:00 执行更新
- 支持多种运行方式：工作流、命令行、界面软件、Docker
Expand Down Expand Up @@ -112,4 +112,4 @@ Fork 本项目并开启工作流更新

## 赞赏

![image](./docs/images/appreciate.jpg)
![image](./static/images/appreciate.jpg)
4 changes: 2 additions & 2 deletions README_en.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Customize channel menus and automatically obtain and update the latest live sour
## Features

- Custom templates for creating desired channel categories and order
- Supports multiple source acquisition methods: online search, multicast source, hotel source, subscription source
- Supports multiple source acquisition methods: multicast source, hotel source, subscription source, online search
- Interface speed testing and verification, with priority on response time and resolution, filtering out ineffective interfaces
- Scheduled execution at 6:00 AM and 18:00 PM Beijing time daily
- Supports various execution methods: workflows, command line, GUI software, Docker
Expand Down Expand Up @@ -112,4 +112,4 @@ If you don't want to bother, and my configuration just meets your needs, you can

## Appreciate

![image](./docs/images/appreciate.jpg)
![image](./static/images/appreciate.jpg)
14 changes: 9 additions & 5 deletions config/config.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ open_update = True
open_use_old_result = True
source_file = config/demo.txt
final_file = output/result.txt
favorite_list = 广东珠江,CCTV-1,CCTV-5,CCTV-5+,CCTV-13,广东体育,广东卫视,大湾区卫视,浙江卫视,湖南卫视,翡翠台
source_channels = 广东珠江,广东体育,广东新闻,广东卫视,大湾区卫视,江门综合,江门侨乡生活,新会综合,鹤山综合,佛山综合,佛山公共,佛山影视,深圳卫视,CCTV-1,CCTV-2,CCTV-3,CCTV-4,CCTV-5,CCTV-5+,CCTV-6,CCTV-7,CCTV-8,CCTV-9,CCTV-10,CCTV-11,CCTV-12,CCTV-13,CCTV-14,CCTV-15,CCTV-16,CCTV-17,广东卫视,浙江卫视,湖南卫视,北京卫视,湖北卫视,黑龙江卫视,安徽卫视,重庆卫视,东方卫视,东南卫视,甘肃卫视,广西卫视,贵州卫视,海南卫视,河北卫视,河南卫视,吉林卫视,江苏卫视,江西卫视,辽宁卫视,内蒙古卫视,宁夏卫视,青海卫视,山东卫视,山西卫视,陕西卫视,四川卫视,深圳卫视,三沙卫视,天津卫视,西藏卫视,新疆卫视,云南卫视,翡翠台,明珠台,星河台,凤凰中文,凤凰资讯,凤凰香港,TVBS亚洲,TVBS新闻,TVBS欢乐

open_online_search = False
favorite_page_num = 5
default_page_num = 3
online_search_page_num = 5
urls_limit = 15
open_keep_all = False
open_sort = True
Expand All @@ -23,8 +22,13 @@ 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 = True
region_list = 广东
multicast_region_list = 广东
multicast_page_num = 5
open_proxy = False
open_driver = False
open_hotel = True
open_hotel_tonkiang = True
open_hotel_fofa = True
hotel_region_list = 广东
hotel_page_num = 5

21 changes: 13 additions & 8 deletions docs/config.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@
| 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,广东体育,广东卫视,大湾区卫视,浙江卫视,湖南卫视,翡翠台 | 关注频道名称列表（仅用于与常规频道区分，自定义获取分页数量） |
| source_file | config/demo.txt | 模板文件路径 |
| source_channels | | 获取更新的频道名称 |
| final_file | output/result.txt | 生成结果文件路径 |
| open_online_search | False | 开启线上检索源功能 |
| favorite_page_num | 5 | 关注频道获取分页数量 |
| default_page_num | 3 | 常规频道获取分页数量 |
| urls_limit | 10 | 单个频道接口数量 |
| online_search_page_num | 5 | 在线检索频道获取分页数量 |
| urls_limit | 15 | 单个频道接口数量 |
| open_keep_all | False | 保留所有检索结果，会保留非模板频道名称的结果，推荐手动维护时开启 |
| open_sort | True | 开启排序功能（响应速度、日期、分辨率） |
| response_time_weight | 0.5 | 响应时间权重值（所有权重值总和应为 1） |
Expand All @@ -19,7 +18,13 @@
| ipv_type | ipv4 | 生成结果中接口的类型，可选值：ipv4、ipv6、all |
| domain_blacklist | epg.pw | 接口域名黑名单，用于过滤低质量含广告类域名的接口 |
| url_keywords_blacklist | | 接口关键字黑名单，用于过滤含特定字符的接口 |
| open_subscribe | True | 开启订阅源功能 |
| open_subscribe | False | 开启订阅源功能 |
| subscribe_urls | https://m3u.ibert.me/txt/fmml_dv6.txt,<br>https://m3u.ibert.me/txt/o_cn.txt,<br>https://m3u.ibert.me/txt/j_iptv.txt | 订阅源列表 |
| open_multicast | True | 开启组播源功能 |
| region_list | 广东 | 组播源地区列表，[更多地区](../updates/multicast/multicast_map.json)，all 表示所有地区 |
| multicast_region_list | 广东 | 组播源地区列表，[更多地区](../updates/multicast/multicast_map.json)，all 表示所有地区 |
| 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)，all 表示所有地区 |
| hotel_page_num | 5 | 酒店地区获取分页数量 |
Loading

0 comments on commit 975e5c2

Please sign in to comment.