asonix/actix-form-data
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity Actions

Update actix-multipart
All checks were successful
/ check (armv7-unknown-linux-musleabihf) (push) Successful in 22s
Details
/ check (aarch64-unknown-linux-musl) (push) Successful in 22s
Details
/ check (x86_64-unknown-linux-musl) (push) Successful in 22s
Details
/ clippy (push) Successful in 30s
Details
/ tests (push) Successful in 33s
Details
/ build (aarch64-unknown-linux-musl) (push) Successful in 31s
Details
/ build (armv7-unknown-linux-musleabihf) (push) Successful in 31s
Details
/ build (x86_64-unknown-linux-musl) (push) Successful in 22s
Details
/ publish-forgejo (push) Successful in 6s
Details
/ publish-crate (push) Successful in 24s
Details

Browse source
This commit is contained in:
asonix 2024-07-09 12:36:44 -05:00
parent 9ab99f162a
commit 3282cb4192
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "actix-form-data"
description = "Multipart Form Data for Actix Web"
version = "0.7.0-beta.7"
version = "0.7.0-beta.8"
license = "GPL-3.0"
authors = ["asonix <asonix@asonix.dog>"]
repository = "https://git.asonix.dog/asonix/actix-form-data.git"
@ -10,7 +10,7 @@ keywords = ["actix", "form-data", "multipart", "async"]
edition = "2021"
[dependencies]
actix-multipart = { version = "0.6.0", default-features = false }
actix-multipart = { version = "0.7.2", default-features = false }
actix-web = { version = "4.0.0", default-features = false }
futures-core = "0.3.28"
mime = "0.3.16"

16
src/error.rs
View file

@ -95,16 +95,18 @@ pub enum MultipartError {
impl From<actix_multipart::MultipartError> for Error {
fn from(value: actix_multipart::MultipartError) -> Self {
match value {
actix_multipart::MultipartError::NoContentDisposition => {
actix_multipart::MultipartError::ContentDispositionMissing => {
Error::Multipart(MultipartError::NoContentDisposition)
}
actix_multipart::MultipartError::NoContentType => {
actix_multipart::MultipartError::ContentTypeMissing => {
Error::Multipart(MultipartError::NoContentType)
}
actix_multipart::MultipartError::ParseContentType => {
actix_multipart::MultipartError::ContentTypeParse => {
Error::Multipart(MultipartError::ParseContentType)
}
actix_multipart::MultipartError::Boundary => Error::Multipart(MultipartError::Boundary),
actix_multipart::MultipartError::BoundaryMissing => {
Error::Multipart(MultipartError::Boundary)
}
actix_multipart::MultipartError::Nested => Error::Multipart(MultipartError::Nested),
actix_multipart::MultipartError::Incomplete => {
Error::Multipart(MultipartError::Incomplete)
@ -114,9 +116,9 @@ impl From<actix_multipart::MultipartError> for Error {
actix_multipart::MultipartError::NotConsumed => {
Error::Multipart(MultipartError::NotConsumed)
}
actix_multipart::MultipartError::Field { field_name, source } => {
actix_multipart::MultipartError::Field { name, source } => {
Error::Multipart(MultipartError::Field {
field_name,
field_name: name,
zource: source.to_string(),
})
}
@ -126,7 +128,7 @@ impl From<actix_multipart::MultipartError> for Error {
actix_multipart::MultipartError::MissingField(s) => {
Error::Multipart(MultipartError::MissingField(s))
}
actix_multipart::MultipartError::UnsupportedField(s) => {
actix_multipart::MultipartError::UnknownField(s) => {
Error::Multipart(MultipartError::UnsupportedField(s))
}
e => Error::Multipart(MultipartError::Unknown(e.to_string())),

8
src/upload.rs
View file

@ -81,8 +81,12 @@ fn parse_content_disposition(field: &actix_multipart::Field) -> ContentDispositi
let content_disposition = field.content_disposition();
ContentDisposition {
name: content_disposition.get_name().map(|v| v.to_string()),
filename: content_disposition.get_filename().map(|v| v.to_string()),
name: content_disposition
.and_then(|cd| cd.get_name())
.map(|v| v.to_string()),
filename: content_disposition
.and_then(|cd| cd.get_filename())
.map(|v| v.to_string()),
}
}