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
12 changes: 6 additions & 6 deletions src/audio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,10 @@ impl Content for Audio {
)
.value("channels", self.channels)
.value(
"compression mode",
"compression",
match self.ty {
AudioType::Flac => "lossless",
AudioType::Mp3 => "lossy",
AudioType::Flac => Compression::Lossless,
AudioType::Mp3 => Compression::Lossy,
},
)
.value("samples", self.samples)
Expand Down Expand Up @@ -464,7 +464,7 @@ mod tests {
.value("sample rate", "44.1 kHz")
.value("bit rate", "4 kbit/s")
.value("channels", "2")
.value("compression mode", "lossless")
.value("compression", "lossless")
.value("samples", "66150")
.build(),
);
Expand Down Expand Up @@ -492,7 +492,7 @@ mod tests {
.value("sample rate", "44.1 kHz")
.value("bit rate", "4 kbit/s")
.value("channels", "2")
.value("compression mode", "lossy")
.value("compression", "lossy")
.value("samples", "66150")
.build(),
);
Expand All @@ -514,7 +514,7 @@ mod tests {
.value("type", "FLAC")
.value("sample rate", "0 kHz")
.value("channels", "2")
.value("compression mode", "lossless")
.value("compression", "lossless")
.value("samples", "0")
.build(),
);
Expand Down
8 changes: 8 additions & 0 deletions src/compression.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
use super::*;

#[derive(Display)]
#[strum(serialize_all = "kebab-case")]
pub(crate) enum Compression {
Lossless,
Lossy,
}
23 changes: 23 additions & 0 deletions src/image.rs
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,13 @@ impl Content for Image {
.value("bit depth", format!("{}-bit", self.bit_depth))
.optional("chroma subsampling", self.chroma_subsampling)
.value("alpha", self.alpha)
.value(
"compression",
match self.ty {
ImageType::Jpeg => Compression::Lossy,
ImageType::Png => Compression::Lossless,
},
)
}

fn load(root: &Utf8Path, path: RelativePath) -> Result<Item<Self>> {
Expand Down Expand Up @@ -445,6 +452,22 @@ mod tests {
assert!(!root.join("thumbnails/foo.jpg").exists());
}

#[test]
fn info() {
assert_eq!(
Content::info(&Image::test("foo.jpg"), InfoBuilder::new()).build(),
InfoBuilder::new()
.value("type", "JPEG")
.value("dimensions", "1脳1")
.value("orientation", "0掳")
.value("color type", "RGB")
.value("bit depth", "8-bit")
.value("alpha", "false")
.value("compression", "lossy")
.build(),
);
}

#[test]
fn load() {
#[track_caller]
Expand Down
2 changes: 2 additions & 0 deletions src/item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ mod tests {
.value("color type", "RGB")
.value("bit depth", "8-bit")
.value("alpha", "false")
.value("compression", "lossless")
.build(),
);

Expand All @@ -124,6 +125,7 @@ mod tests {
.value("color type", "RGB")
.value("bit depth", "8-bit")
.value("alpha", "false")
.value("compression", "lossless")
.build(),
);
}
Expand Down
2 changes: 2 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ use {
color_type::ColorType,
component::Component,
component_error::ComponentError,
compression::Compression,
content::Content,
content_type::ContentType,
context::Context,
Expand Down Expand Up @@ -312,6 +313,7 @@ mod color_type;
mod component;
mod component_buf;
mod component_error;
mod compression;
mod content;
mod content_type;
mod context;
Expand Down
6 changes: 6 additions & 0 deletions src/templates/media.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,12 @@ mod tests {
false
</dd>
</div>
<div>
<dt>compression</dt>
<dd>
lossless
</dd>
</div>
</dl>
</li>
</ol>
Expand Down
14 changes: 14 additions & 0 deletions src/video.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ impl Content for Video {
"duration",
DisplayDuration(Duration::from_millis(self.duration)),
)
.value("compression", Compression::Lossy)
.list(
"tracks",
self
Expand Down Expand Up @@ -119,6 +120,19 @@ mod tests {
});
}

#[test]
fn info() {
assert_eq!(
Content::info(&Video::test("foo.mp4"), InfoBuilder::new()).build(),
InfoBuilder::new()
.value("type", "MP4")
.value("duration", "0:01")
.value("compression", "lossy")
.list("tracks", Vec::new())
.build(),
);
}

#[test]
fn load() {
#[track_caller]
Expand Down