EZPPFarm/akatsuki-pp-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: metadata parsing

Browse Source
This commit is contained in:
tsunyoku
2022-11-20 14:47:51 +00:00
parent 3f6af95873
commit c829ba410f
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parse/mod.rs
+3 -8
View File
@@ -154,8 +154,6 @@ macro_rules! parse_general_body {
macro_rules! parse_metadata_body { macro_rules! parse_metadata_body {
($self:ident, $reader:ident, $section:ident) => {{ ($self:ident, $reader:ident, $section:ident) => {{
let mut empty = true; let mut empty = true;
let mut creator = None;
let mut beatmap_id = None;
while next_line!($reader)? != 0 { while next_line!($reader)? != 0 {
if let Some(bytes) = $reader.get_section() { if let Some(bytes) = $reader.get_section() {
@@ -167,17 +165,14 @@ macro_rules! parse_metadata_body {
let (key, value) = $reader.split_colon().ok_or(ParseError::BadLine)?; let (key, value) = $reader.split_colon().ok_or(ParseError::BadLine)?;
if key == b"Creator" { if key == b"Creator" {
creator = Some(value) $self.creator = value.to_string();
} else if key == b"BeatmapID" { } else if key == b"BeatmapID" {
if let Some(val) = u32::parse_in_range(value) { if let Some(val) = u32::from_str(value).ok() {
beatmap_id = Some(val); $self.beatmap_id = val;
} }
} }
} }
$self.creator = creator.unwrap_or("").to_string();
$self.beatmap_id = beatmap_id.unwrap_or(0);
Ok(empty) Ok(empty)
}}; }};
} }