alantang/tvbs
1
0
Fork 0
mirror of https://github.com/alantang1977/JunTV.git synced 2024-12-05 04:43:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

chore:iptv-api

Browse source
This commit is contained in:
guorong.zheng 2024-11-28 16:03:01 +08:00
parent 74ffedaa4c
commit f29d57c603
11 changed files with 129 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
CHANGELOG.md
View file

@ -2,26 +2,34 @@
## v1.5.4 ## v1.5.4
### 2024/11/25 ### 2024/11/28
- ⚠️ Python 升级至 3.13，该版本已不支持 Win7，若有需要请使用 v1.5.3 - ⚠️ Python 升级至 3.13，该版本已不支持 Win7，若有需要请使用 v1.5.3
- ⚠️ Github 仓库改名：IPTV，使用旧接口地址请及时更换新地址 - ⚠️ Github 仓库改名：iptv-api，使用旧接口地址请及时更换新地址
- ⚠️ Docker 镜像仓库改名：guovern/iptv（之前的 tv-driver 对应：guovern/iptv:latest，tv-requests 对应 guovern/iptv:lite） - ⚠️ 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） - ✨ 更换测速方法（yt-dlp），重构测速逻辑，提升准确性、稳定性与效率，减小接口切换延迟（#563）
- ✨ 新增支持 ARM v7（#562） - ✨ 新增支持 ARM v7（#562）
- ✨ 新增微信公众号关注途径（公众号搜索：Govin），关注公众号可订阅更新通知与使用技巧等文章推送 - ✨ 新增双结果 API 访问（ip/m3u, ip/txt）（#581）
- ✨ 新增启动 API 服务命令（pipenv run service）
- 🪄 优化 Docker 镜像大小 - 🪄 优化 Docker 镜像大小
- 🛠 调整默认更新频率为 12 小时一次
- 🐛 修复部分播放器不支持的信息间隔符（#581）
<details> <details>
<summary>English</summary> <summary>English</summary>
- ⚠️ Python has been upgraded to version 3.13, which no longer supports Win7. If needed, please use version v1.5.3. - ⚠️ 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 GitHub repository has been renamed to iptv-api. 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). - ⚠️ 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.
- ✨ Change the speed measurement method (yt-dlp), reconstruct the speed measurement logic, improve accuracy, stability, and efficiency, and reduce interface switching delay. (#563) - ✨ 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.
- ✨ Support for ARM v7 has been added. (#562) - ✨ 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).
- ✨ 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. - ✨ 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 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).
</details> </details>
@ -84,7 +92,7 @@
- ✨ 新增频道接口白名单：不参与测速，永远保留在结果最前面（#470） - ✨ 新增频道接口白名单：不参与测速，永远保留在结果最前面（#470）
使用方法： 使用方法：
1. 模板频道接口地址后添加$!即可实现（如：广东珠江,http://xxx.m3u$! ） 1. 模板频道接口地址后添加$!即可实现（如：广东珠江,http://xxx.m3u$! ）
2. 额外信息补充（如：广东珠江,http://xxx.m3u$!额外信息 ），更多接口白名单请至https://github.com/Guovin/IPTV/issues/514 讨论 2. 额外信息补充（如：广东珠江,http://xxx.m3u$!额外信息 ），更多接口白名单请至https://github.com/Guovin/iptv-api/issues/514 讨论
- ✨ 新增 🈳 无结果频道分类：无结果频道默认归类至该底部分类下（#473） - ✨ 新增 🈳 无结果频道分类：无结果频道默认归类至该底部分类下（#473）
- ✨ 接口地址增加来源类型说明 - ✨ 接口地址增加来源类型说明
- ✨ 默认模板增加广东民生（#481）、广州综合（#504） - ✨ 默认模板增加广东民生（#481）、广州综合（#504）
@ -103,7 +111,7 @@
- ✨ Added channel interface whitelist: Not participating in speed testing, always kept at the very front of the results. (#470) - ✨ Added channel interface whitelist: Not participating in speed testing, always kept at the very front of the results. (#470)
Usage: Usage:
1. Add $! after the template channel interface address (e.g., Guangdong Pearl River, http://xxx.m3u$!). 1. Add $! after the template channel interface address (e.g., Guangdong Pearl River, http://xxx.m3u$!).
2. Additional information can be appended (e.g., Guangdong Pearl River, http://xxx.m3u$! Additional Information) (#470). For more interface whitelists, please discuss at https://github.com/Guovin/IPTV/issues/514. 2. Additional information can be appended (e.g., Guangdong Pearl River, http://xxx.m3u$! Additional Information) (#470). For more interface whitelists, please discuss at https://github.com/Guovin/iptv-api/issues/514.
- ✨ Added 🈳 No Results Channel Category: Channels without results are categorized under this bottom category by default (#473). - ✨ Added 🈳 No Results Channel Category: Channels without results are categorized under this bottom category by default (#473).
- ✨ Interface addresses now include source type descriptions. - ✨ Interface addresses now include source type descriptions.
- ✨ Default templates now include Guangdong People's Livelihood (#481) and Guangzhou Comprehensive (#504). - ✨ Default templates now include Guangdong People's Livelihood (#481) and Guangzhou Comprehensive (#504).

10
Dockerfile
View file

@ -14,7 +14,7 @@ RUN PIPENV_VENV_IN_PROJECT=1 pipenv install --deploy\
FROM python:3.13-slim FROM python:3.13-slim
ARG APP_WORKDIR=/iptv ARG APP_WORKDIR=/iptv-api
ARG LITE=False ARG LITE=False
ENV APP_WORKDIR=$APP_WORKDIR ENV APP_WORKDIR=$APP_WORKDIR
@ -47,10 +47,10 @@ RUN (crontab -l ; echo "0 0,12 * * * python $APP_WORKDIR/main.py &";) | crontab
EXPOSE 8000 EXPOSE 8000
COPY entrypoint.sh /iptv_entrypoint.sh COPY entrypoint.sh /iptv-api-entrypoint.sh
COPY config /iptv_config COPY config /iptv-api-config
RUN chmod +x /iptv_entrypoint.sh RUN chmod +x /iptv-api-entrypoint.sh
ENTRYPOINT /iptv_entrypoint.sh ENTRYPOINT /iptv-api-entrypoint.sh

8
Pipfile
View file

@ -7,11 +7,11 @@ verify_ssl = true
dev = "python main.py" dev = "python main.py"
service = "python service/app.py" service = "python service/app.py"
ui = "python tkinter_ui/tkinter_ui.py" ui = "python tkinter_ui/tkinter_ui.py"
docker_run = "docker run -v ./config:/iptv/config -v ./output:/iptv/output -d -p 8000:8000 guovern/iptv" docker_run = "docker run -v ./config:/iptv-api/config -v ./output:/iptv-api/output -d -p 8000:8000 guovern/iptv-api"
docker_run_lite = "docker run -v ./config:/iptv_lite/config -v ./output:/iptv_lite/output -d -p 8000:8000 guovern/iptv:lite" docker_run_lite = "docker run -v ./config:/iptv-api-lite/config -v ./output:/iptv-api-lite/output -d -p 8000:8000 guovern/iptv-api:lite"
tkinter_build = "pyinstaller tkinter_ui/tkinter_ui.spec" tkinter_build = "pyinstaller tkinter_ui/tkinter_ui.spec"
docker_build = "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --build-arg APP_WORKDIR=/iptv -t guovern/iptv ." docker_build = "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --build-arg APP_WORKDIR=/iptv-api -t guovern/iptv-api ."
docker_build_lite = "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --build-arg APP_WORKDIR=/iptv_lite --build-arg LITE=True -t guovern/iptv:lite ." docker_build_lite = "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --build-arg APP_WORKDIR=/iptv-api-lite --build-arg LITE=True -t guovern/iptv-api:lite ."
[dev-packages] [dev-packages]
requests = "*" requests = "*"

56
README.md
View file

@ -1,6 +1,6 @@
<div align="center"> <div align="center">
<img src="./static/images/logo.png" alt="logo"/> <img src="./static/images/logo.png" alt="logo"/>
<h1 align="center">IPTV更新工具</h1> <h1 align="center">IPTV-API</h1>
</div> </div>
<div align="center">自定义频道，自动获取直播源接口，测速验效后生成可用的结果</div> <div align="center">自定义频道，自动获取直播源接口，测速验效后生成可用的结果</div>
@ -62,17 +62,17 @@
</details> </details>
<br> <br>
<p align="center"> <p align="center">
<a href="https://github.com/Guovin/IPTV/releases/latest"> <a href="https://github.com/Guovin/iptv-api/releases/latest">
<img src="https://img.shields.io/github/v/release/guovin/iptv" /> <img src="https://img.shields.io/github/v/release/guovin/iptv-api" />
</a> </a>
<a href="https://www.python.org/"> <a href="https://www.python.org/">
<img src="https://img.shields.io/badge/python-%20%3D%203.13-47c219" /> <img src="https://img.shields.io/badge/python-%20%3D%203.13-47c219" />
</a> </a>
<a href="https://github.com/Guovin/IPTV/releases/latest"> <a href="https://github.com/Guovin/iptv-api/releases/latest">
<img src="https://img.shields.io/github/downloads/guovin/iptv/total" /> <img src="https://img.shields.io/github/downloads/guovin/iptv-api/total" />
</a> </a>
<a href="https://hub.docker.com/repository/docker/guovern/iptv"> <a href="https://hub.docker.com/repository/docker/guovern/iptv-api">
<img src="https://img.shields.io/docker/pulls/guovern/iptv" /> <img src="https://img.shields.io/docker/pulls/guovern/iptv-api" />
</a> </a>
<a href="https://hub.docker.com/repository/docker/guovern/tv-requests"> <a href="https://hub.docker.com/repository/docker/guovern/tv-requests">
<img src="https://img.shields.io/docker/pulls/guovern/tv-requests?label=docker:requests" /> <img src="https://img.shields.io/docker/pulls/guovern/tv-requests?label=docker:requests" />
@ -80,8 +80,8 @@
<a href="https://hub.docker.com/repository/docker/guovern/tv-driver"> <a href="https://hub.docker.com/repository/docker/guovern/tv-driver">
<img src="https://img.shields.io/docker/pulls/guovern/tv-driver?label=docker:driver" /> <img src="https://img.shields.io/docker/pulls/guovern/tv-driver?label=docker:driver" />
</a> </a>
<a href="https://github.com/Guovin/IPTV/fork"> <a href="https://github.com/Guovin/iptv-api/fork">
<img src="https://img.shields.io/github/forks/guovin/iptv" /> <img src="https://img.shields.io/github/forks/guovin/iptv-api" />
</a> </a>
</p> </p>
@ -102,17 +102,17 @@
- 接口源： - 接口源：
```bash ```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 ```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 ```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 软件 ### 方式三：GUI 软件
1. 下载[IPTV 更新软件](https://github.com/Guovin/IPTV/releases)，打开软件，点击更新，即可完成更新 1. 下载[IPTV-API 更新软件](https://github.com/Guovin/iptv-api/releases)，打开软件，点击更新，即可完成更新
2. 或者在项目目录下运行以下命令，即可打开 GUI 软件： 2. 或者在项目目录下运行以下命令，即可打开 GUI 软件：
@ -157,39 +157,39 @@ pipenv run service
pipenv run ui pipenv run ui
``` ```
<img src="./docs/images/ui.png" alt="IPTV更新软件" title="IPTV更新软件" style="height:600px" /> <img src="./docs/images/ui.png" alt="IPTV-API更新软件" title="IPTV-API更新软件" style="height:600px" />
### 方式四：Docker ### 方式四：Docker
- iptv（完整版本）：性能要求较高，更新速度较慢，稳定性、成功率高；修改配置 open_driver = False 可切换到 Lite 版本运行模式（推荐酒店源、组播源、关键字搜索使用此版本） - iptv-api（完整版本）：性能要求较高，更新速度较慢，稳定性、成功率高；修改配置 open_driver = False 可切换到 Lite 版本运行模式（推荐酒店源、组播源、关键字搜索使用此版本）
- iptv:lite（精简版本）：轻量级，性能要求低，更新速度快，稳定性不确定（推荐订阅源使用此版本） - iptv-api:lite（精简版本）：轻量级，性能要求低，更新速度快，稳定性不确定（推荐订阅源使用此版本）
1. 拉取镜像： 1. 拉取镜像：
- iptv： - iptv-api：
```bash ```bash
docker pull guovern/iptv:latest docker pull guovern/iptv-api:latest
``` ```
- iptv:lite： - iptv-api:lite：
```bash ```bash
docker pull guovern/iptv:lite docker pull guovern/iptv-api:lite
``` ```
2. 运行容器： 2. 运行容器：
- iptv： - iptv-api：
```bash ```bash
docker run -d -p 8000:8000 guovern/iptv docker run -d -p 8000:8000 guovern/iptv-api
``` ```
- iptv:lite： - iptv-api:lite：
```bash ```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 为例： 以宿主机路径/etc/docker 为例：
- iptv： - iptv-api：
```bash ```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 ```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. 更新结果： 3. 更新结果：

56
README_en.md
View file

@ -1,6 +1,6 @@
<div align="center"> <div align="center">
<img src="./static/images/logo.png" alt="logo"/> <img src="./static/images/logo.png" alt="logo"/>
<h1 align="center">IPTV update tool</h1> <h1 align="center">IPTV-API</h1>
</div> </div>
<div align="center">Customize channels, automatically obtain live source interface, and generate usable results after speed test</div> <div align="center">Customize channels, automatically obtain live source interface, and generate usable results after speed test</div>
@ -62,17 +62,17 @@
</details> </details>
<br> <br>
<p align="center"> <p align="center">
<a href="https://github.com/Guovin/IPTV/releases/latest"> <a href="https://github.com/Guovin/iptv-api/releases/latest">
<img src="https://img.shields.io/github/v/release/guovin/iptv" /> <img src="https://img.shields.io/github/v/release/guovin/iptv-api" />
</a> </a>
<a href="https://www.python.org/"> <a href="https://www.python.org/">
<img src="https://img.shields.io/badge/python-%20%3D%203.13-47c219" /> <img src="https://img.shields.io/badge/python-%20%3D%203.13-47c219" />
</a> </a>
<a href="https://github.com/Guovin/IPTV/releases/latest"> <a href="https://github.com/Guovin/iptv-api/releases/latest">
<img src="https://img.shields.io/github/downloads/guovin/iptv/total" /> <img src="https://img.shields.io/github/downloads/guovin/iptv-api/total" />
</a> </a>
<a href="https://hub.docker.com/repository/docker/guovern/iptv"> <a href="https://hub.docker.com/repository/docker/guovern/iptv-api">
<img src="https://img.shields.io/docker/pulls/guovern/iptv" /> <img src="https://img.shields.io/docker/pulls/guovern/iptv-api" />
</a> </a>
<a href="https://hub.docker.com/repository/docker/guovern/tv-requests"> <a href="https://hub.docker.com/repository/docker/guovern/tv-requests">
<img src="https://img.shields.io/docker/pulls/guovern/tv-requests?label=docker:requests" /> <img src="https://img.shields.io/docker/pulls/guovern/tv-requests?label=docker:requests" />
@ -80,8 +80,8 @@
<a href="https://hub.docker.com/repository/docker/guovern/tv-driver"> <a href="https://hub.docker.com/repository/docker/guovern/tv-driver">
<img src="https://img.shields.io/docker/pulls/guovern/tv-driver?label=docker:driver" /> <img src="https://img.shields.io/docker/pulls/guovern/tv-driver?label=docker:driver" />
</a> </a>
<a href="https://github.com/Guovin/IPTV/fork"> <a href="https://github.com/Guovin/iptv-api/fork">
<img src="https://img.shields.io/github/forks/guovin/iptv" /> <img src="https://img.shields.io/github/forks/guovin/iptv-api" />
</a> </a>
</p> </p>
@ -102,17 +102,17 @@
- Interface source: - Interface source:
```bash ```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 ```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: - Data source:
```bash ```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 ## ⚙️ Config
@ -149,7 +149,7 @@ pipenv run service
### Method 3: GUI Software ### 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: 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 pipenv run ui
``` ```
<img src="./docs/images/ui.png" alt="IPTV update software" title="IPTV update software" style="height:600px" /> <img src="./docs/images/ui.png" alt="IPTV-API update software" title="IPTV-API update software" style="height:600px" />
### Method 4: Docker ### 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-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:lite (Condensed version): Lightweight, low performance requirements, fast update speed, stability uncertain (recommend using this version for the subscription source) - 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 It's recommended to try each one and choose the version that suits you
1. Pull the image: 1. Pull the image:
- iptv - iptv-api
```bash ```bash
docker pull guovern/iptv:latest docker pull guovern/iptv-api:latest
``` ```
- iptv:lite - iptv-api:lite
```bash ```bash
docker pull guovern/iptv:lite docker pull guovern/iptv-api:lite
``` ```
2. Run the container: 2. Run the container:
- iptv - iptv-api
```bash ```bash
docker run -d -p 8000:8000 guovern/iptv docker run -d -p 8000:8000 guovern/iptv-api
``` ```
- iptv:lite - iptv-api:lite
```bash ```bash
docker run -d -p 8000:8000 guovern/iptv:lite docker run -d -p 8000:8000 guovern/iptv-api:lite
``` ```
Volume Mount Parameter (Optional): 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: Taking the host path /etc/docker as an example:
- iptv： - iptv-api：
```bash ```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 ```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: 3. Update results:

38
docs/tutorial.md
View file

@ -23,7 +23,7 @@
### 1. Star ### 1. Star
打开 https://github.com/Guovin/IPTV ，点击 Star 收藏该项目（您的 Star 是我持续更新的动力） 打开 https://github.com/Guovin/iptv-api ，点击 Star 收藏该项目（您的 Star 是我持续更新的动力）
![Star](./images/star.png 'Star') ![Star](./images/star.png 'Star')
### 2. Watch ### 2. Watch
@ -195,7 +195,7 @@ pipenv run service
### 方式三：GUI 软件 ### 方式三：GUI 软件
1. 下载[IPTV 更新软件](https://github.com/Guovin/IPTV/releases)，打开软件，点击更新，即可完成更新 1. 下载[IPTV-API 更新软件](https://github.com/Guovin/iptv-api/releases)，打开软件，点击更新，即可完成更新
2. 或者在项目目录下运行以下命令，即可打开 GUI 软件： 2. 或者在项目目录下运行以下命令，即可打开 GUI 软件：
@ -203,39 +203,39 @@ pipenv run service
pipenv run ui pipenv run ui
``` ```
![IPTV 更新软件](./images/ui.png 'IPTV 更新软件') ![IPTV-API 更新软件](./images/ui.png 'IPTV-API 更新软件')
### 方式四：Docker ### 方式四：Docker
- iptv（完整版本）：性能要求较高，更新速度较慢，稳定性、成功率高；修改配置 open_driver = False 可切换到 Lite 版本运行模式（推荐酒店源、组播源、关键字搜索使用此版本） - iptv-api（完整版本）：性能要求较高，更新速度较慢，稳定性、成功率高；修改配置 open_driver = False 可切换到 Lite 版本运行模式（推荐酒店源、组播源、关键字搜索使用此版本）
- iptv:lite（精简版本）：轻量级，性能要求低，更新速度快，稳定性不确定（推荐订阅源使用此版本） - iptv-api:lite（精简版本）：轻量级，性能要求低，更新速度快，稳定性不确定（推荐订阅源使用此版本）
1. 拉取镜像： 1. 拉取镜像：
- iptv： - iptv-api：
```bash ```bash
docker pull guovern/iptv:latest docker pull guovern/iptv-api:latest
``` ```
- iptv:lite： - iptv-api:lite：
```bash ```bash
docker pull guovern/iptv:lite docker pull guovern/iptv-api:lite
``` ```
2. 运行容器： 2. 运行容器：
- iptv： - iptv-api：
```bash ```bash
docker run -d -p 8000:8000 guovern/iptv docker run -d -p 8000:8000 guovern/iptv-api
``` ```
- iptv:lite： - iptv-api:lite：
```bash ```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 为例： 以宿主机路径/etc/docker 为例：
- iptv： - iptv-api：
```bash ```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 ```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. 更新结果： 3. 更新结果：
- 接口地址：ip:8000 - 接口地址：ip:8000
- 接口详情：ip:8000/result - M3u 接口：ip:8000/m3u
- Txt 接口：ip:8000/txt
- 接口内容：ip:8000/content
- 测速日志：ip:8000/log - 测速日志：ip:8000/log
### 上传更新文件至仓库（可选） ### 上传更新文件至仓库（可选）

38
docs/tutorial_en.md
View file

@ -23,7 +23,7 @@ Since this project will continue to iterate and improve, if you want to get the
### 1. Star ### 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') ![Star](./images/star.png 'Star')
### 2. Watch ### 2. Watch
@ -192,7 +192,7 @@ pipenv run service
### Method 3: GUI Software ### 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: 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 pipenv run ui
``` ```
![IPTV update software](./images/ui.png 'IPTV update software') ![IPTV-API software](./images/ui.png 'IPTV-API software')
### Method 4: Docker ### 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-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:lite (Condensed version): Lightweight, low performance requirements, fast update speed, stability uncertain (recommend using this version for the subscription source) - 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 It's recommended to try each one and choose the version that suits you
1. Pull the image: 1. Pull the image:
- iptv - iptv-api
```bash ```bash
docker pull guovern/iptv:latest docker pull guovern/iptv-api:latest
``` ```
- iptv:lite - iptv-api:lite
```bash ```bash
docker pull guovern/iptv:lite docker pull guovern/iptv-api:lite
``` ```
2. Run the container: 2. Run the container:
- iptv - iptv-api
```bash ```bash
docker run -d -p 8000:8000 guovern/iptv docker run -d -p 8000:8000 guovern/iptv-api
``` ```
- iptv:lite - iptv-api:lite
```bash ```bash
docker run -d -p 8000:8000 guovern/iptv:lite docker run -d -p 8000:8000 guovern/iptv-api:lite
``` ```
Volume Mount Parameter (Optional): 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: Taking the host path /etc/docker as an example:
- iptv： - iptv-api：
```bash ```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 ```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: 3. Update results:
- API address: ip:8000 - 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 - Speed test log: ip:8000/log
### Update the File to the Repository(optional) ### Update the File to the Repository(optional)

2
entrypoint.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
for file in /iptv_config/*; do for file in /iptv-api-config/*; do
filename=$(basename "$file") filename=$(basename "$file")
target_file="$APP_WORKDIR/config/$filename" target_file="$APP_WORKDIR/config/$filename"
if [ ! -e "$target_file" ]; then if [ ! -e "$target_file" ]; then

4
tkinter_ui/about.py
View file

@ -44,14 +44,14 @@ class AboutUI:
project_label.pack() project_label.pack()
project_link = tk.Label( project_link = tk.Label(
project_row_column2, project_row_column2,
text="https://github.com/Guovin/IPTV", text="https://github.com/Guovin/iptv-api",
fg="blue", fg="blue",
cursor="hand2", cursor="hand2",
) )
project_link.pack() project_link.pack()
project_link.bind( project_link.bind(
"<Button-1>", "<Button-1>",
lambda e: webbrowser.open_new_tab("https://github.com/Guovin/IPTV"), lambda e: webbrowser.open_new_tab("https://github.com/Guovin/iptv-api"),
) )
disclaimer_label = tk.Label( disclaimer_label = tk.Label(

2
tkinter_ui/tkinter_ui.spec
View file

@ -45,7 +45,7 @@ exe = EXE(
a.binaries, a.binaries,
a.datas, a.datas,
[], [],
name='IPTV', name='IPTV-API',
debug=True, debug=True,
bootloader_ignore_signals=False, bootloader_ignore_signals=False,
strip=False, strip=False,

2
version.json
View file

@ -1,4 +1,4 @@
{ {
"version": "1.5.4", "version": "1.5.4",
"name": "IPTV" "name": "IPTV-API"
} }