edward/omegaupload
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update rpassword dep

Browse source
This commit is contained in:
Ninja3047 2022-07-10 23:27:51 -04:00 committed by Edward Shen
parent 9a7f13f8b9
commit 711f79a255
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cli/Cargo.toml
View file

@ -9,10 +9,10 @@ license = "GPL-3.0-or-later"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
omegaupload-common = "0.2" omegaupload-common = "0.2.0"
anyhow = "1" anyhow = "1.0.58"
atty = "0.2" atty = "0.2.14"
clap = { version = "3", features = ["derive"] } clap = { version = "3.2.8", features = ["derive"] }
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "blocking"] } reqwest = { version = "0.11.11", default-features = false, features = ["rustls-tls", "blocking"] }
rpassword = "5" rpassword = "6.0.1"

8
cli/src/main.rs
View file

@ -31,7 +31,7 @@ use omegaupload_common::{
use reqwest::blocking::Client; use reqwest::blocking::Client;
use reqwest::header::EXPIRES; use reqwest::header::EXPIRES;
use reqwest::StatusCode; use reqwest::StatusCode;
use rpassword::prompt_password_stderr; use rpassword::prompt_password;
use crate::fragment::Builder; use crate::fragment::Builder;
@ -120,8 +120,7 @@ fn handle_upload(
} }
let password = if password { let password = if password {
let maybe_password = let maybe_password = prompt_password("Please set the password for this paste: ")?;
prompt_password_stderr("Please set the password for this paste: ")?;
Some(SecretVec::new(maybe_password.into_bytes())) Some(SecretVec::new(maybe_password.into_bytes()))
} else { } else {
None None
@ -200,8 +199,7 @@ fn handle_download(mut url: ParsedUrl) -> Result<()> {
let password = if url.needs_password { let password = if url.needs_password {
// Only print prompt on interactive, else it messes with output // Only print prompt on interactive, else it messes with output
let maybe_password = let maybe_password = prompt_password("Please enter the password to access this paste: ")?;
prompt_password_stderr("Please enter the password to access this paste: ")?;
Some(SecretVec::new(maybe_password.into_bytes())) Some(SecretVec::new(maybe_password.into_bytes()))
} else { } else {
None None