diff --git a/AutoBangumi/app/env.py b/AutoBangumi/app/env.py index 527ef7c0..60bd9894 100644 --- a/AutoBangumi/app/env.py +++ b/AutoBangumi/app/env.py @@ -1,5 +1,6 @@ import os import time +from datetime import datetime class EnvInfo: @@ -34,7 +35,10 @@ class EnvInfo: get_rule_debug = True # Static ENV rule_url = "https://raw.githubusercontent.com/EstrellaXD/Bangumi_Auto_Collector/main/AutoBangumi/config/rule.json" - time_show_obj = time.strftime('%Y-%m-%d %X') + + def time_show_obj(self): + return time.strftime('%Y-%m-%d %X') + rule_name_re = r"\:|\/|\." diff --git a/DOC/部署说明.md b/DOC/部署说明.md new file mode 100644 index 00000000..8027b93a --- /dev/null +++ b/DOC/部署说明.md @@ -0,0 +1,22 @@ +# 部署说明 + +## Docker-Compose 一键部署 +现在提供了一键部署的 qBittorrent+AutoBangumi 的方法,可以使用 `ABQB.yml` 文件进行部署。 +1. 安装 Docker +2. 安装 Docker-Compose +3. 部署: +复制以下命令执行即可 +```bash +export DOWNLOAD_PATH=/path/downloads # 这里写你的下载文件保存的地方 +``` +```bash +docker volume create qb_config +``` +```bash +wget "ABQB.yml" +``` +```bash +docker-compose up ABQB.yml +``` +- 对于已经安装 qb 的朋友可以使用 `AB.yml` 进行部署,只需要更改变量为自己的变量即可。 + diff --git a/README.md b/README.md index dc8a5028..e067756c 100644 --- a/README.md +++ b/README.md @@ -33,9 +33,9 @@ ## 相关文档和群组 - [AutoBangumi V2 简易说明](https://www.craft.do/s/4viN6M3tBqigLp) +- [常见 bug 和解决方法](https://github.com/EstrellaXD/Auto_Bangumi/blob/main/DOC/常见错误解决.md) - 更新推送:[Telegram Channel](https://t.me/autobangumi_update) - Bug 反馈群:[Telegram](https://t.me/+yNisOnDGaX5jMTM9) -- [常见 bug 和解决方法](https://github.com/EstrellaXD/Auto_Bangumi/blob/main/DOC/常见错误解决.md) # 部署说明 1. 安装 qBittorrent: @@ -47,13 +47,42 @@ docker run -d \ --name=AutoBangumi \ -e DOWNLOAD_PATH=/path/downloads \ - -e RSS= \ + -e RSS= \ --network=host \ --dns=8.8.8.8 \ --restart unless-stopped \ estrellaxd/auto_bangumi:latest ``` -进阶部署 +**进阶部署:** + +Docker-Compose + +```yaml +version: '3.3' +services: + auto_bangumi: + container_name: AutoBangumi + environment: + - TZ=Asia/Shanghai + - TIME=1800 + - HOST=localhost:8080 + - USER=admin + - PASSWORD=adminadmin + - METHOD=pn + - GROUP_TAG=True + - NOT_CONTAIN=720 + - DOWNLOAD_PATH=/path/downloads + - RSS=YOUR_RSS_ADDRESS + network_mode: host + dns: + - 8.8.8.8 + - 223.5.5.5 + restart: unless-stopped + image: estrellaxd/auto_bangumi:latest +``` + +Docker-cli + ```dash docker run -d \ --name=AutoBangumi \ @@ -65,7 +94,8 @@ docker run -d \ -e METHOD=pn \ #optional -e GROUP_TAG=True \ #optional -e DOWNLOAD_PATH=/path/downloads \ - -e RSS= \ + -e NOT_COTAIN=720 + -e RSS= \ --network=host \ --dns=8.8.8.8 \ --restart unless-stopped \ diff --git a/docker-compose/AB.yml b/docker-compose/AB.yml new file mode 100644 index 00000000..c4f531fc --- /dev/null +++ b/docker-compose/AB.yml @@ -0,0 +1,21 @@ +version: '3.3' +services: + auto_bangumi: + container_name: AutoBangumi + environment: + - TZ=Asia/Shanghai + - TIME=1800 + - HOST=localhost:8080 + - USER=admin + - PASSWORD=adminadmin + - METHOD=pn + - GROUP_TAG=True + - NOT_CONTAIN=720 + - DOWNLOAD_PATH=${DOWNLOAD_PATH} + - RSS=${RSS} + network_mode: host + dns: + - 8.8.8.8 + - 223.5.5.5 + restart: unless-stopped + image: estrellaxd/auto_bangumi:latest \ No newline at end of file diff --git a/docker-compose/ABQB.yml b/docker-compose/ABQB.yml new file mode 100644 index 00000000..7e31f29d --- /dev/null +++ b/docker-compose/ABQB.yml @@ -0,0 +1,40 @@ +version: '3.3' +services: + qbittorrent: + container_name: qBittorrent + environment: + - TZ=Asia/Shanghai + - TemPath=/downloads + - SavePath=/downloads + - PGID=1000 + - PUID=1000 + - WEBUI_PORT=8080 + volumes: + - qb_config:/config # 填入实际地址 + - ${DOWNLOAD_PATH}:/downloads # 填入下载绝对路径 + ports: + - 8080:8080 + - 6881:6881 + - 6881:6881/udp + network_mode: bridge + restart: unless-stopped + image: lscr.io/linuxserver/qbittorrent:4.4.1 + auto_bangumi: + container_name: AutoBangumi + environment: + - TZ=Asia/Shanghai + - TIME=1800 + - HOST=localhost:8080 + - USER=admin + - PASSWORD=adminadmin + - METHOD=pn + - GROUP_TAG=True + - NOT_CONTAIN=720 + - DOWNLOAD_PATH=/downloads/Bangumi + - RSS=YOUR_RSS_ADDRESS + network_mode: host + dns: + - 8.8.8.8 + - 223.5.5.5 + restart: unless-stopped + image: estrellaxd/auto_bangumi:latest \ No newline at end of file