From 0cadbefcd7b39f2b6a5b090ddeeac3e20b467f64 Mon Sep 17 00:00:00 2001
From: Cololi <i@cololi.moe>
Date: Mon, 23 Mar 2020 16:16:38 +0800
Subject: [PATCH 1/3] Add bilibili new url

---
 youtube_dl/extractor/bilibili.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py
index 80bd696e2..6bbfb989f 100644
--- a/youtube_dl/extractor/bilibili.py
+++ b/youtube_dl/extractor/bilibili.py
@@ -24,7 +24,7 @@ from ..utils import (
 
 
 class BiliBiliIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.|bangumi\.|)bilibili\.(?:tv|com)/(?:video/av|anime/(?P<anime_id>\d+)/play#)(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.|bangumi\.|)bilibili\.(?:tv|com)/(?:video/av|BV|anime/(?P<anime_id>\d+)/play#)(?P<id>\d+)'
 
     _TESTS = [{
         'url': 'http://www.bilibili.tv/video/av1074402/',
@@ -41,6 +41,21 @@ class BiliBiliIE(InfoExtractor):
             'uploader': '菊子桑',
             'uploader_id': '156160',
         },
+    },{
+        'url': 'https://www.bilibili.com/video/BV11x411K7CN/',
+        'md5': '5f7d29e1a2872f3df0cf76b1f87d3788',
+        'info_dict': {
+            'id': '1074402',
+            'ext': 'flv',
+            'title': '【金坷垃】金泡沫',
+            'description': 'md5:ce18c2a2d2193f0df2917d270f2e5923',
+            'duration': 308.067,
+            'timestamp': 1398012678,
+            'upload_date': '20140420',
+            'thumbnail': r're:^https?://.+\.jpg',
+            'uploader': '菊子桑',
+            'uploader_id': '156160',
+        },
     }, {
         # Tested in BiliBiliBangumiIE
         'url': 'http://bangumi.bilibili.com/anime/1869/play#40062',

From 7b7a2a249a0f40d1d51a0a42e259bf17b9020418 Mon Sep 17 00:00:00 2001
From: Cololi <i@cololi.moe>
Date: Mon, 23 Mar 2020 16:52:01 +0800
Subject: [PATCH 2/3] Add bilibili new url fix bug

---
 youtube_dl/extractor/bilibili.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py
index 6bbfb989f..7139ba0fd 100644
--- a/youtube_dl/extractor/bilibili.py
+++ b/youtube_dl/extractor/bilibili.py
@@ -24,7 +24,7 @@ from ..utils import (
 
 
 class BiliBiliIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.|bangumi\.|)bilibili\.(?:tv|com)/(?:video/av|BV|anime/(?P<anime_id>\d+)/play#)(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.|bangumi\.|)bilibili\.(?:tv|com)/(?:video/av|video/BV|anime/(?P<anime_id>\d+)/play#)(?P<id>\w+)'
 
     _TESTS = [{
         'url': 'http://www.bilibili.tv/video/av1074402/',

From 1ae50d9c7444acbd98be66b058218e323b6fcb04 Mon Sep 17 00:00:00 2001
From: Cololi <i@cololi.moe>
Date: Mon, 23 Mar 2020 17:23:14 +0800
Subject: [PATCH 3/3] improve code for flake8

---
 youtube_dl/extractor/bilibili.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py
index 7139ba0fd..b852ecb97 100644
--- a/youtube_dl/extractor/bilibili.py
+++ b/youtube_dl/extractor/bilibili.py
@@ -41,7 +41,7 @@ class BiliBiliIE(InfoExtractor):
             'uploader': '菊子桑',
             'uploader_id': '156160',
         },
-    },{
+    }, {
         'url': 'https://www.bilibili.com/video/BV11x411K7CN/',
         'md5': '5f7d29e1a2872f3df0cf76b1f87d3788',
         'info_dict': {