1- import json
21import os
32from datetime import datetime
43from typing import List , Tuple
1312
1413class Bilibili :
1514 @network_retry
16- async def get_dynamic (self , dynamic_id : int ):
15+ async def get_dynamic (self , dynamic_id : str ):
1716 """Get dynamic data from API."""
1817 api = (
19- "https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr"
20- "/get_dynamic_detail?dynamic_id=" + str (dynamic_id )
18+ f"https://api.bilibili.com/x/polymer/web-dynamic/v1/detail?id={ dynamic_id }
2119 )
2220 async with Request () as request :
2321 async with request .get (api ) as response :
2422 response .raise_for_status ()
2523 data = await response .json ()
2624 # For some IDs, the API returns code 0 but empty content
27- if data ["code" ] == 500207 or (
28- data ["code" ] == 0 and "card" not in data ["data" ]
29- ):
25+ code = data .get ("code" )
26+ if code == 4101147 or "data" not in data :
3027 raise NazurinError ("Dynamic not found" )
31- if data ["code" ] != 0 :
32- raise NazurinError ("Failed to get dynamic: " + data ["message" ])
33- card = data ["data" ]["card" ]
34- desc = card ["desc" ]
35- card = json .loads (card ["card" ])
36- card .update (
37- {
38- "type" : desc ["type" ],
39- "dynamic_id_str" : desc ["dynamic_id_str" ],
40- "view" : desc ["view" ],
41- "repost" : desc ["repost" ],
42- "comment" : desc ["comment" ],
43- "like" : desc ["like" ],
44- "timestamp" : desc ["timestamp" ],
45- }
46- )
47- if "vip" in card ["user" ]:
48- del card ["user" ]["vip" ]
49- return card
28+ if code != 0 :
29+ raise NazurinError (
30+ f"Failed to get dynamic: code = { code } { data ['message' ]}
31+ )
32+ item = data ["data" ]["item" ]
33+ return self .cleanup_item (item )
5034
51- async def fetch (self , dynamic_id : int ) -> Illust :
35+ async def fetch (self , dynamic_id : str ) -> Illust :
5236 """Fetch images and detail."""
53- card = await self .get_dynamic (dynamic_id )
54- imgs = self .get_images (card )
55- caption = self .build_caption (card )
56- caption ["url" ] = f"https://t .bilibili.com/{ dynamic_id }
57- return Illust (imgs , caption , card )
37+ item = await self .get_dynamic (dynamic_id )
38+ imgs = self .get_images (item )
39+ caption = self .build_caption (item )
40+ caption ["url" ] = f"https://www .bilibili.com/opus /{ dynamic_id }
41+ return Illust (imgs , caption , item )
5842
5943 @staticmethod
60- def get_images (card ) -> List [Image ]:
44+ def get_images (item : dict ) -> List [Image ]:
6145 """Get all images in a dynamic card."""
62- if "item" not in card or "pictures" not in card ["item" ]:
46+ major_items = item ["modules" ]["module_dynamic" ]["major" ]
47+ if not major_items :
48+ raise NazurinError ("No image found" )
49+ draw_items = major_items ["draw" ]["items" ]
50+ if not len (draw_items ):
6351 raise NazurinError ("No image found" )
64- pics = card ["item" ]["pictures" ]
6552 imgs = []
66- for index , pic in enumerate (pics ):
67- url = pic ["img_src " ]
68- destination , filename = Bilibili .get_storage_dest (card , pic , index )
69- size = pic ["img_size " ] * 1024 # size returned by API is in KB
53+ for index , pic in enumerate (draw_items ):
54+ url = pic ["src " ]
55+ destination , filename = Bilibili .get_storage_dest (item , pic , index )
56+ size = pic ["size " ] * 1024 # size returned by API is in KB
7057 # Sometimes it returns a wrong size that is not in whole bytes,
7158 # in this case we just ignore it.
7259 if size % 1 != 0 :
@@ -78,30 +65,32 @@ def get_images(card) -> List[Image]:
7865 destination ,
7966 url + "@518w.jpg" ,
8067 size ,
81- pic ["img_width " ],
82- pic ["img_height " ],
68+ pic ["width " ],
69+ pic ["height " ],
8370 )
8471 )
8572 return imgs
8673
8774 @staticmethod
88- def get_storage_dest (card : dict , pic : dict , index : int = 0 ) -> Tuple [str , str ]:
75+ def get_storage_dest (item : dict , pic : dict , index : int = 0 ) -> Tuple [str , str ]:
8976 """
9077 Format destination and filename.
9178 """
9279
93- url = pic ["img_src " ]
94- timestamp = datetime .fromtimestamp (card [ "timestamp "
80+ url = pic ["src " ]
81+ timestamp = datetime .fromtimestamp (item [ "modules" ][ "module_author" ][ "pub_ts "
9582 basename = os .path .basename (url )
9683 filename , extension = os .path .splitext (basename )
84+ user = item ["modules" ]["module_author" ]
9785 context = {
98- ** card ,
86+ "user" : user ,
9987 # Original filename, without extension
10088 "filename" : filename ,
10189 # Image index
10290 "index" : index ,
10391 "timestamp" : timestamp ,
10492 "extension" : extension ,
93+ "id_str" : item ["id_str" ],
10594 "pic" : pic ,
10695 }
10796 return (
@@ -110,7 +99,21 @@ def get_storage_dest(card: dict, pic: dict, index: int = 0) -> Tuple[str, str]:
11099 )
111100
112101 @staticmethod
113- def build_caption (card ) -> Caption :
102+ def build_caption (item : dict ) -> Caption :
103+ modules = item ["modules" ]
114104 return Caption (
115- {"author" : card ["user" ]["name" ], "content" : card ["item" ]["description" ]}
105+ {
106+ "author" : "#" + modules ["module_author" ]["name" ],
107+ "content" : modules ["module_dynamic" ]["desc" ]["text" ],
108+ }
116109 )
110+
111+ @staticmethod
112+ def cleanup_item (item : dict ) -> dict :
113+ try :
114+ del item ["basic" ]
115+ del item ["modules" ]["module_author" ]["avatar" ]
116+ del item ["modules" ]["module_more" ]
117+ except KeyError :
118+ pass
119+ return item
0 commit comments