chore: bump bms-rs to 0.10.1

Author: MiyakoMeow

Cargo.lock

@@ -19,7 +19,7 @@ regex = "1.11.2"
 once_cell = "1.20.0"
 
 # BMS
-bms-rs = "0.9.0" 
+bms-rs = { version = "0.10.1", features = ["bmson"] }
 encoding_rs = "0.8.35"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.142"

Cargo.toml

@@ -41,16 +41,21 @@ async fn read_bms_file(file: &Path) -> io::Result<Vec<u8>> {
 }
 
 /// 仅负责解析 BMS 字节（CPU 密集，单线程执行）
-fn parse_bms_bytes(bytes: &[u8]) -> BmsOutput {
+fn parse_bms_bytes(bytes: &[u8]) -> io::Result<BmsOutput> {
     let (str, _encoding, _has_error) = encoding_rs::SHIFT_JIS.decode(bytes);
-    parse_bms(&str)
+    let config = bms_rs::bms::ParseConfig::<(), (), ()>::default()
+        .key_mapper::<bms_rs::bms::command::channel::mapper::KeyLayoutBeat>()
+        .prompter(bms_rs::bms::parse::prompt::AlwaysWarnAndUseNewer)
+        .rng(bms_rs::bms::rng::JavaRandom::default())
+        .use_common();
+    parse_bms(&str, config).map_err(io::Error::other)
 }
 
 /// 包装：读取 + 解析
 pub async fn parse_bms_file(file: &Path) -> io::Result<BmsOutput> {
     let bytes = read_bms_file(file).await?;
     // 解析阶段保持单线程（不在此处并发）
-    Ok(parse_bms_bytes(&bytes))
+    parse_bms_bytes(&bytes)
 }
 
 /// 仅负责读取 BMSON 文件（异步 IO）
@@ -135,10 +140,7 @@ pub async fn get_dir_bms_list(dir: &Path) -> io::Result<Vec<BmsOutput>> {
         // Stage 2: 解析（CPU 密集，受限并发）
         .map(|pending| async move {
             let parsed: io::Result<BmsOutput> = match pending {
-                PendingParse::Bms(bytes) => {
-                    let r = unblock(move || parse_bms_bytes(&bytes)).await;
-                    Ok(r)
-                }
+                PendingParse::Bms(bytes) => unblock(move || parse_bms_bytes(&bytes)).await,
                 PendingParse::Bmson(bytes) => unblock(move || parse_bmson_bytes(&bytes)).await,
             };
             if let Ok(out) = parsed {
@@ -172,13 +174,13 @@ pub async fn get_dir_bms_info(dir: &Path) -> io::Result<Option<Bms>> {
     // Header
     let titles: Vec<_> = bms_list
         .iter()
-        .filter_map(|BmsOutput { bms, .. }| bms.header.title.as_deref())
+        .filter_map(|BmsOutput { bms, .. }| bms.music_info.title.as_deref())
         .collect();
     let title = extract_work_name(titles.as_slice(), true, &[]);
-    bms.header.title = Some(title);
+    bms.music_info.title = Some(title);
     let artists: Vec<_> = bms_list
         .iter()
-        .filter_map(|BmsOutput { bms, .. }| bms.header.artist.as_deref())
+        .filter_map(|BmsOutput { bms, .. }| bms.music_info.artist.as_deref())
         .collect();
     let artist = extract_work_name(
         artists.as_slice(),
@@ -187,27 +189,26 @@ pub async fn get_dir_bms_info(dir: &Path) -> io::Result<Option<Bms>> {
             "/", ":", "：", "-", "obj", "obj.", "Obj", "Obj.", "OBJ", "OBJ.",
         ],
     );
-    bms.header.artist = Some(artist);
+    bms.music_info.artist = Some(artist);
     let genres: Vec<_> = bms_list
         .iter()
-        .filter_map(|BmsOutput { bms, .. }| bms.header.genre.as_deref())
+        .filter_map(|BmsOutput { bms, .. }| bms.music_info.genre.as_deref())
         .collect();
     let genre = extract_work_name(genres.as_slice(), true, &[]);
-    bms.header.genre = Some(genre);
+    bms.music_info.genre = Some(genre);
     // Defines
-    bms.notes.wav_files = bms_list
+    bms.wav.wav_files = bms_list
         .iter()
         .fold(HashMap::new(), |mut map, BmsOutput { bms, .. }| {
-            map.extend(bms.notes.wav_files.clone());
+            map.extend(bms.wav.wav_files.clone());
+            map
+        });
+    bms.bmp.bmp_files = bms_list
+        .iter()
+        .fold(HashMap::new(), |mut map, BmsOutput { bms, .. }| {
+            map.extend(bms.bmp.bmp_files.clone());
             map
         });
-    bms.graphics.bmp_files =
-        bms_list
-            .iter()
-            .fold(HashMap::new(), |mut map, BmsOutput { bms, .. }| {
-                map.extend(bms.graphics.bmp_files.clone());
-                map
-            });
     Ok(Some(bms))
 }
 

cli/src/bms.rs

@@ -75,9 +75,9 @@ pub async fn generate_work_info_table(root: &Path) -> io::Result<()> {
             let Some(info) = info else { continue };
             let row = (row + 1) as u32;
             sheet.write_number(row, 0, id as f64, None)?;
-            sheet.write_string(row, 1, &info.header.title.unwrap_or_default(), None)?;
-            sheet.write_string(row, 2, &info.header.artist.unwrap_or_default(), None)?;
-            sheet.write_string(row, 3, &info.header.genre.unwrap_or_default(), None)?;
+            sheet.write_string(row, 1, &info.music_info.title.unwrap_or_default(), None)?;
+            sheet.write_string(row, 2, &info.music_info.artist.unwrap_or_default(), None)?;
+            sheet.write_string(row, 3, &info.music_info.genre.unwrap_or_default(), None)?;
         }
 
         workbook.close()?;

cli/src/options/root_event.rs

@@ -92,8 +92,14 @@ pub async fn set_name_by_bms(
         log::info!("Bms file not found, skipping: {}", work_dir.display());
         return Ok(());
     };
-    let title = bms_info.header.title.unwrap_or(DEFAULT_TITLE.to_string());
-    let artist = bms_info.header.artist.unwrap_or(DEFAULT_ARTIST.to_string());
+    let title = bms_info
+        .music_info
+        .title
+        .unwrap_or(DEFAULT_TITLE.to_string());
+    let artist = bms_info
+        .music_info
+        .artist
+        .unwrap_or(DEFAULT_ARTIST.to_string());
     let work_dir_name = work_dir
         .file_name()
         .ok_or(io::Error::other("Dir name not exists"))?