Add support for reading from stdin
This commit is contained in:
parent
a17f4d94e4
commit
65c258bd0d
1 changed files with 21 additions and 4 deletions
|
@ -17,7 +17,7 @@
|
||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use std::io::Write;
|
use std::io::{Read, Write};
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
|
||||||
use anyhow::{anyhow, bail, Context, Result};
|
use anyhow::{anyhow, bail, Context, Result};
|
||||||
|
@ -50,7 +50,9 @@ enum Action {
|
||||||
password: bool,
|
password: bool,
|
||||||
#[clap(short, long)]
|
#[clap(short, long)]
|
||||||
duration: Option<Expiration>,
|
duration: Option<Expiration>,
|
||||||
path: PathBuf,
|
/// The path to the file to upload. If none is provided, then reads
|
||||||
|
/// stdin instead.
|
||||||
|
path: Option<PathBuf>,
|
||||||
},
|
},
|
||||||
Download {
|
Download {
|
||||||
/// The paste to download.
|
/// The paste to download.
|
||||||
|
@ -78,12 +80,27 @@ fn handle_upload(
|
||||||
mut url: Url,
|
mut url: Url,
|
||||||
password: bool,
|
password: bool,
|
||||||
duration: Option<Expiration>,
|
duration: Option<Expiration>,
|
||||||
path: PathBuf,
|
path: Option<PathBuf>,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
url.set_fragment(None);
|
url.set_fragment(None);
|
||||||
|
|
||||||
|
if password && path.is_none() {
|
||||||
|
bail!("Reading data from stdin is incompatible with a password. Provide a path to a file to upload.");
|
||||||
|
}
|
||||||
|
|
||||||
let (data, key) = {
|
let (data, key) = {
|
||||||
let mut container = std::fs::read(path)?;
|
let mut container = if let Some(path) = path {
|
||||||
|
std::fs::read(path)?
|
||||||
|
} else {
|
||||||
|
let mut container = vec![];
|
||||||
|
std::io::stdin().lock().read_to_end(&mut container)?;
|
||||||
|
container
|
||||||
|
};
|
||||||
|
|
||||||
|
if container.is_empty() {
|
||||||
|
bail!("Nothing to upload.");
|
||||||
|
}
|
||||||
|
|
||||||
let password = if password {
|
let password = if password {
|
||||||
let maybe_password =
|
let maybe_password =
|
||||||
prompt_password_stderr("Please set the password for this paste: ")?;
|
prompt_password_stderr("Please set the password for this paste: ")?;
|
||||||
|
|
Loading…
Reference in a new issue