feat: convert music detail to dxrating

sdgb-api/src/all_net/mod.rs

@@ -58,7 +58,7 @@ impl QRCode<'_> {
             2 => Err(QRLoginError::QRCodeExpired10),
             1 => Err(QRLoginError::QRCodeExpired30),
             50 => Err(QRLoginError::BadSingature),
-            error_kind @ _ => Err(QRLoginError::Unknown { error_kind }),
+            error_kind => Err(QRLoginError::Unknown { error_kind }),
         }
     }
 }

sdgb-api/src/helper/music_db/mod.rs

@@ -29,8 +29,8 @@ pub fn preload_db() {
     _ = &*MUSIC_DB;
 }
 
-pub fn query_music(music_id: &u32) -> Option<&'static MusicInfo> {
-    MUSIC_DB.as_ref()?.get(music_id)
+pub fn query_music(music_id: u32) -> Option<&'static MusicInfo> {
+    MUSIC_DB.as_ref()?.get(&music_id)
 }
 pub fn query_music_level(music_id: u32, level: u32) -> Option<&'static Level> {
     MUSIC_DB

sdgb-api/src/title/model/dxrating/conversion/mod.rs

@@ -1,8 +1,9 @@
 use crate::{
     helper::query_music,
-    title::model::get_user_rating_api::{
-        MusicRating, UserRating,
+    title::model::{
         dxrating::{DxCalculatedEntries, DxLevelName, DxMusicRecord, DxSheetId},
+        get_user_music_api::UserMusicDetail,
+        get_user_rating_api::{MusicRating, UserRating},
     },
 };
 
@@ -33,21 +34,54 @@ impl TryFrom<u32> for DxLevelName {
     }
 }
 
-impl TryFrom<&MusicRating> for DxMusicRecord {
+impl TryFrom<&UserMusicDetail> for DxMusicRecord {
     type Error = ConversionError;
 
-    fn try_from(value: &MusicRating) -> Result<Self, Self::Error> {
-        let music_title = query_music(&value.music_id)
+    fn try_from(
+        &UserMusicDetail {
+            music_id,
+            level,
+            achievement,
+            ..
+        }: &UserMusicDetail,
+    ) -> Result<Self, Self::Error> {
+        let music_title = query_music(music_id)
             .map(|info| info.name.clone())
             .ok_or(ConversionError::MusicNotInDB)?;
 
         Ok(Self {
             sheet_id: DxSheetId {
                 music_title,
-                level: DxLevelName::try_from(value.level)?,
-                dx_version: value.music_id >= 10000,
+                level: DxLevelName::try_from(level)?,
+                dx_version: music_id >= 10000,
             },
-            achievement_rate: (value.achievement as f64) / 10000.0,
+            achievement_rate: (achievement as f64) / 10000.0,
+        })
+    }
+}
+
+impl TryFrom<&MusicRating> for DxMusicRecord {
+    type Error = ConversionError;
+
+    fn try_from(
+        &MusicRating {
+            music_id,
+            level,
+            achievement,
+            ..
+        }: &MusicRating,
+    ) -> Result<Self, Self::Error> {
+        let music_title = query_music(music_id)
+            .map(|info| info.name.clone())
+            .ok_or(ConversionError::MusicNotInDB)?;
+
+        Ok(Self {
+            sheet_id: DxSheetId {
+                music_title,
+                level: DxLevelName::try_from(level)?,
+                dx_version: music_id >= 10000,
+            },
+            achievement_rate: (achievement as f64) / 10000.0,
         })
     }
 }

sdgb-api/src/title/model/get_user_music_api/mod.rs

@@ -70,7 +70,7 @@ pub struct UserMusicDetail {
 
 impl Display for UserMusicDetail {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        if let Some(music_title) = query_music(&self.music_id).map(|i| &i.name) {
+        if let Some(music_title) = query_music(self.music_id).map(|i| &i.name) {
             f.write_fmt(format_args!("曲目名称: \t{music_title}\n"))?;
         }
         f.write_fmt(format_args!("难度名称: \t{}\n", level_name(self.level)))?;

sdgb-api/src/title/model/get_user_rating_api/mod.rs

@@ -151,12 +151,10 @@ impl Display for MusicRating {
 
 impl MusicRating {
     pub fn music_title(&self) -> Option<String> {
-        Some(query_music(&self.music_id).as_ref()?.name.clone())
+        Some(query_music(self.music_id).as_ref()?.name.clone())
     }
 
     pub fn dx_rating(&self) -> Option<u32> {
         Some(query_music_level(self.music_id, self.level)?.dx_rating(self.achievement))
     }
 }
-
-pub mod dxrating;

sdgb-api/src/title/model/mod.rs

@@ -14,14 +14,6 @@ mod get_user_data_api;
 pub use get_user_data_api::{GetUserDataApi, GetUserDataApiResp, UserData};
 
 mod get_user_rating_api;
-pub use get_user_rating_api::dxrating::{
-    DataVersion,
-    DxCalculatedEntries, // entries
-    DxLevelName,         // level name
-    DxMusicRecord,
-    DxRatingNet,
-    DxSheetId,
-};
 pub use get_user_rating_api::{
     GetUserRatingApi,
     GetUserRatingApiResp, // api
@@ -32,3 +24,14 @@ pub use get_user_rating_api::{
 
 mod get_user_music_api;
 pub use get_user_music_api::{GetUserMusicApi, GetUserMusicApiResp, UserMusic};
+
+
+mod dxrating;
+pub use dxrating::{
+    DataVersion,
+    DxCalculatedEntries, // entries
+    DxLevelName,         // level name
+    DxMusicRecord,
+    DxRatingNet,
+    DxSheetId,
+};

sdgb-api/src/title/model/user_login_api/mod.rs

@@ -62,7 +62,7 @@ impl UserLoginApiResp {
             100 => Some(LoginError::AlreadyLogged),
             102 => Some(LoginError::QRCodeExpired),
             103 => Some(LoginError::AccountUnregistered),
-            error @ _ => Some(LoginError::Unknown { error }),
+            error => Some(LoginError::Unknown { error }),
         }
     }
 }