From f12943aa00a5c59fe183eb9b59f6f1928d26a230 Mon Sep 17 00:00:00 2001
From: e <1160590998@qq.com>
Date: Sat, 28 Mar 2020 18:15:22 +0800
Subject: [PATCH] add support for BVID in watchlater mode.

---
 src/you_get/extractors/bilibili.py |  6 +++---
 tests/test.py                      | 10 +++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/you_get/extractors/bilibili.py b/src/you_get/extractors/bilibili.py
index 045853f3..c669415d 100644
--- a/src/you_get/extractors/bilibili.py
+++ b/src/you_get/extractors/bilibili.py
@@ -132,10 +132,10 @@ class Bilibili(VideoExtractor):
         #                    r'<h1 title="([^"]+)"')
 
         # redirect: watchlater
-        if re.match(r'https?://(www\.)?bilibili\.com/watchlater/#/av(\d+)', self.url):
-            avid = match1(self.url, r'/av(\d+)')
+        if re.match(r'https?://(www\.)?bilibili\.com/watchlater/#/(av(\d+)|BV(\S+)/?)', self.url):
+            avid = match1(self.url, r'/(av\d+)') or match1(self.url, r'/(BV\w+)')
             p = int(match1(self.url, r'/p(\d+)') or '1')
-            self.url = 'https://www.bilibili.com/video/av%s?p=%s' % (avid, p)
+            self.url = 'https://www.bilibili.com/video/%s?p=%s' % (avid, p)
             html_content = get_content(self.url, headers=self.bilibili_headers())
 
         # redirect: bangumi/play/ss -> bangumi/play/ep
diff --git a/tests/test.py b/tests/test.py
index b5454fbf..6fd3db6c 100644
--- a/tests/test.py
+++ b/tests/test.py
@@ -7,7 +7,8 @@ from you_get.extractors import (
     magisto,
     youtube,
     missevan,
-    acfun
+    acfun,
+    bilibili
 )
 
 
@@ -37,5 +38,12 @@ class YouGetTests(unittest.TestCase):
     def test_acfun(self):
         acfun.download('https://www.acfun.cn/v/ac11701912', info_only=True)
 
+    def test_bilibil(self):
+        bilibili.download(
+            "https://www.bilibili.com/watchlater/#/BV1PE411q7mZ/p6", info_only=True
+        )
+        bilibili.download(
+            "https://www.bilibili.com/watchlater/#/av74906671/p6", info_only=True
+        )
 if __name__ == '__main__':
     unittest.main()