DeCarabas/fwd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor in prep for clip

Browse source
This commit is contained in:
John Doty 2024-06-22 07:32:11 -07:00
parent 3f7afc5b78
commit 3eba65f6e6
8 changed files with 101 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main.rs
View file

@ -5,7 +5,7 @@ const VERSION: &str = env!("CARGO_PKG_VERSION");
fn usage() {
println!(indoc! {"
usage: fwd [options] (<server> | browse <url>)
usage: fwd [options] (<server> | browse <url> | clip [<file>])
To connect a client to a server that has an `fwd` installed in its path, run
`fwd <server>` on the client, where <server> is the name of the server to
@ -60,9 +60,13 @@ fn parse_args(args: Vec<String>) -> Args {
} else {
Args::Error
}
} else if rest.len() > 1 && rest[0] == "browse" {
if rest.len() == 2 {
Args::Browse(rest[1].to_string())
} else if rest.len() > 1 {
if rest[0] == "browse" {
if rest.len() == 2 {
Args::Browse(rest[1].to_string())
} else {
Args::Error
}
} else {
Args::Error
}
@ -73,6 +77,14 @@ fn parse_args(args: Vec<String>) -> Args {
}
}
async fn browse_url(url: &str) {
if let Err(e) = fwd::browse_url(&url).await {
eprintln!("Unable to open {url}");
eprintln!("{}", e);
std::process::exit(1);
}
}
#[tokio::main]
async fn main() {
match parse_args(std::env::args().collect()) {
@ -86,7 +98,7 @@ async fn main() {
fwd::run_server().await;
}
Args::Browse(url) => {
fwd::browse_url(&url).await;
browse_url(&url).await;
}
Args::Client(server, sudo) => {
fwd::run_client(&server, sudo).await;