Nekomata/site_icons
Nekomata/site_icons
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

0.3.1 fix png size detection

Browse source
This commit is contained in:
Sam Denty 2022-10-08 13:46:45 +01:00
parent 1e8cb649fb
commit 3a665919ba
No known key found for this signature in database
GPG key ID: 7B4EAF7B9E291B79
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -1513,7 +1513,7 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
[[package]] [[package]]
name = "site_icons" name = "site_icons"
version = "0.2.1" version = "0.3.1"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"clap", "clap",

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "site_icons" name = "site_icons"
version = "0.3.0" version = "0.3.1"
authors = ["Sam Denty <sam@samdenty.com>"] authors = ["Sam Denty <sam@samdenty.com>"]
edition = "2018" edition = "2018"
license = "GPL-3.0" license = "GPL-3.0"

10
src/icon_info.rs
View file

@ -37,20 +37,20 @@ impl IconInfo {
let mut header = [0; 2]; let mut header = [0; 2];
reader.read_exact(&mut header).await?; reader.read_exact(&mut header).await?;
match (kind, header) { match (kind, &header) {
(Some(IconKind::PNG), _) | (_, [0xC2, 0x89]) => { (Some(IconKind::PNG), _) | (_, b"\x89P") => {
let size = get_png_size(reader).await?; let size = get_png_size(reader).await?;
Ok(IconInfo::PNG { size }) Ok(IconInfo::PNG { size })
} }
(Some(IconKind::ICO), _) | (_, [0x00, 0x00]) => { (Some(IconKind::ICO), _) | (_, &[0x00, 0x00]) => {
let sizes = get_ico_sizes(reader).await?; let sizes = get_ico_sizes(reader).await?;
Ok(IconInfo::ICO { sizes }) Ok(IconInfo::ICO { sizes })
} }
(Some(IconKind::JPEG), _) | (_, [0xFF, 0xD8]) => { (Some(IconKind::JPEG), _) | (_, &[0xFF, 0xD8]) => {
let size = get_jpeg_size(reader).await?; let size = get_jpeg_size(reader).await?;
Ok(IconInfo::JPEG { size }) Ok(IconInfo::JPEG { size })
} }
_ => Err("unknown icon type".into()), _ => Err(format!("unknown icon type ({:?})", header).into()),
} }
} }

2
src/icon_size/jpeg.rs
View file

@ -1,7 +1,7 @@
use super::IconSize; use super::IconSize;
use byteorder::BigEndian; use byteorder::BigEndian;
use futures::prelude::*; use futures::prelude::*;
use std::{error::Error, io::Cursor}; use std::error::Error;
use tokio_futures_byteorder::AsyncReadBytesExt; use tokio_futures_byteorder::AsyncReadBytesExt;
pub async fn get_jpeg_size<R: AsyncRead + Unpin>( pub async fn get_jpeg_size<R: AsyncRead + Unpin>(

2
src/icon_size/png.rs
View file

@ -10,7 +10,7 @@ pub async fn get_png_size<R: AsyncRead + Unpin>(
reader.read_exact(&mut header).await?; reader.read_exact(&mut header).await?;
let header = &mut Cursor::new(header); let header = &mut Cursor::new(header);
assert_slice_eq!(header, 0, b"PNG\r\n\x1a\n", "bad header"); assert_slice_eq!(header, 0, b"NG\r\n\x1a\n", "bad header");
assert_slice_eq!(header, 10, b"IHDR", "bad header"); assert_slice_eq!(header, 10, b"IHDR", "bad header");
let width = header.read_u32::<BigEndian>()?; let width = header.read_u32::<BigEndian>()?;