diff --git a/src/you_get/extractor.py b/src/you_get/extractor.py
index bd71717e72..dd800cd2eb 100644
--- a/src/you_get/extractor.py
+++ b/src/you_get/extractor.py
@@ -208,6 +208,8 @@ def download(self, **kwargs):
                                    key=lambda i: -self.dash_streams[i]['size'])
                     stream_id = itags[0]
                 else:
+                    if not self.streams_sorted:
+                        return
                     stream_id = self.streams_sorted[0]['id'] if 'id' in self.streams_sorted[0] else self.streams_sorted[0]['itag']
 
             if 'index' not in kwargs:
diff --git a/src/you_get/extractors/bilibili.py b/src/you_get/extractors/bilibili.py
index ea67f92fcf..75d15f6231 100644
--- a/src/you_get/extractors/bilibili.py
+++ b/src/you_get/extractors/bilibili.py
@@ -1,11 +1,14 @@
 #!/usr/bin/env python
+import hashlib
+import math
+import sys
+import urllib
+from collections import defaultdict
+from itertools import count
 
 from ..common import *
 from ..extractor import VideoExtractor
 
-import hashlib
-import math
-
 
 class Bilibili(VideoExtractor):
     name = "Bilibili"
@@ -62,8 +65,10 @@ def height_to_quality(height, qn):
     @staticmethod
     def bilibili_headers(referer=None, cookie=None):
         # a reasonable UA
-        ua = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36'
-        headers = {'Accept': '*/*', 'Accept-Language': 'en-US,en;q=0.5', 'User-Agent': ua}
+        # ua = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36'
+        # headers = {'Accept': '*/*', 'Accept-Language': 'en-US,en;q=0.5', 'User-Agent': ua}
+        ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36"
+        headers = {'User-Agent': ua}
         if referer is not None:
             headers.update({'Referer': referer})
         if cookie is not None:
@@ -72,7 +77,8 @@ def bilibili_headers(referer=None, cookie=None):
 
     @staticmethod
     def bilibili_api(avid, cid, qn=0):
-        return 'https://api.bilibili.com/x/player/playurl?avid=%s&cid=%s&qn=%s&type=&otype=json&fnver=0&fnval=4048&fourk=1' % (avid, cid, qn)
+        return 'https://api.bilibili.com/x/player/playurl?avid=%s&cid=%s&qn=%s&type=&otype=json&fnver=0&fnval=4048&fourk=1' % (
+            avid, cid, qn)
 
     @staticmethod
     def bilibili_audio_api(sid):
@@ -92,7 +98,8 @@ def bilibili_audio_menu_song_api(sid, ps=100):
 
     @staticmethod
     def bilibili_bangumi_api(avid, cid, ep_id, qn=0, fnval=16):
-        return 'https://api.bilibili.com/pgc/player/web/playurl?avid=%s&cid=%s&qn=%s&type=&otype=json&ep_id=%s&fnver=0&fnval=%s' % (avid, cid, qn, ep_id, fnval)
+        return 'https://api.bilibili.com/pgc/player/web/playurl?avid=%s&cid=%s&qn=%s&type=&otype=json&ep_id=%s&fnver=0&fnval=%s' % (
+            avid, cid, qn, ep_id, fnval)
 
     @staticmethod
     def bilibili_interface_api(cid, qn=0):
@@ -102,7 +109,6 @@ def bilibili_interface_api(cid, qn=0):
         chksum = hashlib.md5(bytes(params + sec, 'utf8')).hexdigest()
         return 'https://api.bilibili.com/x/player/wbi/v2?%s&sign=%s' % (params, chksum)
 
-
     @staticmethod
     def bilibili_live_api(cid):
         return 'https://api.live.bilibili.com/room/v1/Room/playUrl?cid=%s&quality=0&platform=web' % cid
@@ -115,25 +121,59 @@ def bilibili_live_room_info_api(room_id):
     def bilibili_live_room_init_api(room_id):
         return 'https://api.live.bilibili.com/room/v1/Room/room_init?id=%s' % room_id
 
+    # @staticmethod
+    # def bilibili_space_channel_api(mid, cid, pn=1, ps=100):
+    #     return 'https://api.bilibili.com/x/space/channel/video?mid=%s&cid=%s&pn=%s&ps=%s&order=0&jsonp=jsonp' % (mid, cid, pn, ps)
     @staticmethod
-    def bilibili_space_channel_api(mid, cid, pn=1, ps=100):
-        return 'https://api.bilibili.com/x/space/channel/video?mid=%s&cid=%s&pn=%s&ps=%s&order=0&jsonp=jsonp' % (mid, cid, pn, ps)
+    # 合集列表
+    def bilibili_space_seasons_series_list_api(mid, page_size=20, page_num=1):
+        return f"https://api.bilibili.com/x/polymer/web-space/seasons_series_list?mid={mid}&page_size={page_size}&page_num={page_num}&web_location=333.1387"
 
+    # @staticmethod
+    # def bilibili_space_collection_api(mid, cid, pn=1, ps=30):
+    #     return 'https://api.bilibili.com/x/polymer/space/seasons_archives_list?mid=%s&season_id=%s&sort_reverse=false&page_num=%s&page_size=%s' % (mid, cid, pn, ps)
     @staticmethod
-    def bilibili_space_collection_api(mid, cid, pn=1, ps=30):
-        return 'https://api.bilibili.com/x/polymer/space/seasons_archives_list?mid=%s&season_id=%s&sort_reverse=false&page_num=%s&page_size=%s' % (mid, cid, pn, ps)
+    # 合集详情
+    def bilibili_space_seasons_archives_list_api(mid, season_id, page_num=1, page_size=30):
+        return f"https://api.bilibili.com/x/polymer/web-space/seasons_archives_list?mid={mid}&season_id={season_id}&sort_reverse=false&page_size={page_size}&page_num={page_num}&web_location=333.1387"
 
     @staticmethod
+    # 视频列表详情
     def bilibili_series_archives_api(mid, sid, pn=1, ps=100):
-        return 'https://api.bilibili.com/x/series/archives?mid=%s&series_id=%s&pn=%s&ps=%s&only_normal=true&sort=asc&jsonp=jsonp' % (mid, sid, pn, ps)
+        return 'https://api.bilibili.com/x/series/archives?mid=%s&series_id=%s&pn=%s&ps=%s&only_normal=true&sort=asc&jsonp=jsonp' % (
+            mid, sid, pn, ps)
 
     @staticmethod
     def bilibili_space_favlist_api(fid, pn=1, ps=20):
-        return 'https://api.bilibili.com/x/v3/fav/resource/list?media_id=%s&pn=%s&ps=%s&order=mtime&type=0&tid=0&jsonp=jsonp' % (fid, pn, ps)
+        return 'https://api.bilibili.com/x/v3/fav/resource/list?media_id=%s&pn=%s&ps=%s&order=mtime&type=0&tid=0&jsonp=jsonp' % (
+            fid, pn, ps)
 
     @staticmethod
-    def bilibili_space_video_api(mid, pn=1, ps=50):
-        return "https://api.bilibili.com/x/space/arc/search?mid=%s&pn=%s&ps=%s&tid=0&keyword=&order=pubdate&jsonp=jsonp" % (mid, pn, ps)
+    # up 所有视频
+    def bilibili_space_video_api(mid, w_wedid=None, pn=1, ps=50):
+        paras = {
+            "pn": str(pn),
+            "ps": str(ps),
+            # "tid": "0",
+            # "special_type": "",
+            # "order": "pubdate",
+            "mid": mid,
+            # "index": "0",
+            # "keyword": "",
+            # "order_avoided": "true",
+            # "platform": "web",
+            # "web_location": "333.1387",
+            "dm_img_list": "[]",
+            "dm_img_str": "V2ViR0wgMS4wIChPcGVuR0wgRVMgMi4wIENocm9taXVtKQ",
+            "dm_cover_img_str": "QU5HTEUgKE5WSURJQSwgTlZJRElBIEdlRm9yY2UgR1RYIDE2NTAgKDB4MDAwMDFGOTkpIERpcmVjdDNEMTEgdnNfNV8wIHBzXzVfMCwgRDNEMTEpR29vZ2xlIEluYy4gKE5WSURJQS",
+            # "dm_img_inter": '{"ds":[{"t":1,"c":"","p":[],"s":[]}],"wh":[],"of":[]}',
+            # "w_webid": w_wedid,
+        }
+        w_rid, wts = Bilibili.get_w_rid(**paras)
+        paras.update({"w_rid": w_rid, "wts": wts})
+        paras_list = [f"{k}={v}" for k, v in paras.items()]
+        paras_str = "&".join(paras_list)
+        return f"https://api.bilibili.com/x/space/wbi/arc/search?{paras_str}"
 
     @staticmethod
     def bilibili_vc_api(video_id):
@@ -144,12 +184,39 @@ def bilibili_h_api(doc_id):
         return 'https://api.vc.bilibili.com/link_draw/v1/doc/detail?doc_id=%s' % doc_id
 
     @staticmethod
-    def url_size(url, faker=False, headers={},err_value=0):
+    def url_size(url, faker=False, headers={}, err_value=0):
         try:
-            return url_size(url,faker,headers)
+            return url_size(url, faker, headers)
         except:
             return err_value
 
+    @staticmethod
+    def get_w_webid(html_content):
+        innerText = r1(r'<script id="__RENDER_DATA__" type="application\/json">(.*?)<\/script>', html_content)
+        _render_data_json = json.loads(urllib.parse.unquote(innerText))
+        w_webid = _render_data_json['access_id']
+        return w_webid
+
+    @staticmethod
+    def get_w_rid(**kwargs):
+        # return (w_rid, wts)
+        i = "ea1db124af3c7062474693fa704f4ff8"
+        o = str(int(time.time()))
+        s = {**kwargs, "wts": o}
+
+        # 对键进行排序
+        a = sorted(s.keys())
+        u = []
+        l = re.compile(r"[!'()*]")
+        for key in a:
+            value = s[key]
+            if value and isinstance(value, str):
+                value = l.sub("", value)
+            if value is not None:
+                u.append(f"{urllib.parse.quote(key)}={urllib.parse.quote(str(value))}")
+        c = "&".join(u)
+        return hashlib.md5(bytes(c + i, 'utf8')).hexdigest(), o
+
     def prepare(self, **kwargs):
         self.stream_qualities = {s['quality']: s for s in self.stream_types}
         self.streams.clear()
@@ -159,35 +226,53 @@ def prepare(self, **kwargs):
             html_content = get_content(self.url, headers=self.bilibili_headers(referer=self.url))
         except:
             html_content = ''  # live always returns 400 (why?)
-        #self.title = match1(html_content,
+        # self.title = match1(html_content,
         #                    r'<h1 title="([^"]+)"')
 
+        self.url = self.url.strip("/")
+
         # redirect: watchlater
         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/%s?p=%s' % (avid, p)
-            html_content = get_content(self.url, headers=self.bilibili_headers())
 
         # redirect: bangumi/play/ss -> bangumi/play/ep
         # redirect: bangumi.bilibili.com/anime -> bangumi/play/ep
         elif re.match(r'https?://(www\.)?bilibili\.com/bangumi/play/ss(\d+)', self.url) or \
-             re.match(r'https?://bangumi\.bilibili\.com/anime/(\d+)/play', self.url):
+                re.match(r'https?://bangumi\.bilibili\.com/anime/(\d+)/play', self.url):
             initial_state_text = match1(html_content, r'__INITIAL_STATE__=(.*?);\(function\(\)')  # FIXME
             initial_state = json.loads(initial_state_text)
             ep_id = initial_state['epList'][0]['id']
             self.url = 'https://www.bilibili.com/bangumi/play/ep%s' % ep_id
-            html_content = get_content(self.url, headers=self.bilibili_headers(referer=self.url))
 
         # redirect: s
         elif re.match(r'https?://(www\.)?bilibili\.com/s/(.+)', self.url):
             self.url = 'https://www.bilibili.com/%s' % match1(self.url, r'/s/(.+)')
-            html_content = get_content(self.url, headers=self.bilibili_headers())
 
         # redirect: festival
         elif re.match(r'https?://(www\.)?bilibili\.com/festival/(.+)', self.url):
             self.url = 'https://www.bilibili.com/video/%s' % match1(self.url, r'bvid=([^&]+)')
-            html_content = get_content(self.url, headers=self.bilibili_headers())
+
+        # redirect: 视频列表详情 xxx/channel/seriesdetail/sid=xxx -> xxx/lists/xxx?type=series
+        if re.match(r'https?://space\.?bilibili\.com/(\d+)/channel/seriesdetail\?.*sid=(\d+)', self.url):
+            mid, sid = match1(self.url, r'com/(\d+)/channel', r'sid=(\d+)')
+            self.url = f'https://space.bilibili.com/{mid}/lists/{sid}?type=series'
+        # redirect: 合集详情 xxx/channel/collectiondetail/sid=xxx -> xxx/lists/xxx?type=season
+        elif re.match(r'https?://space\.?bilibili\.com/(\d+)/channel/collectiondetail\?.*sid=(\d+)', self.url):
+            mid, sid = match1(self.url, r'com/(\d+)/channel', r'sid=(\d+)')
+            self.url = f'https://space.bilibili.com/{mid}/lists/{sid}?type=season'
+        # redirect: 合集列表 xxx/channel/series -> xxx/lists
+        elif re.match(r'https?://(space\.)?bilibili\.com/(\d+)/channel/series$', self.url):
+            self.url = self.url.replace('channel/series', 'lists')
+        # redirect: up主所有视频 xxx/video -> xxx/upload/video
+        # redirect: up主主页               -> xxx/upload/video
+        elif re.match(r'https?://(space\.)?bilibili\.com/(\d+)/video', self.url) or \
+                re.match(r'https?://(space\.)?bilibili\.com/(\d+)$', self.url):
+            mid = match1(self.url, r'com/(\d+)')
+            self.url = f'https://space.bilibili.com/{mid}/upload/video'
+
+        html_content = get_content(self.url, headers=self.bilibili_headers(referer=self.url))
 
         # sort it out
         if re.match(r'https?://(www\.)?bilibili\.com/audio/au(\d+)', self.url):
@@ -245,7 +330,8 @@ def prepare(self, **kwargs):
 
                 # construct playinfos
                 avid = initial_state['aid']
-                cid = initial_state['videoData']['pages'][p - 1]['cid']  # use p-number, not initial_state['videoData']['cid']
+                cid = initial_state['videoData']['pages'][p - 1][
+                    'cid']  # use p-number, not initial_state['videoData']['cid']
             else:
                 # (festival video)
 
@@ -325,7 +411,9 @@ def prepare(self, **kwargs):
                                     audio_baseurl = audio['baseUrl']
                                     break
                             if not audio_size_cache.get(audio_quality, False):
-                                audio_size_cache[audio_quality] = self.url_size(audio_baseurl, headers=self.bilibili_headers(referer=self.url))
+                                audio_size_cache[audio_quality] = self.url_size(audio_baseurl,
+                                                                                headers=self.bilibili_headers(
+                                                                                    referer=self.url))
                             size += audio_size_cache[audio_quality]
 
                             self.dash_streams[format_id] = {'container': container, 'quality': desc,
@@ -335,7 +423,8 @@ def prepare(self, **kwargs):
                                                             'src': [[baseurl]], 'size': size}
 
             # get danmaku
-            self.danmaku = get_content('https://comment.bilibili.com/%s.xml' % cid, headers=self.bilibili_headers(referer=self.url))
+            self.danmaku = get_content('https://comment.bilibili.com/%s.xml' % cid,
+                                       headers=self.bilibili_headers(referer=self.url))
 
         # bangumi
         elif sort == 'bangumi':
@@ -414,7 +503,8 @@ def prepare(self, **kwargs):
                                                         'src': [[baseurl], [audio_baseurl]], 'size': size}
 
             # get danmaku
-            self.danmaku = get_content('https://comment.bilibili.com/%s.xml' % cid, headers=self.bilibili_headers(referer=self.url))
+            self.danmaku = get_content('https://comment.bilibili.com/%s.xml' % cid,
+                                       headers=self.bilibili_headers(referer=self.url))
 
         # vc video
         elif sort == 'vc':
@@ -507,9 +597,9 @@ def prepare(self, **kwargs):
             self.streams[container] = {'container': container,
                                        'size': size, 'src': urls}
 
-    def prepare_by_cid(self,avid,cid,title,html_content,playinfo,playinfo_,url):
-        #response for interaction video
-        #主要针对互动视频，使用cid而不是url来相互区分
+    def prepare_by_cid(self, avid, cid, title, html_content, playinfo, playinfo_, url):
+        # response for interaction video
+        # 主要针对互动视频，使用cid而不是url来相互区分
 
         self.stream_qualities = {s['quality']: s for s in self.stream_types}
         self.title = title
@@ -586,7 +676,8 @@ def prepare_by_cid(self,avid,cid,title,html_content,playinfo,playinfo_,url):
                                 break
                         if not audio_size_cache.get(audio_quality, False):
                             audio_size_cache[audio_quality] = self.url_size(audio_baseurl,
-                                                                            headers=self.bilibili_headers(referer=self.url))
+                                                                            headers=self.bilibili_headers(
+                                                                                referer=self.url))
                         size += audio_size_cache[audio_quality]
 
                         self.dash_streams[format_id] = {'container': container, 'quality': desc,
@@ -596,7 +687,8 @@ def prepare_by_cid(self,avid,cid,title,html_content,playinfo,playinfo_,url):
                                                         'src': [[baseurl]], 'size': size}
 
         # get danmaku
-        self.danmaku = get_content('https://comment.bilibili.com/%s.xml' % cid, headers=self.bilibili_headers(referer=self.url))
+        self.danmaku = get_content('https://comment.bilibili.com/%s.xml' % cid,
+                                   headers=self.bilibili_headers(referer=self.url))
 
     def extract(self, **kwargs):
         # set UA and referer for downloading
@@ -630,22 +722,24 @@ def download_playlist_by_url(self, url, **kwargs):
         elif match1(html_content, r'<meta property="og:url" content="(https://www.bilibili.com/bangumi/play/[^"]+)"'):
             sort = 'bangumi'
         elif re.match(r'https?://(www\.)?bilibili\.com/bangumi/media/md(\d+)', self.url) or \
-            re.match(r'https?://bangumi\.bilibili\.com/anime/(\d+)', self.url):
+                re.match(r'https?://bangumi\.bilibili\.com/anime/(\d+)', self.url):
             sort = 'bangumi_md'
         elif re.match(r'https?://(www\.)?bilibili\.com/video/(av(\d+)|bv(\S+)|BV(\S+))', self.url):
             sort = 'video'
-        elif re.match(r'https?://space\.?bilibili\.com/(\d+)/channel/detail\?.*cid=(\d+)', self.url):
-            sort = 'space_channel'
-        elif re.match(r'https?://space\.?bilibili\.com/(\d+)/channel/seriesdetail\?.*sid=(\d+)', self.url):
-            sort = 'space_channel_series'
-        elif re.match(r'https?://space\.?bilibili\.com/(\d+)/channel/collectiondetail\?.*sid=(\d+)', self.url):
-            sort = 'space_channel_collection'
+        elif re.match(r'https?://space\.?bilibili\.com/(\d+)/lists/(\d+)\?type=series', self.url):
+            sort = 'space_lists_series'  # 视频列表
+        elif re.match(r'https?://space\.?bilibili\.com/(\d+)/lists/(\d+)\?type=season', self.url):
+            sort = 'space_lists_season'  # 合集
+        elif re.match(r'https?://space\.?bilibili\.com/(\d+)/lists', self.url):
+            sort = 'space_lists'
+        elif re.match(r'https?://space\.?bilibili\.com/(\d+)/upload/video', self.url):
+            sort = 'space_video'  # 所有视频
         elif re.match(r'https?://space\.?bilibili\.com/(\d+)/favlist\?.*fid=(\d+)', self.url):
             sort = 'space_favlist'
-        elif re.match(r'https?://space\.?bilibili\.com/(\d+)/video', self.url):
-            sort = 'space_video'
         elif re.match(r'https?://(www\.)?bilibili\.com/audio/am(\d+)', self.url):
             sort = 'audio_menu'
+        elif re.match(r'https?://(www\.)?bilibili\.com/cheese/play/ss(\d+)', self.url):  # 课堂
+            sort = 'cheese'
         else:
             log.e('[Error] Unsupported URL pattern.')
             exit(1)
@@ -654,25 +748,32 @@ def download_playlist_by_url(self, url, **kwargs):
         if sort == 'video':
             initial_state_text = match1(html_content, r'__INITIAL_STATE__=(.*?);\(function\(\)')  # FIXME
             initial_state = json.loads(initial_state_text)
+            error = initial_state['error']
+            if error:
+                raise Exception
             aid = initial_state['videoData']['aid']
             pn = initial_state['videoData']['videos']
 
             if pn == len(initial_state['videoData']['pages']):
                 # non-interative video
                 for pi in range(1, pn + 1):
-                     purl = 'https://www.bilibili.com/video/av%s?p=%s' % (aid, pi)
-                     self.__class__().download_by_url(purl, **kwargs)
+                    purl = 'https://www.bilibili.com/video/av%s?p=%s' % (aid, pi)
+                    self.__class__().download_by_url(purl, **kwargs)
 
             else:
                 # interative video
                 search_node_list = []
                 download_cid_set = set([initial_state['videoData']['cid']])
                 params = {
-                        'id': 'cid:{}'.format(initial_state['videoData']['cid']),
-                        'aid': str(aid)
+                    'id': 'cid:{}'.format(initial_state['videoData']['cid']),
+                    'aid': str(aid)
                 }
-                urlcontent = get_content('https://api.bilibili.com/x/player.so?'+parse.urlencode(params), headers=self.bilibili_headers(referer='https://www.bilibili.com/video/av{}'.format(aid)))
-                graph_version = json.loads(urlcontent[urlcontent.find('<interaction>')+13:urlcontent.find('</interaction>')])['graph_version']
+                urlcontent = get_content('https://api.bilibili.com/x/player.so?' + parse.urlencode(params),
+                                         headers=self.bilibili_headers(
+                                             referer='https://www.bilibili.com/video/av{}'.format(aid)))
+                graph_version = \
+                    json.loads(urlcontent[urlcontent.find('<interaction>') + 13:urlcontent.find('</interaction>')])[
+                        'graph_version']
                 params = {
                     'aid': str(aid),
                     'graph_version': graph_version,
@@ -680,7 +781,8 @@ def download_playlist_by_url(self, url, **kwargs):
                     'portal': 0,
                     'screen': 0,
                 }
-                node_info = json.loads(get_content('https://api.bilibili.com/x/stein/nodeinfo?'+parse.urlencode(params)))
+                node_info = json.loads(
+                    get_content('https://api.bilibili.com/x/stein/nodeinfo?' + parse.urlencode(params)))
 
                 playinfo_text = match1(html_content, r'__playinfo__=(.*?)</script><script>')  # FIXME
                 playinfo = json.loads(playinfo_text) if playinfo_text else None
@@ -689,30 +791,42 @@ def download_playlist_by_url(self, url, **kwargs):
                 playinfo_text_ = match1(html_content_, r'__playinfo__=(.*?)</script><script>')  # FIXME
                 playinfo_ = json.loads(playinfo_text_) if playinfo_text_ else None
 
-                self.prepare_by_cid(aid, initial_state['videoData']['cid'], initial_state['videoData']['title'] + ('P{}. {}'.format(1, node_info['data']['title'])),html_content,playinfo,playinfo_,url)
+                self.prepare_by_cid(aid, initial_state['videoData']['cid'], initial_state['videoData']['title'] + (
+                    'P{}. {}'.format(1, node_info['data']['title'])), html_content, playinfo, playinfo_, url)
                 self.extract(**kwargs)
                 self.download(**kwargs)
                 for choice in node_info['data']['edges']['choices']:
                     search_node_list.append(choice['node_id'])
                     if not choice['cid'] in download_cid_set:
                         download_cid_set.add(choice['cid'])
-                        self.prepare_by_cid(aid,choice['cid'],initial_state['videoData']['title']+('P{}. {}'.format(len(download_cid_set),choice['option'])),html_content,playinfo,playinfo_,url)
+                        self.prepare_by_cid(aid, choice['cid'], initial_state['videoData']['title'] + (
+                            'P{}. {}'.format(len(download_cid_set), choice['option'])), html_content, playinfo,
+                                            playinfo_, url)
                         self.extract(**kwargs)
                         self.download(**kwargs)
-                while len(search_node_list)>0:
+                while len(search_node_list) > 0:
                     node_id = search_node_list.pop(0)
-                    params.update({'node_id':node_id})
-                    node_info = json.loads(get_content('https://api.bilibili.com/x/stein/nodeinfo?'+parse.urlencode(params)))
+                    params.update({'node_id': node_id})
+                    node_info = json.loads(
+                        get_content('https://api.bilibili.com/x/stein/nodeinfo?' + parse.urlencode(params)))
                     if node_info['data'].__contains__('edges'):
                         for choice in node_info['data']['edges']['choices']:
                             search_node_list.append(choice['node_id'])
                             if not choice['cid'] in download_cid_set:
                                 download_cid_set.add(choice['cid'])
-                                self.prepare_by_cid(aid,choice['cid'],initial_state['videoData']['title']+('P{}. {}'.format(len(download_cid_set),choice['option'])),html_content,playinfo,playinfo_,url)
+                                self.prepare_by_cid(aid, choice['cid'], initial_state['videoData']['title'] + (
+                                    'P{}. {}'.format(len(download_cid_set), choice['option'])), html_content, playinfo,
+                                                    playinfo_, url)
                                 try:
-                                    self.streams_sorted = [dict([('id', stream_type['id'])] + list(self.streams[stream_type['id']].items())) for stream_type in self.__class__.stream_types if stream_type['id'] in self.streams]
+                                    self.streams_sorted = [dict(
+                                        [('id', stream_type['id'])] + list(self.streams[stream_type['id']].items())) for
+                                        stream_type in self.__class__.stream_types if
+                                        stream_type['id'] in self.streams]
                                 except:
-                                    self.streams_sorted = [dict([('itag', stream_type['itag'])] + list(self.streams[stream_type['itag']].items())) for stream_type in self.__class__.stream_types if stream_type['itag'] in self.streams]
+                                    self.streams_sorted = [dict([('itag', stream_type['itag'])] + list(
+                                        self.streams[stream_type['itag']].items())) for stream_type in
+                                                           self.__class__.stream_types if
+                                                           stream_type['itag'] in self.streams]
                                 self.extract(**kwargs)
                                 self.download(**kwargs)
 
@@ -721,7 +835,8 @@ def download_playlist_by_url(self, url, **kwargs):
             initial_state = json.loads(initial_state_text)
             epn, i = len(initial_state['epList']), 0
             for ep in initial_state['epList']:
-                i += 1; log.w('Extracting %s of %s videos ...' % (i, epn))
+                i += 1;
+                log.w('Extracting %s of %s videos ...' % (i, epn))
                 ep_id = ep['id']
                 epurl = 'https://www.bilibili.com/bangumi/play/ep%s/' % ep_id
                 self.__class__().download_by_url(epurl, **kwargs)
@@ -731,123 +846,158 @@ def download_playlist_by_url(self, url, **kwargs):
             initial_state = json.loads(initial_state_text)
             epn, i = len(initial_state['mediaInfo']['episodes']), 0
             for ep in initial_state['mediaInfo']['episodes']:
-                i += 1; log.w('Extracting %s of %s videos ...' % (i, epn))
+                i += 1;
+                log.w('Extracting %s of %s videos ...' % (i, epn))
                 ep_id = ep['ep_id']
                 epurl = 'https://www.bilibili.com/bangumi/play/ep%s/' % ep_id
                 self.__class__().download_by_url(epurl, **kwargs)
 
-        elif sort == 'space_channel':
-            m = re.match(r'https?://space\.?bilibili\.com/(\d+)/channel/detail\?.*cid=(\d+)', self.url)
-            mid, cid = m.group(1), m.group(2)
-            api_url = self.bilibili_space_channel_api(mid, cid)
+        elif sort == 'space_favlist':
+            m = re.match(r'https?://space\.?bilibili\.com/(\d+)/favlist\?.*fid=(\d+)', self.url)
+            vmid, fid = m.group(1), m.group(2)
+            api_url = self.bilibili_space_favlist_api(fid)
             api_content = get_content(api_url, headers=self.bilibili_headers(referer=self.url))
-            channel_info = json.loads(api_content)
-            # TBD: channel of more than 100 videos
+            favlist_info = json.loads(api_content)
+            pc = favlist_info['data']['info']['media_count'] // len(favlist_info['data']['medias'])
+            if favlist_info['data']['info']['media_count'] % len(favlist_info['data']['medias']) != 0:
+                pc += 1
+            for pn in range(1, pc + 1):
+                log.w('Extracting %s of %s pages ...' % (pn, pc))
+                api_url = self.bilibili_space_favlist_api(fid, pn=pn)
+                api_content = get_content(api_url, headers=self.bilibili_headers(referer=self.url))
+                favlist_info = json.loads(api_content)
 
-            epn, i = len(channel_info['data']['list']['archives']), 0
-            for video in channel_info['data']['list']['archives']:
-                i += 1; log.w('Extracting %s of %s videos ...' % (i, epn))
-                url = 'https://www.bilibili.com/video/av%s' % video['aid']
-                self.__class__().download_playlist_by_url(url, **kwargs)
+                epn, i = len(favlist_info['data']['medias']), 0
+                for video in favlist_info['data']['medias']:
+                    i += 1;
+                    log.w('Extracting %s of %s videos ...' % (i, epn))
+                    url = 'https://www.bilibili.com/video/av%s' % video['id']
+                    self.__class__().download_playlist_by_url(url, **kwargs)
 
-        elif sort == 'space_channel_series':
-            m = re.match(r'https?://space\.?bilibili\.com/(\d+)/channel/seriesdetail\?.*sid=(\d+)', self.url)
-            mid, sid = m.group(1), m.group(2)
-            pn = 1
-            video_list = []
-            while True:
-                api_url = self.bilibili_series_archives_api(mid, sid, pn)
+        elif sort == 'space_lists':
+            mid = match1(self.url, r'com/(\d+)/lists')
+            seasons_list = []
+            series_list = []
+            for page_num in count(1):
+                api_url = self.bilibili_space_seasons_series_list_api(mid, page_num=page_num)
                 api_content = get_content(api_url, headers=self.bilibili_headers(referer=self.url))
-                archives_info = json.loads(api_content)
-                video_list.extend(archives_info['data']['archives'])
-                if len(video_list) < archives_info['data']['page']['total'] and len(archives_info['data']['archives']) > 0:
-                    pn += 1
-                else:
+                items_list = json.loads(api_content)['data']['items_lists']
+                total = items_list['page']['total']
+                seasons_list.extend(items_list['seasons_list'])
+                series_list.extend(items_list['series_list'])
+                if total <= len(seasons_list) + len(series_list):
                     break
 
-            epn, i = len(video_list), 0
-            for video in video_list:
-                i += 1; log.w('Extracting %s of %s videos ...' % (i, epn))
-                url = 'https://www.bilibili.com/video/av%s' % video['aid']
+            output_dir = kwargs['output_dir']
+            for season in seasons_list:
+                season_id = season['meta']['season_id']
+                name = season['meta']['name']
+                url = f'https://space.bilibili.com/{mid}/lists/{season_id}?type=season'
+                kwargs['output_dir'] = os.path.join(output_dir, name)
+                self.__class__().download_playlist_by_url(url, **kwargs)
+            for series in series_list:
+                series_id = series['meta']['series_id']
+                name = series['meta']['name']
+                url = f'https://space.bilibili.com/{mid}/lists/{series_id}?type=series'
+                kwargs['output_dir'] = os.path.join(output_dir, name)
                 self.__class__().download_playlist_by_url(url, **kwargs)
 
-        elif sort == 'space_channel_collection':
-            m = re.match(r'https?://space\.?bilibili\.com/(\d+)/channel/collectiondetail\?.*sid=(\d+)', self.url)
-            mid, sid = m.group(1), m.group(2)
+            # channel_info = json.loads(api_content)
+            # # TBD: channel of more than 100 videos
+            #
+            # epn, i = len(channel_info['data']['list']['archives']), 0
+            # for video in channel_info['data']['list']['archives']:
+            #     i += 1; log.w('Extracting %s of %s videos ...' % (i, epn))
+            #     url = 'https://www.bilibili.com/video/av%s' % video['aid']
+            #     self.__class__().download_playlist_by_url(url, **kwargs)
+
+        elif sort == 'space_lists_series' \
+                or sort == 'space_lists_season':
+            mid, sid, type_ = match1(self.url, r'com/(\d+)/lists', r'lists/(\d+)', r'type=(season|series)')
             pn = 1
             video_list = []
             while True:
-                api_url = self.bilibili_space_collection_api(mid, sid, pn)
+                if type_ == "series":
+                    api_url = self.bilibili_series_archives_api(mid, sid, pn)
+                else:
+                    api_url = self.bilibili_space_seasons_archives_list_api(mid, sid, pn)
                 api_content = get_content(api_url, headers=self.bilibili_headers(referer=self.url))
                 archives_info = json.loads(api_content)
                 video_list.extend(archives_info['data']['archives'])
-                if len(video_list) < archives_info['data']['page']['total'] and len(archives_info['data']['archives']) > 0:
+                if len(video_list) < archives_info['data']['page']['total'] and len(
+                        archives_info['data']['archives']) > 0:
                     pn += 1
                 else:
                     break
 
             epn, i = len(video_list), 0
             for video in video_list:
-                i += 1; log.w('Extracting %s of %s videos ...' % (i, epn))
+                i += 1;
+                log.w('Extracting %s of %s videos ...' % (i, epn))
                 url = 'https://www.bilibili.com/video/av%s' % video['aid']
-                self.__class__().download_playlist_by_url(url, **kwargs)
+                try:
+                    self.__class__().download_playlist_by_url(url, **kwargs)
+                except:
+                    title = video['title']
+                    log.e(f"{title} 下载出错啦！🤔")
+                    log.e(f"{title} 下载出错啦！🤔")
+                    log.e(f"{title} 下载出错啦！🤔")
 
-        elif sort == 'space_favlist':
-            m = re.match(r'https?://space\.?bilibili\.com/(\d+)/favlist\?.*fid=(\d+)', self.url)
-            vmid, fid = m.group(1), m.group(2)
-            api_url = self.bilibili_space_favlist_api(fid)
-            api_content = get_content(api_url, headers=self.bilibili_headers(referer=self.url))
-            favlist_info = json.loads(api_content)
-            pc = favlist_info['data']['info']['media_count'] // len(favlist_info['data']['medias'])
-            if favlist_info['data']['info']['media_count'] % len(favlist_info['data']['medias']) != 0:
-                pc += 1
-            for pn in range(1, pc + 1):
-                log.w('Extracting %s of %s pages ...' % (pn, pc))
-                api_url = self.bilibili_space_favlist_api(fid, pn=pn)
-                api_content = get_content(api_url, headers=self.bilibili_headers(referer=self.url))
-                favlist_info = json.loads(api_content)
 
-                epn, i = len(favlist_info['data']['medias']), 0
-                for video in favlist_info['data']['medias']:
-                    i += 1; log.w('Extracting %s of %s videos ...' % (i, epn))
-                    url = 'https://www.bilibili.com/video/av%s' % video['id']
-                    self.__class__().download_playlist_by_url(url, **kwargs)
 
         elif sort == 'space_video':
-            m = re.match(r'https?://space\.?bilibili\.com/(\d+)/video', self.url)
-            mid = m.group(1)
-            api_url = self.bilibili_space_video_api(mid)
-            api_content = get_content(api_url, headers=self.bilibili_headers())
-            videos_info = json.loads(api_content)
-            # pc = videos_info['data']['page']['count'] // videos_info['data']['page']['ps']
-            pc = math.ceil(videos_info['data']['page']['count'] / videos_info['data']['page']['ps'])
-
-            for pn in range(1, pc + 1):
+            if cookies is None:
+                log.e("You have to login cookies for downloading. (use --cookies to load cookies.txt.)")
+                log.e("你需要登录来下载up主的所有视频。（使用 --cookies 加载 cookies.txt）")
+                sys.exit(0)
+
+            mid = match1(self.url, r'com/(\d+)/upload')
+            # w_webid = self.get_w_webid(html_content)
+            videos_list = []
+            for pn in count(1):
                 api_url = self.bilibili_space_video_api(mid, pn=pn)
-                api_content = get_content(api_url, headers=self.bilibili_headers())
-                videos_info = json.loads(api_content)
-
-                epn, i = len(videos_info['data']['list']['vlist']), 0
-                for video in videos_info['data']['list']['vlist']:
-                    i += 1; log.w('Extracting %s of %s videos ...' % (i, epn))
-                    url = 'https://www.bilibili.com/video/av%s' % video['aid']
+                api_content = get_content(api_url, headers=self.bilibili_headers(referer=self.url))
+                api_content_json = json.loads(api_content)
+                vlist = api_content_json['data']['list']['vlist']
+                if len(vlist) == 0:
+                    break
+                videos_list.extend(vlist)
+
+            videos_nums = len(videos_list)
+            for i, video in enumerate(videos_list, 1):
+                log.w('Extracting %s of %s videos ...' % (i, videos_nums))
+                aid, jump_url = video['aid'], video['jump_url']
+                url = f'https://www.bilibili.com/video/av{aid}' if not jump_url else jump_url
+                try:
                     self.__class__().download_playlist_by_url(url, **kwargs)
+                except:
+                    title = video['title']
+                    log.e(f"{title} 下载出错啦！🤔")
+                    log.e(f"{title} 下载出错啦！🤔")
+                    log.e(f"{title} 下载出错啦！🤔")
 
         elif sort == 'audio_menu':
             m = re.match(r'https?://(?:www\.)?bilibili\.com/audio/am(\d+)', self.url)
             sid = m.group(1)
-            #api_url = self.bilibili_audio_menu_info_api(sid)
-            #api_content = get_content(api_url, headers=self.bilibili_headers())
-            #menu_info = json.loads(api_content)
+            # api_url = self.bilibili_audio_menu_info_api(sid)
+            # api_content = get_content(api_url, headers=self.bilibili_headers())
+            # menu_info = json.loads(api_content)
             api_url = self.bilibili_audio_menu_song_api(sid)
             api_content = get_content(api_url, headers=self.bilibili_headers())
             menusong_info = json.loads(api_content)
             epn, i = len(menusong_info['data']['data']), 0
             for song in menusong_info['data']['data']:
-                i += 1; log.w('Extracting %s of %s songs ...' % (i, epn))
+                i += 1;
+                log.w('Extracting %s of %s songs ...' % (i, epn))
                 url = 'https://www.bilibili.com/audio/au%s' % song['id']
                 self.__class__().download_by_url(url, **kwargs)
 
+        elif sort == "cheese":
+            # TODO
+            print()
+            log.w("you-get 还下载不了这种视频呢...You-Get can't download this kind of videos yet ...😗");
+            print()
+
 
 site = Bilibili()
 download = site.download_by_url
diff --git a/tests/test.py b/tests/test.py
index 2d220c6214..ac49bce23b 100644
--- a/tests/test.py
+++ b/tests/test.py
@@ -43,8 +43,24 @@ def test_magisto(self):
     def test_acfun(self):
         acfun.download('https://www.acfun.cn/v/ac44560432', info_only=True)
 
-    #def test_bilibili(self):
-        #bilibili.download('https://www.bilibili.com/video/BV1sL4y177sC', info_only=True)
+    def test_bilibili(self):
+        urls = [
+            'https://space.bilibili.com/357665034/',#主页
+            'https://space.bilibili.com/357665034/upload/video',#投稿视频
+            'https://space.bilibili.com/357665034/lists',#合集列表
+            'https://space.bilibili.com/357665034/lists/2663548?type=season',#合集
+            'https://space.bilibili.com/22179951/lists/297776?type=series',#视频列表
+            # redirect
+            'https://space.bilibili.com/8047632/video',
+            'https://space.bilibili.com/8047632/channel/series',
+            'https://space.bilibili.com/8047632/channel/collectiondetail?sid=1308605',
+            'https://space.bilibili.com/8047632/channel/seriesdetail?sid=60488',
+        ]
+        for i,url in enumerate(urls):
+            sys.argv = ['', url, '-o', f'E:/you-get-download/{i}', '--cookie', 'E:/cookies.txt', '--']
+            main()
+
+        # bilibili.download('https://space.bilibili.com/8047632/channel/series', info_only=True)
 
     #def test_soundcloud(self):
         ## single song
diff --git a/tests/test_bilibili.py b/tests/test_bilibili.py
new file mode 100644
index 0000000000..3efdd071d0
--- /dev/null
+++ b/tests/test_bilibili.py
@@ -0,0 +1,147 @@
+#!/usr/bin/env python
+
+import unittest
+from unittest.mock import patch
+import os
+import time
+from http import cookiejar
+
+from you_get.util import log, term
+from you_get.extractors import bilibili
+
+
+def load_cookies(cookiefile):
+    cookies = None
+    if cookiefile.endswith('.txt'):
+        # MozillaCookieJar treats prefix '#HttpOnly_' as comments incorrectly!
+        # do not use its load()
+        # see also:
+        #   - https://docs.python.org/3/library/http.cookiejar.html#http.cookiejar.MozillaCookieJar
+        #   - https://github.com/python/cpython/blob/4b219ce/Lib/http/cookiejar.py#L2014
+        #   - https://curl.haxx.se/libcurl/c/CURLOPT_COOKIELIST.html#EXAMPLE
+        # cookies = cookiejar.MozillaCookieJar(cookiefile)
+        # cookies.load()
+        from http.cookiejar import Cookie
+        cookies = cookiejar.MozillaCookieJar()
+        now = time.time()
+        ignore_discard, ignore_expires = False, False
+        with open(cookiefile, 'r', encoding='utf-8') as f:
+            for line in f:
+                # last field may be absent, so keep any trailing tab
+                if line.endswith("\n"): line = line[:-1]
+
+                # skip comments and blank lines XXX what is $ for?
+                if (line.strip().startswith(("#", "$")) or
+                        line.strip() == ""):
+                    if not line.strip().startswith('#HttpOnly_'):  # skip for #HttpOnly_
+                        continue
+
+                domain, domain_specified, path, secure, expires, name, value = \
+                    line.split("\t")
+                secure = (secure == "TRUE")
+                domain_specified = (domain_specified == "TRUE")
+                if name == "":
+                    # cookies.txt regards 'Set-Cookie: foo' as a cookie
+                    # with no name, whereas http.cookiejar regards it as a
+                    # cookie with no value.
+                    name = value
+                    value = None
+
+                initial_dot = domain.startswith(".")
+                if not line.strip().startswith('#HttpOnly_'):  # skip for #HttpOnly_
+                    assert domain_specified == initial_dot
+
+                discard = False
+                if expires == "":
+                    expires = None
+                    discard = True
+
+                # assume path_specified is false
+                c = Cookie(0, name, value,
+                           None, False,
+                           domain, domain_specified, initial_dot,
+                           path, False,
+                           secure,
+                           expires,
+                           discard,
+                           None,
+                           None,
+                           {})
+                if not ignore_discard and c.discard:
+                    continue
+                if not ignore_expires and c.is_expired(now):
+                    continue
+                cookies.set_cookie(c)
+
+    elif cookiefile.endswith(('.sqlite', '.sqlite3')):
+        import sqlite3, shutil, tempfile
+        temp_dir = tempfile.gettempdir()
+        temp_cookiefile = os.path.join(temp_dir, 'temp_cookiefile.sqlite')
+        shutil.copy2(cookiefile, temp_cookiefile)
+
+        cookies = cookiejar.MozillaCookieJar()
+        con = sqlite3.connect(temp_cookiefile)
+        cur = con.cursor()
+        cur.execute("""SELECT host, path, isSecure, expiry, name, value
+        FROM moz_cookies""")
+        for item in cur.fetchall():
+            c = cookiejar.Cookie(
+                0, item[4], item[5], None, False, item[0],
+                item[0].startswith('.'), item[0].startswith('.'),
+                item[1], False, item[2], item[3], item[3] == '', None,
+                None, {},
+            )
+            cookies.set_cookie(c)
+
+    else:
+        log.e('[error] unsupported cookies format')
+        # TODO: Chromium Cookies
+        # SELECT host_key, path, secure, expires_utc, name, encrypted_value
+        # FROM cookies
+        # http://n8henrie.com/2013/11/use-chromes-cookies-for-easier-downloading-with-python-requests/
+
+    return cookies
+
+
+class Bilibiliests(unittest.TestCase):
+    @patch('you_get.extractors.bilibili.cookies', None)
+    def test_space_upload_video_no_cookie(self):
+        bilibili.download('https://space.bilibili.com/357665034/', info_only=True)
+
+    @patch('you_get.extractors.bilibili.cookies', load_cookies('E:/cookies.txt'))
+    @patch('you_get.common.cookies', load_cookies('E:/cookies.txt'))
+    def test_space_home(self):
+        bilibili.download('https://space.bilibili.com/8047632/', info_only=True)
+
+    @patch('you_get.extractors.bilibili.cookies', load_cookies('E:/cookies.txt'))
+    @patch('you_get.common.cookies', load_cookies('E:/cookies.txt'))
+    def test_space_upload_video(self):
+        bilibili.download('https://space.bilibili.com/357665034/upload/video', info_only=True)
+
+    @patch('you_get.extractors.bilibili.cookies', load_cookies('E:/cookies.txt'))
+    @patch('you_get.common.cookies', load_cookies('E:/cookies.txt'))
+    def test_space_upload_video_old(self):
+        # bilibili.download('https://space.bilibili.com/8047632/video', info_only=True)
+        bilibili.download('https://space.bilibili.com/347691691/video', info_only=True)
+
+    def Stest_space_lists(self):
+        bilibili.download('https://space.bilibili.com/254463269/lists', info_only=True, output_dir='.')
+
+    def test_space_lists_old(self):
+        bilibili.download('https://space.bilibili.com/254463269/channel/series', info_only=True, output_dir='.')
+
+    def test_space_lists_series(self):
+        bilibili.download('https://space.bilibili.com/8047632/lists/60489?type=series', info_only=True)
+
+    def test_space_lists_series_old(self):
+        bilibili.download('https://space.bilibili.com/8047632/channel/seriesdetail?sid=60489', info_only=True)
+
+    def test_space_lists_season(self):
+        bilibili.download('https://space.bilibili.com/8047632/lists/1308605?type=season', info_only=True)
+
+    def test_space_lists_season_old(self):
+        bilibili.download('https://space.bilibili.com/8047632/channel/collectiondetail?sid=1308605', info_only=True)
+
+
+if __name__ == '__main__':
+    unittest.main()