Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 45 additions & 63 deletions src/audio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -544,28 +544,22 @@ mod tests {

assert_eq!(
Item::info(&audio, "bob".into()),
Info::Map(vec![
(
"filename".into(),
Info::Link {
text: "foo.flac".into(),
url: "bob".into(),
},
),
("title".into(), Info::Value("bar".into())),
("artist".into(), Info::Value("baz".into())),
("album".into(), Info::Value("qux".into())),
("disc".into(), Info::Value("1 of 2".into())),
("track".into(), Info::Value("3 of 4".into())),
("duration".into(), Info::Value("0:01".into())),
("type".into(), Info::Value("FLAC".into())),
("sample bits".into(), Info::Value("16-bit".into())),
("sample rate".into(), Info::Value("44.1 kHz".into())),
("bit rate".into(), Info::Value("4 kbit/s".into())),
("channels".into(), Info::Value("2".into())),
("compression mode".into(), Info::Value("lossless".into())),
("samples".into(), Info::Value("66150".into())),
]),
InfoBuilder::new()
.link("filename", "foo.flac", "bob".into())
.value("title", "bar")
.value("artist", "baz")
.value("album", "qux")
.value("disc", "1 of 2")
.value("track", "3 of 4")
.value("duration", "0:01")
.value("type", "FLAC")
.value("sample bits", "16-bit")
.value("sample rate", "44.1 kHz")
.value("bit rate", "4 kbit/s")
.value("channels", "2")
.value("compression mode", "lossless")
.value("samples", "66150")
.build(),
);

let mut audio = "foo.mp3".parse::<Audio>().unwrap();
Expand All @@ -583,54 +577,42 @@ mod tests {

assert_eq!(
Item::info(&audio, "bob".into()),
Info::Map(vec![
(
"filename".into(),
Info::Link {
text: "foo.mp3".into(),
url: "bob".into(),
},
),
("title".into(), Info::Value("bar".into())),
("artist".into(), Info::Value("baz".into())),
("album".into(), Info::Value("qux".into())),
("disc".into(), Info::Value("1 of 2".into())),
("track".into(), Info::Value("3 of 4".into())),
("duration".into(), Info::Value("0:01".into())),
("type".into(), Info::Value("MP3".into())),
("sample rate".into(), Info::Value("44.1 kHz".into())),
("bit rate".into(), Info::Value("4 kbit/s".into())),
("channels".into(), Info::Value("2".into())),
("compression mode".into(), Info::Value("lossy".into())),
("samples".into(), Info::Value("66150".into())),
]),
InfoBuilder::new()
.link("filename", "foo.mp3", "bob".into())
.value("title", "bar")
.value("artist", "baz")
.value("album", "qux")
.value("disc", "1 of 2")
.value("track", "3 of 4")
.value("duration", "0:01")
.value("type", "MP3")
.value("sample rate", "44.1 kHz")
.value("bit rate", "4 kbit/s")
.value("channels", "2")
.value("compression mode", "lossy")
.value("samples", "66150")
.build(),
);

let mut audio = "foo.flac".parse::<Audio>().unwrap();
audio.size = 750;

assert_eq!(
Item::info(&audio, "bob".into()),
Info::Map(vec![
(
"filename".into(),
Info::Link {
text: "foo.flac".into(),
url: "bob".into(),
},
),
("title".into(), Info::Value(String::new())),
("artist".into(), Info::Value(String::new())),
("album".into(), Info::Value(String::new())),
("disc".into(), Info::Value("0 of 0".into())),
("track".into(), Info::Value("0 of 0".into())),
("duration".into(), Info::Value("0:00".into())),
("type".into(), Info::Value("FLAC".into())),
("sample rate".into(), Info::Value("0 kHz".into())),
("channels".into(), Info::Value("0".into())),
("compression mode".into(), Info::Value("lossless".into())),
("samples".into(), Info::Value("0".into())),
]),
InfoBuilder::new()
.link("filename", "foo.flac", "bob".into())
.value("title", "")
.value("artist", "")
.value("album", "")
.value("disc", "0 of 0")
.value("track", "0 of 0")
.value("duration", "0:00")
.value("type", "FLAC")
.value("sample rate", "0 kHz")
.value("channels", "0")
.value("compression mode", "lossless")
.value("samples", "0")
.build(),
);
}

Expand Down
78 changes: 39 additions & 39 deletions src/track.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,36 +147,36 @@ mod tests {

assert_eq!(
track.info(&video),
Info::Map(vec![
("type".into(), Info::Value("video".into())),
("codec".into(), Info::Value("H.264".into())),
("dimensions".into(), Info::Value("2×1".into())),
("orientation".into(), Info::Value("0°".into())),
("frames".into(), Info::Value("240".into())),
("frame rate".into(), Info::Value("24 fps".into())),
("bit rate".into(), Info::Value("1.2 kbit/s".into())),
("bits per pixel".into(), Info::Value("25".into())),
("bit depth".into(), Info::Value("8-bit".into())),
("chroma subsampling".into(), Info::Value("4:2:0".into())),
("size".into(), Info::Value("1.5 KiB".into())),
]),
InfoBuilder::new()
.value("type", "video")
.value("codec", "H.264")
.value("dimensions", "2×1")
.value("orientation", "0°")
.value("frames", "240")
.value("frame rate", "24 fps")
.value("bit rate", "1.2 kbit/s")
.value("bits per pixel", "25")
.value("bit depth", "8-bit")
.value("chroma subsampling", "4:2:0")
.value("size", "1.5 KiB")
.build(),
);

video.duration = 0;

assert_eq!(
track.info(&video),
Info::Map(vec![
("type".into(), Info::Value("video".into())),
("codec".into(), Info::Value("H.264".into())),
("dimensions".into(), Info::Value("2×1".into())),
("orientation".into(), Info::Value("0°".into())),
("frames".into(), Info::Value("240".into())),
("bits per pixel".into(), Info::Value("25".into())),
("bit depth".into(), Info::Value("8-bit".into())),
("chroma subsampling".into(), Info::Value("4:2:0".into())),
("size".into(), Info::Value("1.5 KiB".into())),
]),
InfoBuilder::new()
.value("type", "video")
.value("codec", "H.264")
.value("dimensions", "2×1")
.value("orientation", "0°")
.value("frames", "240")
.value("bits per pixel", "25")
.value("bit depth", "8-bit")
.value("chroma subsampling", "4:2:0")
.value("size", "1.5 KiB")
.build(),
);

let track = Track {
Expand All @@ -192,27 +192,27 @@ mod tests {

assert_eq!(
track.info(&video),
Info::Map(vec![
("type".into(), Info::Value("audio".into())),
("codec".into(), Info::Value("AAC".into())),
("channels".into(), Info::Value("2".into())),
("sample rate".into(), Info::Value("44.1 kHz".into())),
("bit rate".into(), Info::Value("1 kbit/s".into())),
("size".into(), Info::Value("1.2 KiB".into())),
]),
InfoBuilder::new()
.value("type", "audio")
.value("codec", "AAC")
.value("channels", "2")
.value("sample rate", "44.1 kHz")
.value("bit rate", "1 kbit/s")
.value("size", "1.2 KiB")
.build(),
);

video.duration = 0;

assert_eq!(
track.info(&video),
Info::Map(vec![
("type".into(), Info::Value("audio".into())),
("codec".into(), Info::Value("AAC".into())),
("channels".into(), Info::Value("2".into())),
("sample rate".into(), Info::Value("44.1 kHz".into())),
("size".into(), Info::Value("1.2 KiB".into())),
]),
InfoBuilder::new()
.value("type", "audio")
.value("codec", "AAC")
.value("channels", "2")
.value("sample rate", "44.1 kHz")
.value("size", "1.2 KiB")
.build(),
);
}

Expand Down