clizia/pnt
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: clizia:a2ff6ce3e394b3c24130de1e03c2a3433d09e562
Branches Tags
clizia:main
..
compare: clizia:f5b57ea766dd9b1266391c32346ca38a62840c6c
Branches Tags
clizia:main

No commits in common. "a2ff6ce3e394b3c24130de1e03c2a3433d09e562" and "f5b57ea766dd9b1266391c32346ca38a62840c6c" have entirely different histories.
a2ff6ce3e3 ... f5b57ea766

4 changed files with 20 additions and 129 deletions
Show Stats Expand all files Collapse all files

1
Cargo.toml
View File

@ -5,4 +5,3 @@ edition = "2021"
[dependencies]
crc = "3.2.1"
clap = "4.5.20"

14
src/chunk.rs
View File

@ -3,15 +3,15 @@ use crc::Crc;
use crate::chunk_type::ChunkType;
pub struct Chunk {
struct Chunk {
length: u32,
pub chunk_type: ChunkType,
chunk_type: ChunkType,
chunk_data: Vec<u8>,
pub crc: u32,
crc: u32,
}
impl Chunk {
pub fn new(chunktype: ChunkType, data: Vec<u8>) -> Chunk {
fn new(chunktype: ChunkType, data: Vec<u8>) -> Chunk {
let x25: Crc<u32> = Crc::<u32>::new(&crc::CRC_32_ISO_HDLC);
let to_hash: Vec<u8> = chunktype
@ -35,7 +35,7 @@ impl Chunk {
self.length
}
pub fn chunk_type(&self) -> &ChunkType {
fn chunk_type(&self) -> &ChunkType {
&self.chunk_type
}
@ -47,7 +47,7 @@ impl Chunk {
self.crc
}
pub fn data_as_string(&self) -> Result<String, &'static str> {
fn data_as_string(&self) -> Result<String, &'static str> {
let to_stringify: Vec<u8> = self.chunk_data.clone();
if self.length() == 0 {
@ -57,7 +57,7 @@ impl Chunk {
}
}
pub fn as_bytes(&self) -> Vec<u8> {
fn as_bytes(&self) -> Vec<u8> {
let bytes: Vec<u8> = self.length()
.to_be_bytes()
.iter()

2
src/chunk_type.rs
View File

@ -38,7 +38,7 @@ impl ChunkType {
bytes
}
pub fn is_valid(&self) -> bool {
fn is_valid(&self) -> bool {
let mut x = self.bytes().len();
loop {

132
src/png.rs
View File

@ -1,26 +1,19 @@
use std::{collections::VecDeque, vec};
use crc::Crc;
use crate::{chunk::{self, Chunk}, chunk_type::ChunkType};
use crate::{chunk::Chunk, chunk_type};
pub const STANDARD_HEADER: [u8; 8] = [137, 80, 78, 71, 13, 10, 26, 10];
struct Png {
png_signature: [u8; 8],
png_chunks: Vec<Chunk>,
signature: [u8; 8],
chunks: Vec<Chunk>,
}
impl Png {
pub const STANDARD_HEADER: [u8; 8] = [137, 80, 78, 71, 13, 10, 26, 10];
fn from_chunks(chunks: Vec<Chunk>) -> Png {
Png {
png_signature: Self::STANDARD_HEADER,
png_chunks: chunks,
}
todo!()
}
fn append_chunk(&mut self, chunk: Chunk) {
self.png_chunks.push(chunk)
todo!()
}
fn remove_first_chunk(&mut self, chunk_type: &str) -> Result<Chunk, &'static str> {
@ -28,11 +21,11 @@ impl Png {
}
fn header(&self) -> &[u8; 8] {
&self.png_signature
todo!()
}
fn chunks(&self) -> &[Chunk] {
&self.png_chunks
todo!()
}
fn chunk_by_type(&self, chunk_type: &str) -> Option<&Chunk> {
@ -40,116 +33,15 @@ impl Png {
}
fn as_bytes(&self) -> Vec<u8> {
let mut final_vec: Vec<u8> = Vec::new();
for i in Self::STANDARD_HEADER {
final_vec.push(i)
}
let chunk_bytes: Vec<Vec<u8>> = self.png_chunks
.iter()
.map(|chunk| chunk.as_bytes())
.collect();
for chunk in chunk_bytes {
for byte in chunk {
final_vec.push(byte)
}
}
final_vec
todo!()
}
}
impl TryFrom<&[u8]> for Png {
type Error = &'static str;
fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
let mut bytes_vec: VecDeque<u8> = VecDeque::from(bytes.to_owned());
let signature: [u8; 8] = [
bytes_vec.pop_front().unwrap(),
bytes_vec.pop_front().unwrap(),
bytes_vec.pop_front().unwrap(),
bytes_vec.pop_front().unwrap(),
bytes_vec.pop_front().unwrap(),
bytes_vec.pop_front().unwrap(),
bytes_vec.pop_front().unwrap(),
bytes_vec.pop_front().unwrap(),
];
let mut chunks: Vec<Chunk> = Vec::new();
while !bytes_vec.is_empty() {
let length_bytes: [u8; 4] = [
bytes_vec.pop_front().unwrap(),
bytes_vec.pop_front().unwrap(),
bytes_vec.pop_front().unwrap(),
bytes_vec.pop_front().unwrap(),
];
let length_from_slice: u32 = u32::from_be_bytes(length_bytes);
let chunk_type_bytes: [u8; 4] = [
bytes_vec.pop_front().unwrap(),
bytes_vec.pop_front().unwrap(),
bytes_vec.pop_front().unwrap(),
bytes_vec.pop_front().unwrap(),
];
let chunk_type_from_slice: ChunkType = ChunkType::try_from(chunk_type_bytes)?;
let mut data_bytes: Vec<u8> = Vec::new();
for _n in 0..length_from_slice {
data_bytes.push(bytes_vec[0]);
bytes_vec.pop_front();
};
let crc_bytes: [u8; 4] = [
bytes_vec.pop_front().unwrap(),
bytes_vec.pop_front().unwrap(),
bytes_vec.pop_front().unwrap(),
bytes_vec.pop_front().unwrap(),
];
let chunk_bytes: Vec<u8> = length_bytes
.iter()
.chain(chunk_type_bytes.iter())
.chain(data_bytes.iter())
.chain(crc_bytes.iter())
.copied()
.collect();
let chunk_while: Chunk = Chunk::try_from(chunk_bytes.as_ref())?;
let x25: Crc<u32> = Crc::<u32>::new(&crc::CRC_32_ISO_HDLC);
let to_hash: Vec<u8> = chunk_type_bytes
.iter()
.chain(data_bytes.iter())
.copied()
.collect();
let crc_value = x25.checksum(&to_hash);
if chunk_while.crc != crc_value {
return Err("Not a valid chunk");
} else if !chunk_while.chunk_type.is_valid() {
return Err("not a valid chunk");
} else {
chunks.push(chunk_while);
}
}
let png = Png {
png_signature: signature,
png_chunks: chunks,
};
if png.png_signature == Self::STANDARD_HEADER {
Ok(png)
} else {
Err("Not a valid png")
}
fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
todo!()
}
}
@ -180,7 +72,7 @@ mod tests {
Png::from_chunks(chunks)
}
fn chunk_from_strings(chunk_type: &str, data: &str) -> Result<Chunk, Box<dyn std::error::Error>> {
fn chunk_from_strings(chunk_type: &str, data: &str) -> Result<Chunk> {
use std::str::FromStr;
let chunk_type = ChunkType::from_str(chunk_type)?;