feat: 函数优化和单侧用例编写

Author: LOG1997

Cargo.lock

@@ -4,5 +4,6 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
+addr = "0.15.6"
 git2 = "0.20.4"
 webbrowser = "1.2.0"

Cargo.toml

@@ -1,13 +1,28 @@
+use addr::parse_domain_name;
 use git2::Repository;
+use std::net::IpAddr;
+
+#[derive(Debug, PartialEq)]
+pub enum AddressType {
+    IpAddress,
+    DomainName,
+    Invalid,
+}
 /// 获取当前 Git 仓库的远程仓库 URL（默认 origin）
 pub fn get_git_remote_url() -> Option<String> {
     let repo = Repository::open_from_env().ok()?;
     let remote = repo.find_remote("origin").ok()?;
     remote.url().map(|s| s.to_string())
 }
-// 判断是否数字ip地址
-pub fn is_number_ip(ip: &str) -> bool {
-    ip.chars().all(|c| c.is_ascii_digit())
+// 获取域名类型
+pub fn get_domain_type(s: &str) -> AddressType {
+    let domain = parse_domain_name(s);
+    if domain.is_ok() && domain.unwrap().has_known_suffix() {
+        return AddressType::DomainName;
+    } else if s.parse::<IpAddr>().is_ok() {
+        return AddressType::IpAddress;
+    }
+    AddressType::Invalid
 }
 // 格式化url为https开头
 pub fn format_git_url(url: String) -> String {
@@ -17,10 +32,10 @@ pub fn format_git_url(url: String) -> String {
     if result_url.starts_with(prefix) {
         let without_git = &result_url[4..];
         if let Some((domain, path)) = without_git.split_once(':') {
-            let http_prefix = if is_number_ip(domain) {
-                "http://"
-            } else {
-                "https://"
+            let http_prefix = match get_domain_type(domain) {
+                AddressType::DomainName => "https://",
+                AddressType::IpAddress => "http://",
+                AddressType::Invalid => "",
             };
             result_url = format!("{}{}/{}", http_prefix, domain, path);
         }

src/format.rs

@@ -0,0 +1,4 @@
+// src/lib.rs
+// 只在这里定义一次！
+pub mod format;
+pub mod operate;

src/lib.rs

@@ -1,7 +1,8 @@
-mod format;
-mod operate;
-use crate::format::{format_git_url, get_git_remote_url};
-use crate::operate::open_in_browser;
+use opengit::{
+    format::{format_git_url, get_git_remote_url},
+    operate::open_in_browser,
+};
+
 fn main() {
     let remote_url = get_git_remote_url();
     if remote_url.is_none() {

src/main.rs

@@ -1,9 +1,15 @@
 use webbrowser;
 // 使用默认浏览器打开当前链接
-pub fn open_in_browser(url: String) {
+pub fn open_in_browser(url: String) -> Option<String> {
     let result = webbrowser::open(&url);
     match result {
-        Ok(_) => println!("已打开git远程仓库链接:{}", url),
-        Err(e) => eprintln!("无法打开: {}", e),
+        Ok(_) => {
+            println!("already open git url:{}", url);
+            Some(url)
+        }
+        Err(e) => {
+            eprintln!("sorry: {}", e);
+            None
+        }
     }
 }

src/operate.rs

@@ -0,0 +1,73 @@
+use opengit::format::{AddressType, format_git_url, get_domain_type, get_git_remote_url};
+
+#[test]
+fn domain_type_test() {
+    let input = "github.com";
+    let expected = AddressType::DomainName;
+    assert_eq!(get_domain_type(input), expected);
+}
+#[test]
+fn ip_type_test() {
+    let input = "192.168.1.1";
+    let expected = AddressType::IpAddress;
+    assert_eq!(get_domain_type(input), expected);
+}
+#[test]
+fn invalid_domain_type_test1() {
+    let input = "localhost";
+    let expected = AddressType::Invalid;
+    assert_eq!(get_domain_type(input), expected);
+}
+#[test]
+fn invalid_domain_type_test2() {
+    let input = "192-189-11-111";
+    let expected = AddressType::Invalid;
+    assert_eq!(get_domain_type(input), expected);
+}
+#[test]
+fn invalid_domain_type_test3() {
+    let input = "255.255.255.259";
+    let expected = AddressType::Invalid;
+    assert_eq!(get_domain_type(input), expected);
+}
+
+#[test]
+fn format_git_url_https_test() {
+    let input = "https://github.com/log1997/opengit.git".to_string();
+    let expected = "https://github.com/log1997/opengit";
+    assert_eq!(format_git_url(input), expected);
+}
+
+#[test]
+fn format_git_url_git_test() {
+    let input = "git@github.com:log1997/opengit.git".to_string();
+    let expected = "https://github.com/log1997/opengit";
+    assert_eq!(format_git_url(input), expected);
+}
+
+#[test]
+fn format_git_url_gitee_test() {
+    let input = "https://gitee.com/log1997/opengit.git".to_string();
+    let expected = "https://gitee.com/log1997/opengit";
+    assert_eq!(format_git_url(input), expected);
+}
+
+#[test]
+fn format_git_url_no_git_test() {
+    let input = "https://gitee.com/log1997/opengit".to_string();
+    let expected = "https://gitee.com/log1997/opengit";
+    assert_eq!(format_git_url(input), expected);
+}
+
+#[test]
+fn format_git_url_number_ip_test() {
+    let input = "git@10.2.3.12:log1997/opengit.git".to_string();
+    let expected = "http://10.2.3.12/log1997/opengit";
+    assert_eq!(format_git_url(input), expected);
+}
+
+#[test]
+fn get_git_remote_url_test() {
+    let expected = "git@github.com:LOG1997/opengit.git";
+    assert_eq!(get_git_remote_url(), Some(expected.to_string()));
+}

tests/test_format.rs

@@ -0,0 +1,9 @@
+use opengit::operate::open_in_browser;
+
+#[test]
+#[ignore]
+fn open_in_browser_test() {
+    let input = "https://github.com/log1997/opengit";
+    let expected = Some(input.to_string());
+    assert_eq!(open_in_browser(input.to_string()), expected);
+}