diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e9450d..bb61b39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,26 +2,34 @@
## v1.5.4
-### 2024/11/25
+### 2024/11/28
- ⚠️ Python 升级至 3.13,该版本已不支持 Win7,若有需要请使用 v1.5.3
-- ⚠️ Github 仓库改名:IPTV,使用旧接口地址请及时更换新地址
-- ⚠️ Docker 镜像仓库改名:guovern/iptv(之前的 tv-driver 对应:guovern/iptv:latest,tv-requests 对应 guovern/iptv:lite)
+- ⚠️ Github 仓库改名:iptv-api,使用旧接口地址请及时更换新地址
+- ⚠️ Docker 新镜像仓库启用:guovern/iptv-api(旧版的 tv-driver 改为:guovern/iptv-api:latest,tv-requests 改为 guovern/iptv-api:lite),iptv-api:latest 为完整版、iptv-api:lite 为精简版,请使用新的名称命令进行拉取,旧仓库将不再维护
+- ✨ 新增微信公众号关注途径(公众号搜索:Govin),推荐关注公众号,可订阅更新通知与使用技巧等文章推送,还可进行交流讨论
- ✨ 更换测速方法(yt-dlp),重构测速逻辑,提升准确性、稳定性与效率,减小接口切换延迟(#563)
- ✨ 新增支持 ARM v7(#562)
-- ✨ 新增微信公众号关注途径(公众号搜索:Govin),关注公众号可订阅更新通知与使用技巧等文章推送
+- ✨ 新增双结果 API 访问(ip/m3u, ip/txt)(#581)
+- ✨ 新增启动 API 服务命令(pipenv run service)
- 🪄 优化 Docker 镜像大小
+- 🛠 调整默认更新频率为 12 小时一次
+- 🐛 修复部分播放器不支持的信息间隔符(#581)
English
- ⚠️ Python has been upgraded to version 3.13, which no longer supports Win7. If needed, please use version v1.5.3.
-- ⚠️ The GitHub repository has been renamed to IPTV. If you are using the old API address, please update it to the new one promptly.
-- ⚠️ The Docker image repository has been renamed to guovern/iptv (the previous tv-driver corresponds to guovern/iptv:latest, and tv-requests corresponds to guovern/iptv:lite).
-- ✨ Change the speed measurement method (yt-dlp), reconstruct the speed measurement logic, improve accuracy, stability, and efficiency, and reduce interface switching delay. (#563)
-- ✨ Support for ARM v7 has been added. (#562)
-- ✨ A new way to follow the WeChat official account (search for: Govin) has been added. Following the official account will allow you to subscribe to update notifications and receive articles with usage tips.
+- ⚠️ The GitHub repository has been renamed to iptv-api. If you are using the old API address, please update it to the new one promptly.
+- ⚠️ New Docker image repository is now active: guovern/iptv-api (the old tv-driver is now guovern/iptv-api:latest, and tv-requests is now guovern/iptv-api:lite). iptv-api:latest is the full version, and iptv-api:lite is the lightweight version. Please use the new names to pull the images, as the old repository will no longer be maintained.
+- ✨ A new way to follow the WeChat official account (search for: Govin) has been added. It is recommended to follow the official account to subscribe to update notifications, usage tips, and engage in discussions.
+- ✨ The speed measurement method has been changed to yt-dlp, and the speed measurement logic has been refactored to improve accuracy, stability, and efficiency, reducing interface switching delay (#563).
+- ✨ Support for ARM v7 has been added (#562).
+- ✨ Dual result API access (ip/m3u, ip/txt) has been added (#581).
+- ✨ A command to start the API service (pipenv run service) has been added.
- 🪄 The size of the Docker image has been optimized.
+- 🛠 The default update frequency has been adjusted to once every 12 hours.
+- 🐛 Fixed the information delimiter issue for some players that do not support it (#581).
- - + + - - + + - - + + @@ -80,8 +80,8 @@ - - + +
@@ -102,17 +102,17 @@ - 接口源: ```bash -https://ghproxy.net/raw.githubusercontent.com/Guovin/IPTV/gd/output/result.m3u +https://ghproxy.net/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.m3u ``` ```bash -https://ghproxy.net/raw.githubusercontent.com/Guovin/IPTV/gd/output/result.txt +https://ghproxy.net/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.txt ``` - 数据源: ```bash -https://ghproxy.net/raw.githubusercontent.com/Guovin/IPTV/gd/source.json +https://ghproxy.net/raw.githubusercontent.com/Guovin/iptv-api/gd/source.json ``` ## ⚙️ 配置 @@ -149,7 +149,7 @@ pipenv run service ### 方式三:GUI 软件 -1. 下载[IPTV 更新软件](https://github.com/Guovin/IPTV/releases),打开软件,点击更新,即可完成更新 +1. 下载[IPTV-API 更新软件](https://github.com/Guovin/iptv-api/releases),打开软件,点击更新,即可完成更新 2. 或者在项目目录下运行以下命令,即可打开 GUI 软件: @@ -157,39 +157,39 @@ pipenv run service pipenv run ui ``` - + ### 方式四:Docker -- iptv(完整版本):性能要求较高,更新速度较慢,稳定性、成功率高;修改配置 open_driver = False 可切换到 Lite 版本运行模式(推荐酒店源、组播源、关键字搜索使用此版本) -- iptv:lite(精简版本):轻量级,性能要求低,更新速度快,稳定性不确定(推荐订阅源使用此版本) +- iptv-api(完整版本):性能要求较高,更新速度较慢,稳定性、成功率高;修改配置 open_driver = False 可切换到 Lite 版本运行模式(推荐酒店源、组播源、关键字搜索使用此版本) +- iptv-api:lite(精简版本):轻量级,性能要求低,更新速度快,稳定性不确定(推荐订阅源使用此版本) 1. 拉取镜像: -- iptv: +- iptv-api: ```bash -docker pull guovern/iptv:latest +docker pull guovern/iptv-api:latest ``` -- iptv:lite: +- iptv-api:lite: ```bash -docker pull guovern/iptv:lite +docker pull guovern/iptv-api:lite ``` 2. 运行容器: -- iptv: +- iptv-api: ```bash -docker run -d -p 8000:8000 guovern/iptv +docker run -d -p 8000:8000 guovern/iptv-api ``` -- iptv:lite: +- iptv-api:lite: ```bash -docker run -d -p 8000:8000 guovern/iptv:lite +docker run -d -p 8000:8000 guovern/iptv-api:lite ``` 卷挂载参数(可选): @@ -197,16 +197,16 @@ docker run -d -p 8000:8000 guovern/iptv:lite 以宿主机路径/etc/docker 为例: -- iptv: +- iptv-api: ```bash -docker run -v /etc/docker/config:/iptv/config -v /etc/docker/output:/iptv/output -d -p 8000:8000 guovern/iptv +docker run -v /etc/docker/config:/iptv-api/config -v /etc/docker/output:/iptv-api/output -d -p 8000:8000 guovern/iptv-api ``` -- iptv:lite: +- iptv-api:lite: ```bash -docker run -v /etc/docker/config:/iptv_lite/config -v /etc/docker/output:/iptv_lite/output -d -p 8000:8000 guovern/iptv:lite +docker run -v /etc/docker/config:/iptv-api-lite/config -v /etc/docker/output:/iptv-api-lite/output -d -p 8000:8000 guovern/iptv-api:lite ``` 3. 更新结果: diff --git a/README_en.md b/README_en.md index a777bf6..0737239 100644 --- a/README_en.md +++ b/README_en.md @@ -1,6 +1,6 @@- - + + - - + + - - + + @@ -80,8 +80,8 @@ - - + +
@@ -102,17 +102,17 @@ - Interface source: ```bash -https://ghproxy.net/raw.githubusercontent.com/Guovin/TV/gd/output/result.m3u +https://ghproxy.net/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.m3u ``` ```bash -https://ghproxy.net/raw.githubusercontent.com/Guovin/TV/gd/output/result.txt +https://ghproxy.net/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.txt ``` - Data source: ```bash -https://ghproxy.net/raw.githubusercontent.com/Guovin/TV/gd/source.json +https://ghproxy.net/raw.githubusercontent.com/Guovin/iptv-api/gd/source.json ``` ## ⚙️ Config @@ -149,7 +149,7 @@ pipenv run service ### Method 3: GUI Software -1. Download [IPTV update software](https://github.com/Guovin/IPTV/releases), open the software, click update to complete the update +1. Download [IPTV-API update software](https://github.com/Guovin/iptv-api/releases), open the software, click update to complete the update 2. Or run the following command in the project directory to open the GUI software: @@ -157,41 +157,41 @@ pipenv run service pipenv run ui ``` - + ### Method 4: Docker -- iptv (Full version): Higher performance requirements, slower update speed, high stability and success rate. Set open_driver = False to switch to the lite running mode (recommended for hotel sources, multicast sources, and online searches) -- iptv:lite (Condensed version): Lightweight, low performance requirements, fast update speed, stability uncertain (recommend using this version for the subscription source) +- iptv-api (Full version): Higher performance requirements, slower update speed, high stability and success rate. Set open_driver = False to switch to the lite running mode (recommended for hotel sources, multicast sources, and online searches) +- iptv-api:lite (Condensed version): Lightweight, low performance requirements, fast update speed, stability uncertain (recommend using this version for the subscription source) It's recommended to try each one and choose the version that suits you 1. Pull the image: -- iptv +- iptv-api ```bash -docker pull guovern/iptv:latest +docker pull guovern/iptv-api:latest ``` -- iptv:lite +- iptv-api:lite ```bash -docker pull guovern/iptv:lite +docker pull guovern/iptv-api:lite ``` 2. Run the container: -- iptv +- iptv-api ```bash -docker run -d -p 8000:8000 guovern/iptv +docker run -d -p 8000:8000 guovern/iptv-api ``` -- iptv:lite +- iptv-api:lite ```bash -docker run -d -p 8000:8000 guovern/iptv:lite +docker run -d -p 8000:8000 guovern/iptv-api:lite ``` Volume Mount Parameter (Optional): @@ -199,16 +199,16 @@ This allows synchronization of files between the host machine and the container. Taking the host path /etc/docker as an example: -- iptv: +- iptv-api: ```bash -docker run -v /etc/docker/config:/iptv/config -v /etc/docker/output:/iptv/output -d -p 8000:8000 guovern/iptv +docker run -v /etc/docker/config:/iptv-api/config -v /etc/docker/output:/iptv-api/output -d -p 8000:8000 guovern/iptv-api ``` -- iptv:lite: +- iptv-api:lite: ```bash -docker run -v /etc/docker/config:/iptv_lite/config -v /etc/docker/output:/iptv_lite/output -d -p 8000:8000 guovern/iptv:lite +docker run -v /etc/docker/config:/iptv-api-lite/config -v /etc/docker/output:/iptv-api-lite/output -d -p 8000:8000 guovern/iptv-api:lite ``` 3. Update results: diff --git a/docs/tutorial.md b/docs/tutorial.md index e5b0290..040ebd3 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -23,7 +23,7 @@ ### 1. Star -打开 https://github.com/Guovin/IPTV ,点击 Star 收藏该项目(您的 Star 是我持续更新的动力) +打开 https://github.com/Guovin/iptv-api ,点击 Star 收藏该项目(您的 Star 是我持续更新的动力) ![Star](./images/star.png 'Star') ### 2. Watch @@ -195,7 +195,7 @@ pipenv run service ### 方式三:GUI 软件 -1. 下载[IPTV 更新软件](https://github.com/Guovin/IPTV/releases),打开软件,点击更新,即可完成更新 +1. 下载[IPTV-API 更新软件](https://github.com/Guovin/iptv-api/releases),打开软件,点击更新,即可完成更新 2. 或者在项目目录下运行以下命令,即可打开 GUI 软件: @@ -203,39 +203,39 @@ pipenv run service pipenv run ui ``` -![IPTV 更新软件](./images/ui.png 'IPTV 更新软件') +![IPTV-API 更新软件](./images/ui.png 'IPTV-API 更新软件') ### 方式四:Docker -- iptv(完整版本):性能要求较高,更新速度较慢,稳定性、成功率高;修改配置 open_driver = False 可切换到 Lite 版本运行模式(推荐酒店源、组播源、关键字搜索使用此版本) -- iptv:lite(精简版本):轻量级,性能要求低,更新速度快,稳定性不确定(推荐订阅源使用此版本) +- iptv-api(完整版本):性能要求较高,更新速度较慢,稳定性、成功率高;修改配置 open_driver = False 可切换到 Lite 版本运行模式(推荐酒店源、组播源、关键字搜索使用此版本) +- iptv-api:lite(精简版本):轻量级,性能要求低,更新速度快,稳定性不确定(推荐订阅源使用此版本) 1. 拉取镜像: -- iptv: +- iptv-api: ```bash -docker pull guovern/iptv:latest +docker pull guovern/iptv-api:latest ``` -- iptv:lite: +- iptv-api:lite: ```bash -docker pull guovern/iptv:lite +docker pull guovern/iptv-api:lite ``` 2. 运行容器: -- iptv: +- iptv-api: ```bash -docker run -d -p 8000:8000 guovern/iptv +docker run -d -p 8000:8000 guovern/iptv-api ``` -- iptv:lite: +- iptv-api:lite: ```bash -docker run -d -p 8000:8000 guovern/iptv:lite +docker run -d -p 8000:8000 guovern/iptv-api:lite ``` 卷挂载参数(可选): @@ -243,22 +243,24 @@ docker run -d -p 8000:8000 guovern/iptv:lite 以宿主机路径/etc/docker 为例: -- iptv: +- iptv-api: ```bash -docker run -v /etc/docker/config:/iptv/config -v /etc/docker/output:/iptv/output -d -p 8000:8000 guovern/iptv +docker run -v /etc/docker/config:/iptv-api/config -v /etc/docker/output:/iptv-api/output -d -p 8000:8000 guovern/iptv-api ``` -- iptv:lite: +- iptv-api:lite: ```bash -docker run -v /etc/docker/config:/iptv_lite/config -v /etc/docker/output:/iptv_lite/output -d -p 8000:8000 guovern/iptv:lite +docker run -v /etc/docker/config:/iptv-api-lite/config -v /etc/docker/output:/iptv-api-lite/output -d -p 8000:8000 guovern/iptv-api:lite ``` 3. 更新结果: - 接口地址:ip:8000 -- 接口详情:ip:8000/result +- M3u 接口:ip:8000/m3u +- Txt 接口:ip:8000/txt +- 接口内容:ip:8000/content - 测速日志:ip:8000/log ### 上传更新文件至仓库(可选) diff --git a/docs/tutorial_en.md b/docs/tutorial_en.md index 25b4862..ebf8cf5 100644 --- a/docs/tutorial_en.md +++ b/docs/tutorial_en.md @@ -23,7 +23,7 @@ Since this project will continue to iterate and improve, if you want to get the ### 1. Star -Go to https://github.com/Guovin/IPTV, click on Star to bookmark this project (Your Star is my motivation to keep updating). +Go to https://github.com/Guovin/iptv-api, click on Star to bookmark this project (Your Star is my motivation to keep updating). ![Star](./images/star.png 'Star') ### 2. Watch @@ -192,7 +192,7 @@ pipenv run service ### Method 3: GUI Software -1. Download [IPTV update software](https://github.com/Guovin/IPTV/releases), open the software, click update to complete the update. +1. Download [IPTV-API software](https://github.com/Guovin/iptv-api/releases), open the software, click update to complete the update. 2. Alternatively, run the following command in the project directory to open the GUI software: @@ -200,41 +200,41 @@ pipenv run service pipenv run ui ``` -![IPTV update software](./images/ui.png 'IPTV update software') +![IPTV-API software](./images/ui.png 'IPTV-API software') ### Method 4: Docker -- iptv (Full version): Higher performance requirements, slower update speed, high stability and success rate. Set open_driver = False to switch to the lite running mode (recommended for hotel sources, multicast sources, and online searches) -- iptv:lite (Condensed version): Lightweight, low performance requirements, fast update speed, stability uncertain (recommend using this version for the subscription source) +- iptv-api (Full version): Higher performance requirements, slower update speed, high stability and success rate. Set open_driver = False to switch to the lite running mode (recommended for hotel sources, multicast sources, and online searches) +- iptv-api:lite (Condensed version): Lightweight, low performance requirements, fast update speed, stability uncertain (recommend using this version for the subscription source) It's recommended to try each one and choose the version that suits you 1. Pull the image: -- iptv +- iptv-api ```bash -docker pull guovern/iptv:latest +docker pull guovern/iptv-api:latest ``` -- iptv:lite +- iptv-api:lite ```bash -docker pull guovern/iptv:lite +docker pull guovern/iptv-api:lite ``` 2. Run the container: -- iptv +- iptv-api ```bash -docker run -d -p 8000:8000 guovern/iptv +docker run -d -p 8000:8000 guovern/iptv-api ``` -- iptv:lite +- iptv-api:lite ```bash -docker run -d -p 8000:8000 guovern/iptv:lite +docker run -d -p 8000:8000 guovern/iptv-api:lite ``` Volume Mount Parameter (Optional): @@ -242,22 +242,24 @@ This allows synchronization of files between the host machine and the container. Taking the host path /etc/docker as an example: -- iptv: +- iptv-api: ```bash -docker run -v /etc/docker/config:/iptv/config -v /etc/docker/output:/iptv/output -d -p 8000:8000 guovern/iptv +docker run -v /etc/docker/config:/iptv-api/config -v /etc/docker/output:/iptv-api/output -d -p 8000:8000 guovern/iptv-api ``` -- iptv:lite: +- iptv-api:lite: ```bash -docker run -v /etc/docker/config:/iptv_lite/config -v /etc/docker/output:/iptv_lite/output -d -p 8000:8000 guovern/iptv:lite +docker run -v /etc/docker/config:/iptv-api-lite/config -v /etc/docker/output:/iptv-api-lite/output -d -p 8000:8000 guovern/iptv-api:lite ``` 3. Update results: - API address: ip:8000 -- API details: ip:8000/result +- M3u api:ip:8000/m3u +- Txt api:ip:8000/txt +- API content: ip:8000/content - Speed test log: ip:8000/log ### Update the File to the Repository(optional) diff --git a/entrypoint.sh b/entrypoint.sh index ed62456..9431678 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/bash -for file in /iptv_config/*; do +for file in /iptv-api-config/*; do filename=$(basename "$file") target_file="$APP_WORKDIR/config/$filename" if [ ! -e "$target_file" ]; then diff --git a/tkinter_ui/about.py b/tkinter_ui/about.py index 5f6f441..3b4f2da 100644 --- a/tkinter_ui/about.py +++ b/tkinter_ui/about.py @@ -44,14 +44,14 @@ class AboutUI: project_label.pack() project_link = tk.Label( project_row_column2, - text="https://github.com/Guovin/IPTV", + text="https://github.com/Guovin/iptv-api", fg="blue", cursor="hand2", ) project_link.pack() project_link.bind( "