0.4.0: Edit alias type

Signed-off-by: Ivan Bushchik <ivabus@ivabus.dev>

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "urouter"
-version = "0.3.5"
+version = "0.4.0"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/ivabus/urouter"

README.md

@@ -17,17 +17,21 @@ Edit `alias.json` (or any other JSON file, check `--alias-file` option) and `car
 [
   {
     "uri": "uri",
-    "alias": "file"
+    "alias": {
+      "file":  "somefile"
+    }
   },
   {
     "uri": "uri2",
-    "alias": "http://example.com",
+    "alias": {
-    "is_url": true
+      "url": "http://example.com"
+    }
   },
   {
     "uri": "/",
-    "alias": "https://somecoolscript.sh",
+    "alias": {
-    "is_url": true,
+      "url": "https://somecoolscript.sh"
+    },
     "curl_only": true
   }
 ]

src/main.rs

@@ -27,6 +27,7 @@ extern crate rocket;
 
 use rocket::http::Status;
 use std::cell::OnceCell;
+use std::ffi::OsStr;
 use std::net::IpAddr;
 use std::path::PathBuf;
 
@@ -71,11 +72,20 @@ struct NixJson {
 #[derive(Deserialize, Clone, Debug)]
 struct Alias {
 	uri: String,
-	alias: String,
+	alias: AliasType,
-	is_url: Option<bool>,
 	curl_only: Option<bool>,
 }
 
+#[derive(Deserialize, Clone, Debug)]
+enum AliasType {
+	#[serde(alias = "url")]
+	Url(String),
+	#[serde(alias = "file")]
+	File(String),
+	#[serde(alias = "text")]
+	Text(String),
+}
+
 #[derive(Responder)]
 enum Response {
 	Text(RawText<String>),
@@ -103,12 +113,13 @@ impl<'r> FromRequest<'r> for UserAgent {
 fn get_return(alias: &Alias) -> Response {
 	let args = Args::parse();
 	let mut dir = args.dir.clone();
-	return match alias.is_url {
+	return match &alias.alias {
-		Some(true) => Response::Redirect(Redirect::to(alias.alias.clone())),
+		AliasType::Url(url) => Response::Redirect(Redirect::to(url.clone())),
-		_ => {
+		AliasType::File(path) => {
-			dir.push(&PathBuf::from(&alias.alias));
+			dir.push(&PathBuf::from(&path));
 			Response::Text(RawText(smurf::io::read_file_str(&dir).unwrap()))
 		}
+		AliasType::Text(text) => Response::Text(RawText(text.clone())),
 	};
 }
 
@@ -121,9 +132,7 @@ fn get_page(page: String, user_agent: UserAgent) -> Response {
 	let curl_check = user_agent.0.contains("curl");
 	for i in alias {
 		if i.uri == decoded_page {
-			if (i.curl_only == Some(true) && curl_check.clone())
+			if (i.curl_only == Some(true)) == curl_check.clone() {
-				|| (i.curl_only != Some(true) && !curl_check.clone())
-			{
 				return get_return(i);
 			};
 			pages.push(i);