style: update

Author: ReaJason

conf/config.toml

@@ -6,6 +6,7 @@ fast_mode = false
 # 支持本地地址（绝对地址）/User/xxx/xx.yml
 # 支持单个订阅链接，ss://xxx
 subs = [
+    "https://sub.reajason.eu.org/clash.yaml"
 ]
 
 # 是否重命名节点，打开后会使用 geoip 等方式进行代理真实 IP 和地理地址查询
@@ -16,30 +17,20 @@ rename_pattern = "${COUNTRYCODE}_${CITY}_${ISP}"
 need_add_pool = false
 # 代理节点池
 pools = [
-    "https://rvps.duckking.shop:26720/s/clashMeta/764ed3a1a918ee05994ba37a1340ca29",
-#    "https://sub.tgzdyz2.xyz/sub",
-    "https://raw.githubusercontent.com/yebekhe/TVC/main/subscriptions/meta/mix",
-    "https://raw.githubusercontent.com/Ruk1ng001/freeSub/main/clash.yaml",
-    "https://raw.githubusercontent.com/anaer/Sub/main/clash.yaml",
-    "https://raw.githubusercontent.com/Misaka-blog/chromego_merge/main/sub/base64.txt",
-    "https://raw.githubusercontent.com/vxiaov/free_proxies/main/clash/clash.provider.yaml",
+    "https://sub.ss5.xyz/",
+    "https://igdux.top/~Clash",
+    #    "https://sub.tgzdyz2.xyz/sub",
+    "https://raw.githubusercontent.com/Ruk1ng001/freeSub/main/clash.yaml"
 ]
 
-
 # 连通性测试
 [connect_test]
-url = "http://www.gstatic.com/generate_204"
+url = "http://www.google.com/generate_204"
 expected = 204
 timeout = 500
 
 # 带宽测速配置
 [speed_test]
 enabled = false
 url = "https://speed.cloudflare.com/__down?bytes=104857600"
-timeout = 3000
-
-# 网站测试配置
-[websites.google]
-url = "http://www.google.com/generate_204"
-expected = 204
-timeout = 500
+timeout = 3000

proxrs/src/protocol/vless.rs

@@ -124,7 +124,7 @@ impl ProxyAdapter for Vless {
         };
 
         if name.is_empty() {
-            name = server.clone().to_owned() + port.to_string().as_str();
+            name = server.to_owned() + port.to_string().as_str();
         }
 
         Ok(Vless {

proxrs/src/sub.rs

@@ -407,7 +407,9 @@ mod test {
     #[tokio::test]
     async fn test_merge_config() {
         let urls = vec![
-            "https://raw.githubusercontent.com/snakem982/proxypool/main/source/clash-meta.yaml".to_string()];
+            "https://raw.githubusercontent.com/snakem982/proxypool/main/source/clash-meta.yaml"
+                .to_string(),
+        ];
         let proxies = SubManager::get_proxies_from_urls(&urls).await;
         let release_clash_template_path =
             "/Users/reajason/RustroverProjects/clash-butler/conf/clash_release.yaml".to_string();

src/main.rs

@@ -208,9 +208,11 @@ async fn run(config: Settings) {
             let mut i = 0;
             while i < nodes.len() {
                 let node = &nodes[i];
-                // 如果当前节点名称与需要重命名的格式下划线个数一致，暂时认为就是已经格式化好的，
-                // 因此跳过
-                if node.matches('_').count() == count && !node.contains("github.com") {
+                // 如果当前节点名称与需要重命名的格式下划线个数一致，暂时认为就是已经格式化好的
+                if node.matches('_').count() == count
+                    && !node.contains("github.com")
+                    && !node.contains("WangCai")
+                {
                     info!("「{}」已符合重命名结构，跳过", node);
                     i += 1;
                     continue;