From c06b13fea7eff72554d64daa1f3aa42ea1868a8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Memory=E4=B8=B6C=E5=93=A5?= <554233472@qq.com>
Date: Fri, 3 Dec 2021 23:55:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DB=E7=AB=99=E7=9B=B4=E6=92=AD?=
 =?UTF-8?q?=E5=BD=95=E5=88=B6=E8=B7=B3=E5=B8=A7=E4=B8=8E=E6=96=97=E9=B1=BC?=
 =?UTF-8?q?=E9=A2=91=E7=B9=81=E8=BE=93=E5=87=BA=E9=94=99=E8=AF=AF=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E9=97=AE=E9=A2=98=20(#73)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 新增配置斗鱼虎牙线路参数

* 现在，可以在配置文件中设置CDN

* 现在，可以在配置文件中设置CDN

* 修复斗鱼频繁输出错误日志的问题

* 新增platform参数值自定义

* 新增B站直播录制flv与m3u8线路自定义
---
 biliup/plugins/bilibili.py |  4 +++-
 biliup/plugins/douyu.py    | 10 ++++++----
 config(demo).yaml          |  2 ++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/biliup/plugins/bilibili.py b/biliup/plugins/bilibili.py
index ffab9f2..d29445f 100644
--- a/biliup/plugins/bilibili.py
+++ b/biliup/plugins/bilibili.py
@@ -3,6 +3,7 @@ import random
 import requests
 
 from . import match1, logger
+from .. import config
 from ..engine.decorators import Plugin
 from ..engine.download import DownloadBase
 
@@ -34,10 +35,11 @@ class Bilibili(DownloadBase):
         #     artist = api3_data['data']['info']['uname']
         #     title = '{} - {}'.format(title, artist)
         # logger.debug(title)
+        biliplatform = config.get('biliplatform') if config.get('biliplatform') else 'web'
         params = {
             #'https_url_req': 1,
             'cid': vid,
-            'platform': 'h5',
+            'platform': biliplatform,
             'qn': 10000,
             #'ptype': '16'
         }
diff --git a/biliup/plugins/douyu.py b/biliup/plugins/douyu.py
index c8b3a5b..e01a0b1 100644
--- a/biliup/plugins/douyu.py
+++ b/biliup/plugins/douyu.py
@@ -2,7 +2,6 @@ import platform
 import json
 from urllib.parse import urlencode
 
-from ykdl.common import url_to_module
 from ykdl.extractors.douyu.util import ub98484234
 from ykdl.util.jsengine import chakra_available, quickjs_available, external_interpreter
 from ykdl.util.html import get_content
@@ -52,6 +51,9 @@ class Douyu(DownloadBase):
         html_content = get_content('https://www.douyu.com/lapi/live/getH5Play/{}'.format(self.vid), data=data)
         live_data = json.loads(html_content)
         live_data = live_data["data"]
-        real_url = '{}/{}'.format(live_data['rtmp_url'], live_data['rtmp_live'])
-        self.raw_stream_url = real_url
-        return True
+        try:
+            real_url = '{}/{}'.format(live_data['rtmp_url'], live_data['rtmp_live'])
+            self.raw_stream_url = real_url
+            return True
+        except TypeError:
+            return False
diff --git a/config(demo).yaml b/config(demo).yaml
index 3b9ce83..30b8d5c 100644
--- a/config(demo).yaml
+++ b/config(demo).yaml
@@ -25,6 +25,8 @@ file_size: 2621440000
 # 如遇到斗鱼录制卡顿可以尝试切换线路，tct-h5（备用线路5），ali-h5（备用线路6），akm-h5（主线路1）
 #huyacdn: AL
 # 如遇到虎牙录制卡顿可以尝试切换线路，AL（阿里），BD（百度），TX（腾讯）
+#biliplatform: web
+# 如遇到哔哩哔哩录制跳帧可以尝试修改platform值，web（flv），h5（m3u8）
 
 streamers:
     星际2Stats拔本神族天梯第一视角: # 最小配置示例