From ed4dca3aa9c76cc684aa3b53ec9bf402808fcf37 Mon Sep 17 00:00:00 2001
From: ForgQi <34411314+ForgQi@users.noreply.github.com>
Date: Sun, 3 Jul 2022 00:48:55 +0800
Subject: [PATCH] feat: add delay option

---
 biliup/__init__.py        | 2 +-
 biliup/engine/download.py | 6 ++++++
 config(demo).yaml         | 3 ++-
 config.toml               | 3 ++-
 pyproject.toml            | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/biliup/__init__.py b/biliup/__init__.py
index bbaacce..1aaa41d 100644
--- a/biliup/__init__.py
+++ b/biliup/__init__.py
@@ -1,7 +1,7 @@
 import logging
 import sys
 
-__version__ = "0.2.19"
+__version__ = "0.3.0"
 
 LOG_CONF = {
     'version': 1,
diff --git a/biliup/engine/download.py b/biliup/engine/download.py
index a43f5b7..58d9817 100644
--- a/biliup/engine/download.py
+++ b/biliup/engine/download.py
@@ -100,6 +100,12 @@ class DownloadBase:
             finally:
                 self.close()
             if ret is False:
+                if config.get('delay'):
+                    time.sleep(config.get('delay'))
+                    logger.info(f"delay: {config.get('delay')}")
+                    if self.check_stream():
+                        time.sleep(5)
+                        continue
                 break
             elif ret == 1 or self.downloader == 'stream-gears':
                 time.sleep(45)
diff --git a/config(demo).yaml b/config(demo).yaml
index 1fc2a97..3517081 100644
--- a/config(demo).yaml
+++ b/config(demo).yaml
@@ -73,7 +73,8 @@ streamers:
         opt_args: # ffmpeg参数
             - '-ss' # 跳过开始的16秒
             - '00:00:16'
-
+# 检测到主播下播后延迟再次检测，单位：秒，避免特殊情况提早启动上传导致漏录
+delay: 10
 # 检测间隔时间，单位：秒
 event_loop_interval: 40
 # 相同平台检测间隔，单位：秒。不同平台的链接是并发的，不受此参数影响
diff --git a/config.toml b/config.toml
index 7d64a49..43204e7 100644
--- a/config.toml
+++ b/config.toml
@@ -22,7 +22,8 @@ filtering_threshold = 20 # 小于此大小的视频文件将会被过滤删除
 #douyin_cookie = '__ac_nonce=123456; __ac_signature=123456;'
 # Netscape 格式的 Cookies 文本路径
 #youtube_cookie = 'cookiejar.txt'
-
+# 检测到主播下播后延迟再次检测，单位：秒，避免特殊情况提早启动上传导致漏录
+delay = 10
 # 检测间隔时间，单位：秒
 event_loop_interval = 40
 # 相同平台检测间隔，单位：秒。不同平台的链接是并发的，不受此参数影响
diff --git a/pyproject.toml b/pyproject.toml
index 7786057..ba70239 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,7 +10,7 @@ keywords = ["bilibili douyu huya"]
 urls = {Homepage = "https://github.com/ForgQi/bilibiliupload"}
 requires-python = ">= 3.7"
 dependencies = [
-    "stream-gears >= 0.1.7",
+    "stream-gears >= 0.1.8",
     "psutil >= 5.4.6",
     "yt_dlp >= 2022.3.8.2",
     "Pillow >= 5.2.0",