Skip to content

refactor(client-ureq): remove mime_guess #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
EdJoPaTo wants to merge 2 commits into from
Closed

refactor(client-ureq): remove mime_guess #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa7e911
refactor(client-ureq): remove mime_guess
EdJoPaTo Feb 21, 2025
f87b44f
Merge branch 'master' into edjopato/remove-mime-guess
EdJoPaTo Feb 21, 2025
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
1 change: 0 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ all-features = true

[features]
client-reqwest = ["trait-async", "dep:reqwest", "dep:tokio", "dep:serde_json"]
client-ureq = ["trait-sync", "dep:ureq", "dep:multipart", "dep:mime_guess", "dep:serde_json"]
client-ureq = ["trait-sync", "dep:ureq", "dep:multipart", "dep:serde_json"]
trait-async = ["dep:async-trait"]
trait-sync = []

Expand All @@ -39,7 +39,6 @@ unreadable_literal = "allow"
async-trait = { version = "0.1", optional = true }
bon = "3.0.0"
macro_rules_attribute = "0.2.0"
mime_guess = { version = "2", optional = true }
multipart = { version = "0.18", optional = true, default-features = false, features = ["client"] }
paste = "1.0.2"
serde = { version = "1.0.157", features = ["derive"] }
Expand Down
7 changes: 1 addition & 6 deletions src/client_ureq.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,7 @@ impl TelegramApi for Bot {
for (parameter_name, file_path) in &files {
let file = std::fs::File::open(file_path).map_err(Error::ReadFile)?;
let file_name = file_path.file_name().unwrap().to_string_lossy();
let file_extension = file_path
.extension()
.and_then(std::ffi::OsStr::to_str)
.unwrap_or("");
let mime = mime_guess::from_ext(file_extension).first_or_octet_stream();
form.add_stream(*parameter_name, file, Some(file_name), Some(mime));
form.add_stream(*parameter_name, file, Some(file_name), None);
}

let url = format!("{}/{method}", self.api_url);
Expand Down