From 4ac6d4a9fc96b5bcc4b2a9dd254be5eadd874ffa Mon Sep 17 00:00:00 2001
From: Kataick <24969684+Kataick@users.noreply.github.com>
Date: Sat, 10 Jun 2023 15:08:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=96=E9=9F=B3=E5=A2=9E=E5=8A=A0=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E9=94=99=E8=AF=AF=E6=97=B6=E7=9A=84=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E7=BA=AF=E6=95=B0=E5=AD=97=E6=88=BF?=
 =?UTF-8?q?=E9=97=B4=E5=8F=B7=E7=9A=84=E4=BB=A3=E7=A0=81=20(#466)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 修复抖音可能导致进程卡死问题

* 修复抖音获取串流导致进程卡死(return false版)

* 抖音增加获取错误时提示

* fix

* 优化抖音纯数字房间号的代码
---
 biliup/plugins/douyin.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/biliup/plugins/douyin.py b/biliup/plugins/douyin.py
index 35e0ac4..ed59f4e 100644
--- a/biliup/plugins/douyin.py
+++ b/biliup/plugins/douyin.py
@@ -24,7 +24,7 @@ class Douyin(DownloadBase):
         if len(self.url.split("live.douyin.com/")) < 2:
             if len(self.url.split("douyin.com/user/")) < 2:
                 logger.debug("直播间地址错误")
-                return False 
+                return False
             else:
                 mainPage=requests.get(self.url, headers=headers).text\
                 .split('<script id="RENDER_DATA" type="application/json">')[1].split('</script>')[0]
@@ -33,15 +33,15 @@ class Douyin(DownloadBase):
                 rid = rex.findall(txt)[0]
         else:
             #判断是否为纯数字房间号
-            if (re.search(r"/(\d+)/?$", self.url)):
-                self.url = re.sub(r"(\d+)/?$", r"+\1", self.url) if re.search(r"/(\d+)/?$", self.url) else self.url
             rid = self.url.split("live.douyin.com/")[1]
+            rid = '+{}'.format(rid) if rid.isdigit() else rid
         try:
             r1 = requests.get('https://live.douyin.com/' + rid, headers=headers).text \
                 .split('<script id="RENDER_DATA" type="application/json">')[1].split('</script>')[0]
             r2 = urllib.request.unquote(r1)
             room_info = json.loads(r2)['app']['initialState']['roomStore']['roomInfo']['room']
         except:
+            logger.warning("抖音：" + self.url + "：获取地址错误，本次跳过")
             return False
         if room_info.get('status') != 2:
             logger.debug("主播未开播")