jmug/stoatchat
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

refactor(core): add ImageProcessingFailed error

Browse Source
This commit is contained in:
Paul Makles
2024-10-02 14:12:26 +01:00
parent bb202079e0
commit f31020fb6e
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/core/files/src/lib.rs
View File

@@ -167,7 +167,7 @@ pub fn decode_image<R: Read + BufRead + Seek>(reader: &mut R, mime: &str) -> Res
jxl_image.height(), jxl_image.height(),
frame.image().buf().to_vec(), frame.image().buf().to_vec(),
) )
.ok_or_else(|| create_error!(LabelMe))?, .ok_or_else(|| create_error!(ImageProcessingFailed))?,
) )
.to_rgb8(), .to_rgb8(),
)), )),
@@ -178,14 +178,14 @@ pub fn decode_image<R: Read + BufRead + Seek>(reader: &mut R, mime: &str) -> Res
jxl_image.height(), jxl_image.height(),
frame.image().buf().to_vec(), frame.image().buf().to_vec(),
) )
.ok_or_else(|| create_error!(LabelMe))?, .ok_or_else(|| create_error!(LabeImageProcessingFailedlMe))?,
) )
.to_rgba8(), .to_rgba8(),
)), )),
_ => Err(create_error!(LabelMe)), _ => Err(create_error!(ImageProcessingFailed)),
} }
} else { } else {
Err(create_error!(LabelMe)) Err(create_error!(ImageProcessingFailed))
} }
} }
// Read image using resvg // Read image using resvg
@@ -197,7 +197,7 @@ pub fn decode_image<R: Read + BufRead + Seek>(reader: &mut R, mime: &str) -> Res
let tree = report_internal_error!(usvg::Tree::from_data(&buf, &Default::default()))?; let tree = report_internal_error!(usvg::Tree::from_data(&buf, &Default::default()))?;
let size = tree.size(); let size = tree.size();
let mut pixmap = Pixmap::new(size.width() as u32, size.height() as u32) let mut pixmap = Pixmap::new(size.width() as u32, size.height() as u32)
.ok_or_else(|| create_error!(LabelMe))?; .ok_or_else(|| create_error!(ImageProcessingFailed))?;
let mut pixmap_mut = pixmap.as_mut(); let mut pixmap_mut = pixmap.as_mut();
resvg::render(&tree, Default::default(), &mut pixmap_mut); resvg::render(&tree, Default::default(), &mut pixmap_mut);
@@ -208,7 +208,7 @@ pub fn decode_image<R: Read + BufRead + Seek>(reader: &mut R, mime: &str) -> Res
size.height() as u32, size.height() as u32,
pixmap.data().to_vec(), pixmap.data().to_vec(),
) )
.ok_or_else(|| create_error!(LabelMe))?, .ok_or_else(|| create_error!(ImageProcessingFailed))?,
)) ))
} }
// Check if we can read using image-rs crate // Check if we can read using image-rs crate

2
crates/core/result/src/axum.rs
View File

@@ -1,4 +1,5 @@
use axum::{http::StatusCode, response::IntoResponse, Json}; use axum::{http::StatusCode, response::IntoResponse, Json};
use rocket::http::Status;
use crate::{Error, ErrorType}; use crate::{Error, ErrorType};
@@ -78,6 +79,7 @@ impl IntoResponse for Error {
ErrorType::FileTooSmall => StatusCode::UNPROCESSABLE_ENTITY, ErrorType::FileTooSmall => StatusCode::UNPROCESSABLE_ENTITY,
ErrorType::FileTooLarge { .. } => StatusCode::UNPROCESSABLE_ENTITY, ErrorType::FileTooLarge { .. } => StatusCode::UNPROCESSABLE_ENTITY,
ErrorType::FileTypeNotAllowed => StatusCode::BAD_REQUEST, ErrorType::FileTypeNotAllowed => StatusCode::BAD_REQUEST,
ErrorType::ImageProcessingFailed => StatusCode::INTERNAL_SERVER_ERROR,
}; };
(status, Json(&self)).into_response() (status, Json(&self)).into_response()

1
crates/core/result/src/lib.rs
View File

@@ -162,6 +162,7 @@ pub enum ErrorType {
max: usize, max: usize,
}, },
FileTypeNotAllowed, FileTypeNotAllowed,
ImageProcessingFailed,
// ? Legacy errors // ? Legacy errors
VosoUnavailable, VosoUnavailable,

1
crates/core/result/src/rocket.rs
View File

@@ -84,6 +84,7 @@ impl<'r> Responder<'r, 'static> for Error {
ErrorType::FileTooSmall => Status::UnprocessableEntity, ErrorType::FileTooSmall => Status::UnprocessableEntity,
ErrorType::FileTooLarge { .. } => Status::UnprocessableEntity, ErrorType::FileTooLarge { .. } => Status::UnprocessableEntity,
ErrorType::FileTypeNotAllowed => Status::BadRequest, ErrorType::FileTypeNotAllowed => Status::BadRequest,
ErrorType::ImageProcessingFailed => Status::InternalServerError,
}; };
// Serialize the error data structure into JSON. // Serialize the error data structure into JSON.

12
crates/services/january/src/requests.rs
View File

@@ -66,7 +66,7 @@ impl Request {
let Request { response, mime } = Request::new(url).await?; let Request { response, mime } = Request::new(url).await?;
if matches!(mime.type_(), mime::IMAGE | mime::VIDEO) { if matches!(mime.type_(), mime::IMAGE | mime::VIDEO) {
let bytes = response.bytes().await.map_err(|_| create_error!(LabelMe)); let bytes = report_internal_error!(response.bytes().await)?;
let result = match bytes { let result = match bytes {
Ok(bytes) => { Ok(bytes) => {
@@ -77,7 +77,7 @@ impl Request {
if is_valid_image(reader, "image/gif") { if is_valid_image(reader, "image/gif") {
Ok(("image/gif".to_owned(), bytes.to_vec())) Ok(("image/gif".to_owned(), bytes.to_vec()))
} else { } else {
Err(create_error!(LabelMe)) Err(create_error!(FileTypeNotAllowed))
} }
} else { } else {
Ok(( Ok((
@@ -96,7 +96,7 @@ impl Request {
if video_size(&file).is_some() { if video_size(&file).is_some() {
Ok((mime.to_string(), bytes.to_vec())) Ok((mime.to_string(), bytes.to_vec()))
} else { } else {
Err(create_error!(LabelMe)) Err(create_error!(FileTypeNotAllowed))
} }
} }
} }
@@ -106,7 +106,7 @@ impl Request {
PROXY_CACHE.insert(url.to_owned(), result.clone()).await; PROXY_CACHE.insert(url.to_owned(), result.clone()).await;
result result
} else { } else {
Err(create_error!(LabelMe)) Err(create_error!(FileTypeNotAllowed))
} }
} }
} }
@@ -129,7 +129,7 @@ impl Request {
if matches!(mime.type_(), mime::IMAGE) { if matches!(mime.type_(), mime::IMAGE) {
response response
} else { } else {
return Err(create_error!(LabelMe)); return Err(create_error!(FileTypeNotAllowed));
} }
}; };
@@ -166,7 +166,7 @@ impl Request {
if matches!(mime.type_(), mime::VIDEO) { if matches!(mime.type_(), mime::VIDEO) {
response response
} else { } else {
return Err(create_error!(LabelMe)); return Err(create_error!(FileTypeNotAllowed));
} }
}; };