From 657ec8af9901c6af4486721a4877874972fa9fd9 Mon Sep 17 00:00:00 2001
From: Keivan-sf <keyvan0082@gmail.com>
Date: Sun, 27 Jul 2025 16:27:11 +0330
Subject: [PATCH] Improve command line interface

---
 README.md   | 15 +++++++-------
 src/main.rs | 60 +++++++++++++++++++++++++++++++++++++----------------
 2 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 809eab1..c5afe1b 100644
--- a/README.md
+++ b/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>
-      --httpport <httpport>
-  -h, --help                   Print help
-  -V, --version                Print version
+      --socksport <PORT>  Optional SOCKS proxy port for inbound
+      --httpport <PORT>   Optional HTTP proxy port for inbound
+      --get-name          Only print the config name
+  -h, --help              Print help
+  -V, --version           Print version
 ```
diff --git a/src/main.rs b/src/main.rs
index f545a5e..4028e3e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,26 +1,50 @@
-mod parser;
-use clap::Parser;
+use clap::{value_parser, Arg, Command};
 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();
-    if cli.get_name == Some(true) {
-        print!("{}", parser::get_name(&cli.uri));
+    let matches = Command::new("v2ray-uri-parser")
+        .version("0.1.1")
+        .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);
 }