From e9d1c9eadb0e776ea2dfba4bb5dbc52832107c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=B4=80=E1=B4=8D=E1=B4=9B=E1=B4=8F=E1=B4=80=E1=B4=87?=
 =?UTF-8?q?=CA=80?= <amtoaer@gmail.com>
Date: Fri, 30 May 2025 14:28:14 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E6=84=8F=E4=B9=89=E7=9A=84=20bvid=20=E8=BD=AC=20aid=20?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=20(#344)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crates/bili_sync/src/bilibili/video.rs | 46 ++++----------------------
 1 file changed, 6 insertions(+), 40 deletions(-)

diff --git a/crates/bili_sync/src/bilibili/video.rs b/crates/bili_sync/src/bilibili/video.rs
index a99b3c2..6a05763 100644
--- a/crates/bili_sync/src/bilibili/video.rs
+++ b/crates/bili_sync/src/bilibili/video.rs
@@ -11,18 +11,8 @@ use crate::bilibili::danmaku::{DanmakuElem, DanmakuWriter, DmSegMobileReply};
 use crate::bilibili::subtitle::{SubTitle, SubTitleBody, SubTitleInfo, SubTitlesInfo};
 use crate::bilibili::{MIXIN_KEY, Validate, VideoInfo};
 
-static MASK_CODE: u64 = 2251799813685247;
-static XOR_CODE: u64 = 23442827791579;
-static BASE: u64 = 58;
-static DATA: &[char] = &[
-    'F', 'c', 'w', 'A', 'P', 'N', 'K', 'T', 'M', 'u', 'g', '3', 'G', 'V', '5', 'L', 'j', '7', 'E', 'J', 'n', 'H', 'p',
-    'W', 's', 'x', '4', 't', 'b', '8', 'h', 'a', 'Y', 'e', 'v', 'i', 'q', 'B', 'z', '6', 'r', 'k', 'C', 'y', '1', '2',
-    'm', 'U', 'S', 'D', 'Q', 'X', '9', 'R', 'd', 'o', 'Z', 'f',
-];
-
 pub struct Video<'a> {
     client: &'a BiliClient,
-    pub aid: String,
     pub bvid: String,
 }
 
@@ -59,8 +49,7 @@ pub struct Dimension {
 
 impl<'a> Video<'a> {
     pub fn new(client: &'a BiliClient, bvid: String) -> Self {
-        let aid = bvid_to_aid(&bvid).to_string();
-        Self { client, aid, bvid }
+        Self { client, bvid }
     }
 
     /// 直接调用视频信息接口获取详细的视频信息，视频信息中包含了视频的分页信息
@@ -69,7 +58,7 @@ impl<'a> Video<'a> {
             .client
             .request(Method::GET, "https://api.bilibili.com/x/web-interface/view")
             .await
-            .query(&[("aid", &self.aid), ("bvid", &self.bvid)])
+            .query(&[("bvid", &self.bvid)])
             .send()
             .await?
             .error_for_status()?
@@ -85,7 +74,7 @@ impl<'a> Video<'a> {
             .client
             .request(Method::GET, "https://api.bilibili.com/x/player/pagelist")
             .await
-            .query(&[("aid", &self.aid), ("bvid", &self.bvid)])
+            .query(&[("bvid", &self.bvid)])
             .send()
             .await?
             .error_for_status()?
@@ -100,7 +89,7 @@ impl<'a> Video<'a> {
             .client
             .request(Method::GET, "https://api.bilibili.com/x/web-interface/view/detail/tag")
             .await
-            .query(&[("aid", &self.aid), ("bvid", &self.bvid)])
+            .query(&[("bvid", &self.bvid)])
             .send()
             .await?
             .error_for_status()?
@@ -148,7 +137,7 @@ impl<'a> Video<'a> {
             .await
             .query(&encoded_query(
                 vec![
-                    ("avid", self.aid.as_str()),
+                    ("bvid", self.bvid.as_str()),
                     ("cid", page.cid.to_string().as_str()),
                     ("qn", "127"),
                     ("otype", "json"),
@@ -172,7 +161,7 @@ impl<'a> Video<'a> {
             .request(Method::GET, "https://api.bilibili.com/x/player/wbi/v2")
             .await
             .query(&encoded_query(
-                vec![("cid", &page.cid.to_string()), ("bvid", &self.bvid), ("aid", &self.aid)],
+                vec![("cid", &page.cid.to_string()), ("bvid", &self.bvid)],
                 MIXIN_KEY.load().as_deref(),
             ))
             .send()
@@ -206,26 +195,3 @@ impl<'a> Video<'a> {
         Ok(SubTitle { lan: info.lan, body })
     }
 }
-
-fn bvid_to_aid(bvid: &str) -> u64 {
-    let mut bvid = bvid.chars().collect::<Vec<_>>();
-    (bvid[3], bvid[9]) = (bvid[9], bvid[3]);
-    (bvid[4], bvid[7]) = (bvid[7], bvid[4]);
-    let mut tmp = 0u64;
-    for char in bvid.into_iter().skip(3) {
-        let idx = DATA.iter().position(|&x| x == char).expect("invalid bvid");
-        tmp = tmp * BASE + idx as u64;
-    }
-    (tmp & MASK_CODE) ^ XOR_CODE
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_bvid_to_aid() {
-        assert_eq!(bvid_to_aid("BV1Tr421n746"), 1401752220u64);
-        assert_eq!(bvid_to_aid("BV1sH4y1s7fe"), 1051892992u64);
-    }
-}