fix README.md

jxxghp · Sep 9, 2023 · 65d202e · 65d202e
1 parent 4373c05
commit 65d202e
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -51,7 +51,8 @@ docker pull jxxghp/moviepilot:latest
 - **PGID**：运行程序用户的`gid`，默认`0`
 - **UMASK**：掩码权限，默认`000`，可以考虑设置为`022`
 - **MOVIEPILOT_AUTO_UPDATE**：重启更新，`true`/`false`，默认`true` **注意：如果出现网络问题可以配置`PROXY_HOST`，具体看下方`PROXY_HOST`解释**
-- **NGINX_PORT：** WEB服务端口，默认`3000`，可自行修改，但不能为`3001`
+- **NGINX_PORT：** WEB服务端口，默认`3000`，可自行修改，不能与API服务端口冲突
+- **PORT：** API服务端口，默认`3001`，可自行修改，不能与WEB服务端口冲突
 - **SUPERUSER：** 超级管理员用户名，默认`admin`，安装后使用该用户登录后台管理界面
 - **SUPERUSER_PASSWORD：** 超级管理员初始密码，默认`password`，建议修改为复杂密码
 - **API_TOKEN：** API密钥，默认`moviepilot`，在媒体服务器Webhook、微信回调等地址配置中需要加上`?token=`该值，建议修改为复杂字符串

diff --git a/app/plugins/brushflow/__init__.py b/app/plugins/brushflow/__init__.py
@@ -1617,14 +1617,67 @@ def __get_torrent_info(self, torrent: Any) -> dict:
         date_now = int(time.time())
         # QB
         if self._downloader == "qbittorrent":
+            """
+            {
+              "added_on": 1693359031,
+              "amount_left": 0,
+              "auto_tmm": false,
+              "availability": -1,
+              "category": "tJU",
+              "completed": 67759229411,
+              "completion_on": 1693609350,
+              "content_path": "/mnt/sdb/qb/downloads/Steel.Division.2.Men.of.Steel-RUNE",
+              "dl_limit": -1,
+              "dlspeed": 0,
+              "download_path": "",
+              "downloaded": 67767365851,
+              "downloaded_session": 0,
+              "eta": 8640000,
+              "f_l_piece_prio": false,
+              "force_start": false,
+              "hash": "116bc6f3efa6f3b21a06ce8f1cc71875",
+              "infohash_v1": "116bc6f306c40e072bde8f1cc71875",
+              "infohash_v2": "",
+              "last_activity": 1693609350,
+              "magnet_uri": "magnet:?xt=",
+              "max_ratio": -1,
+              "max_seeding_time": -1,
+              "name": "Steel.Division.2.Men.of.Steel-RUNE",
+              "num_complete": 1,
+              "num_incomplete": 0,
+              "num_leechs": 0,
+              "num_seeds": 0,
+              "priority": 0,
+              "progress": 1,
+              "ratio": 0,
+              "ratio_limit": -2,
+              "save_path": "/mnt/sdb/qb/downloads",
+              "seeding_time": 615035,
+              "seeding_time_limit": -2,
+              "seen_complete": 1693609350,
+              "seq_dl": false,
+              "size": 67759229411,
+              "state": "stalledUP",
+              "super_seeding": false,
+              "tags": "",
+              "time_active": 865354,
+              "total_size": 67759229411,
+              "tracker": "https://tracker",
+              "trackers_count": 2,
+              "up_limit": -1,
+              "uploaded": 0,
+              "uploaded_session": 0,
+              "upspeed": 0
+            }
+            """
             # ID
             torrent_id = torrent.get("hash")
             # 标题
             torrent_title = torrent.get("name")
             # 下载时间
             dltime = date_now - torrent.get("added_on") if torrent.get("added_on") else 0
             # 做种时间
-            seeding_time = date_now - torrent.get("completion_on") if torrent.get("completion_on") else 0
+            seeding_time = date_now - (torrent.get("completion_on") if torrent.get("completion_on") else 0)
             # 分享率
             ratio = torrent.get("ratio") or 0
             # 上传量
@@ -1635,7 +1688,7 @@ def __get_torrent_info(self, torrent: Any) -> dict:
             else:
                 avg_upspeed = uploaded
             # 已未活动 秒
-            iatime = date_now - torrent.get("last_activity") if torrent.get("last_activity") else 0
+            iatime = date_now - (torrent.get("last_activity") if torrent.get("last_activity") else 0)
             # 下载量
             downloaded = torrent.get("downloaded")
             # 种子大小