Improve command line interface

README.md

@@ -4,16 +4,17 @@ V2ray URI parser for xray core
 Currently supports: `vless`
 
 ```
-V2ray URI parser
+Parses V2ray URI and generates JSON config for xray
 
-Usage: v2parser [OPTIONS] <URI>
+Usage: v2parser [OPTIONS] <uri>
 
 Arguments:
-  <URI>
+  <uri>  V2ray URI to parse
 
 Options:
-      --socksport <socksport>
+      --socksport <PORT>  Optional SOCKS proxy port for inbound
-      --httpport <httpport>
+      --httpport <PORT>   Optional HTTP proxy port for inbound
-  -h, --help                   Print help
+      --get-name          Only print the config name
-  -V, --version                Print version
+  -h, --help              Print help
+  -V, --version           Print version
 ```

src/main.rs

@@ -1,26 +1,50 @@
-mod parser;
+use clap::{value_parser, Arg, Command};
-use clap::Parser;
 pub mod config_models;
+mod parser;
 pub mod utils;
 
-#[derive(Parser)]
-#[command(author ,version = "0.1.1", about = "V2ray URI parser", long_about = None)]
-struct Cli {
-    uri: String,
-    #[arg(long, value_name = "socksport")]
-    socksport: Option<u16>,
-    #[arg(long, value_name = "httpport")]
-    httpport: Option<u16>,
-    #[arg(long, action = clap::ArgAction::SetTrue, value_name = "get-name")]
-    get_name: Option<bool>,
-}
-
 fn main() {
-    let cli = Cli::parse();
+    let matches = Command::new("v2ray-uri-parser")
-    if cli.get_name == Some(true) {
+        .version("0.1.1")
-        print!("{}", parser::get_name(&cli.uri));
+        .about("Parses V2ray URI and generates JSON config for xray")
+        .arg(
+            Arg::new("uri")
+                .help("V2ray URI to parse")
+                .required(true)
+                .index(1),
+        )
+        .arg(
+            Arg::new("socksport")
+                .long("socksport")
+                .help("Optional SOCKS proxy port for inbound")
+                .value_name("PORT")
+                .value_parser(value_parser!(u16)),
+        )
+        .arg(
+            Arg::new("httpport")
+                .long("httpport")
+                .help("Optional HTTP proxy port for inbound")
+                .value_name("PORT")
+                .value_parser(value_parser!(u16)),
+        )
+        .arg(
+            Arg::new("get_name")
+                .long("get-name")
+                .help("Only print the config name")
+                .action(clap::ArgAction::SetTrue),
+        )
+        .get_matches();
+
+    let uri = matches.get_one::<String>("uri").unwrap();
+    let socksport = matches.get_one::<u16>("socksport").copied();
+    let httpport = matches.get_one::<u16>("httpport").copied();
+    let get_name = matches.get_flag("get_name");
+
+    if get_name {
+        print!("{}", parser::get_name(uri));
         return;
     }
-    let json_config = parser::create_json_config(&cli.uri, cli.socksport, cli.httpport);
+
+    let json_config = parser::create_json_config(uri, socksport, httpport);
     println!("{}", json_config);
 }