beenull/ffsend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'only-output-link' into 'master'

Browse source 
Only output link to stdout

See merge request timvisee/ffsend!28
This commit is contained in:
Tim Visée 2019-06-02 20:12:23 +00:00
commit 1edf1f8485
1 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/action/upload.rs
View file

@ -292,27 +292,35 @@ impl<'a> Upload<'a> {
}
}
// Show the share URL
table.add_row(Row::new(vec![
Cell::new("Share link:"),
Cell::new(url.as_str()),
]));
// Show a generate passphrase
if password_generated {
table.add_row(Row::new(vec![
Cell::new("Passphrase:"),
Cell::new(&password.unwrap_or("?".into())),
]));
}
// Show the owner token
if matcher_main.verbose() {
// Show the share URL
table.add_row(Row::new(vec![
Cell::new("Share link:"),
Cell::new(url.as_str()),
]));
// Show a generate passphrase
if password_generated {
table.add_row(Row::new(vec![
Cell::new("Passphrase:"),
Cell::new(&password.unwrap_or("?".into())),
]));
}
// Show the owner token
table.add_row(Row::new(vec![
Cell::new("Owner token:"),
Cell::new(file.owner_token().unwrap()),
]));
} else {
table.add_row(Row::new(vec![Cell::new(url.as_str())]));
// Show a generate passphrase
if password_generated {
table.add_row(Row::new(vec![Cell::new(&password.unwrap_or("?".into()))]));
}
}
table.printstd();
} else {
println!("{}", url);