diff --git a/Cargo.lock b/Cargo.lock index dd60b7d..62d00ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,7 +90,7 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "itunesdb" -version = "0.1.32" +version = "0.1.34" dependencies = [ "bincode", "env_logger", diff --git a/Cargo.toml b/Cargo.toml index 2c426cd..b06c570 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "itunesdb" -version = "0.1.33" +version = "0.1.34" edition = "2021" authors = ["alterwain"] diff --git a/src/artworkdb.rs b/src/artworkdb.rs index f1ce894..32593a6 100644 --- a/src/artworkdb.rs +++ b/src/artworkdb.rs @@ -39,8 +39,7 @@ pub mod deserializer { last_type = ds.data_type; adb.children.push(ADataSet { header, data: ds, child: Vec::new()}); }, - ChunkType::ImageList => { - info!("ImageList tag"); + ChunkType::ImageList | ChunkType::AlbumList | ChunkType::FileList => { u = usize::try_from(header.end_of_chunk).unwrap() - 12; }, ChunkType::ImageItem => { @@ -139,6 +138,8 @@ pub mod objects { ArtworkDB, DataSet, ImageList, + AlbumList, + FileList, ImageItem, LocationTag, ImageName, @@ -154,6 +155,8 @@ pub mod objects { [0x6D, 0x68, 0x69, 0x69] => ChunkType::ImageItem, [0x6D, 0x68, 0x6F, 0x64] => ChunkType::LocationTag, [0x6D, 0x68, 0x6E, 0x69] => ChunkType::ImageName, + [0x6D, 0x68, 0x6C, 0x61] => ChunkType::AlbumList, + [0x6D, 0x68, 0x6C, 0x66] => ChunkType::FileList, _ => ChunkType::Unknown, } } @@ -169,6 +172,8 @@ pub mod objects { ChunkType::ImageItem => [0x6D, 0x68, 0x69, 0x69], ChunkType::LocationTag => [0x6D, 0x68, 0x6F, 0x64], ChunkType::ImageName => [0x6D, 0x68, 0x6E, 0x69], + ChunkType::AlbumList => [0x6D, 0x68, 0x6C, 0x61], + ChunkType::FileList => [0x6D, 0x68, 0x6C, 0x66], } } }