diff --git a/Cargo.lock b/Cargo.lock index e6906e1..271697f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,7 +90,7 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "itunesdb" -version = "0.1.40" +version = "0.1.42" dependencies = [ "bincode", "env_logger", diff --git a/Cargo.toml b/Cargo.toml index e0f01c8..41db6b4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "itunesdb" -version = "0.1.41" +version = "0.1.42" edition = "2021" authors = ["alterwain"] diff --git a/src/artworkdb.rs b/src/artworkdb.rs index c40ce25..6db16f9 100644 --- a/src/artworkdb.rs +++ b/src/artworkdb.rs @@ -128,26 +128,22 @@ pub mod serializer { item.append(&mut [0; 100].to_vec()); entry_bytes.append(&mut item); let o = img.tag.as_ref().unwrap(); - if o.data.tag_type == 2 { - let mut data = [2u32.to_le_bytes(), 0u32.to_le_bytes(), 0u32.to_le_bytes()].concat(); - entry_bytes.append(&mut generate_header(ChunkType::LocationTag, 12, 0)); - entry_bytes.append(&mut data); + let mut data = [2u32.to_le_bytes(), 0u32.to_le_bytes(), 0u32.to_le_bytes()].concat(); + entry_bytes.append(&mut generate_header(ChunkType::LocationTag, 12, 0)); + entry_bytes.append(&mut data); - if let Some(name) = &o.child { - - let mut nb = Vec::new(); - - let arg = name.tag.as_ref().unwrap(); - if arg.data.tag_type == 3 { - let mut str_b = string_to_ipod16(o.str.as_ref().unwrap()); - str_b = [3u32.to_le_bytes().to_vec(), 0u32.to_le_bytes().to_vec(), 0u32.to_le_bytes().to_vec(), (str_b.len() as u32).to_le_bytes().to_vec(), 2u32.to_le_bytes().to_vec(), 0u32.to_le_bytes().to_vec(), str_b ].concat(); - nb.append(&mut generate_header(ChunkType::LocationTag, 12, str_b.len())); - nb.append(&mut str_b); - } - - args.append(&mut generate_header(ChunkType::ImageName, 76, nb.len())); - args.append(&mut bincode::serialize(name).unwrap()); - } + if let Some(name) = &o.child { + + let mut nb = Vec::new(); + + let arg = name.tag.as_ref().unwrap(); + let mut str_b = string_to_ipod16(arg.str.as_ref().unwrap()); + str_b = [3u32.to_le_bytes().to_vec(), 0u32.to_le_bytes().to_vec(), 0u32.to_le_bytes().to_vec(), (str_b.len() as u32).to_le_bytes().to_vec(), 2u32.to_le_bytes().to_vec(), 0u32.to_le_bytes().to_vec(), str_b ].concat(); + nb.append(&mut generate_header(ChunkType::LocationTag, 12, str_b.len())); + nb.append(&mut str_b); + + args.append(&mut generate_header(ChunkType::ImageName, 76, nb.len())); + args.append(&mut bincode::serialize(name).unwrap()); } }