From 8560e8a37a5135fbbca81df6af30b33928e25b52 Mon Sep 17 00:00:00 2001
From: spikecodes <19519553+spikecodes@users.noreply.github.com>
Date: Thu, 18 Feb 2021 11:49:50 -0800
Subject: [PATCH] Add "port" command line argument

---
 README.md    |  3 ++-
 src/main.rs  | 20 +++++++++++++++-----
 src/utils.rs |  5 +----
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 832ab98..f143323 100644
--- a/README.md
+++ b/README.md
@@ -193,7 +193,8 @@ libreddit
 
 | Short | Long               | Example                           |
 |-------|--------------------|-----------------------------------|
-| `-a`  | `--address`        | `libreddit --adress=0.0.0.0:8111` |
+| `-a`  | `--address`        | `libreddit --adress=0.0.0.0`      |
+| `-p`  | `--port`           | `libreddit --port=3030`           |
 | `-r`  | `--redirect-https` | `libreddit --redirect-https`      |
 
 ## Building
diff --git a/src/main.rs b/src/main.rs
index a9af4db..ee45a9d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -111,7 +111,16 @@ async fn main() -> tide::Result<()> {
 				.long("address")
 				.value_name("ADDRESS")
 				.help("Sets address to listen on")
-				.default_value("0.0.0.0:8080")
+				.default_value("0.0.0.0")
+				.takes_value(true),
+		)
+		.arg(
+			Arg::with_name("port")
+				.short("p")
+				.long("port")
+				.value_name("PORT")
+				.help("Port to listen on")
+				.default_value("8080")
 				.takes_value(true),
 		)
 		.arg(
@@ -123,13 +132,14 @@ async fn main() -> tide::Result<()> {
 		)
 		.get_matches();
 
-	let address = matches.value_of("address").unwrap_or("0.0.0.0:8080");
+	let address = matches.value_of("address").unwrap_or("0.0.0.0");
+	let port = matches.value_of("port").unwrap_or("8080");
 	let force_https = matches.is_present("redirect-https");
 
-	dbg!(&force_https);
+	let listener = format!("{}:{}", address, port);
 
 	// Start HTTP server
-	println!("Running Libreddit v{} on {}!", env!("CARGO_PKG_VERSION"), &address);
+	println!("Running Libreddit v{} on {}!", env!("CARGO_PKG_VERSION"), &listener);
 
 	let mut app = tide::new();
 
@@ -224,6 +234,6 @@ async fn main() -> tide::Result<()> {
 	// Default service in case no routes match
 	app.at("*").get(|_| error("Nothing here".to_string()));
 
-	app.listen(address).await?;
+	app.listen(listener).await?;
 	Ok(())
 }
diff --git a/src/utils.rs b/src/utils.rs
index 922f9ef..f61177b 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -194,10 +194,7 @@ pub fn format_url(url: &str) -> String {
 
 				match re.captures(url) {
 					Some(caps) => format!("/vid/{}/{}", &caps[1], &caps[2]),
-					None => {
-						dbg!(url);
-						String::new()
-					}
+					None => String::new()
 				}
 			}
 			_ => format!("/proxy/{}/", encode(url).as_str()),