pymecli 0.6.7__tar.gz → 0.6.8__tar.gz

{pymecli-0.6.7 → pymecli-0.6.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pymecli
-Version: 0.6.7
+Version: 0.6.8
 Summary: My CLI
 Project-URL: Homepage, https://pypi.org/project/pymecli
 Project-URL: Repository, https://github.com/meme2046/pymecli

{pymecli-0.6.7 → pymecli-0.6.8}/core/clash.py

@@ -7,7 +7,9 @@ from fastapi import Depends
 
 module_dir = Path(__file__).resolve().parent.parent
 
-TEMPLATE_URL = "https://raw.githubusercontent.com/meme2046/data/main/clash/template.yaml"
+TEMPLATE_URL = (
+    "https://raw.githubusercontent.com/meme2046/data/main/clash/template.yaml"
+)
 
 # 白名单模式最终规则
 WHITELIST_RULES = [
@@ -52,7 +54,9 @@ class ClashYamlGenerator:
 
     # ---------- 通用 helpers ----------
 
-    def _dedupe_proxy_names(self, existing_proxies: list, new_proxies: list, suffix: str = "_custom") -> list:
+    def _dedupe_proxy_names(
+        self, existing_proxies: list, new_proxies: list, suffix: str = "_custom"
+    ) -> list:
         """对 new_proxies 里与 existing_proxies 重名的节点改名加后缀。
 
         例：已有 "lighthouse"，custom 也有 "lighthouse" → 改名为 "lighthouse_custom"
@@ -123,10 +127,10 @@ class ClashYamlGenerator:
     def _add_inline_rule_providers(self, template, proxies):
         """从 my_rule_base_url 拉取 inline 规则集并写入 template"""
         rule_list = [
-            [f"{self.my_rule_base_url}/direct.yaml", "DIRECT"],
+            [f"{self.my_rule_base_url}/reject.yaml", "REJECT"],
             [f"{self.my_rule_base_url}/proxy.yaml", "全局选择"],
             [f"{self.my_rule_base_url}/round.yaml", "轮询"],
-            [f"{self.my_rule_base_url}/reject.yaml", "REJECT"],
+            [f"{self.my_rule_base_url}/direct.yaml", "DIRECT"],
         ]
         for url, target in rule_list:
             response = requests.get(url, proxies=proxies)
@@ -268,25 +272,6 @@ class ClashYamlGenerator:
 
     def _add_base_rules(self, template, with_dst_port=False):
         """IP-CIDR / DOMAIN 基础规则(genPB / genB),genB 含饥荒端口"""
-        # template["rules"].extend(
-        #     [
-        #         "IP-CIDR,192.168.0.0/16,DIRECT,no-resolve",
-        #         "IP-CIDR,10.0.0.0/8,DIRECT,no-resolve",
-        #         "IP-CIDR,172.16.0.0/12,DIRECT,no-resolve",
-        #         "IP-CIDR,127.0.0.0/8,DIRECT,no-resolve",
-        #     ]
-        # )
-        # if with_dst_port:
-        #     template["rules"].extend(
-        #         [
-        #             "DST-PORT,10999,DIRECT",
-        #             "DST-PORT,10998,DIRECT",
-        #             "DST-PORT,27016,DIRECT",
-        #             "DST-PORT,27017,DIRECT",
-        #             "DST-PORT,8766,DIRECT",
-        #             "DST-PORT,8767,DIRECT",
-        #         ]
-        #     )
         template["rules"].extend(
             [
                 "DOMAIN,clash.razord.top,DIRECT",
@@ -303,7 +288,9 @@ class ClashYamlGenerator:
         template = self._load_template(proxies)
 
         has_custom = bool(custom_proxies)
-        template["proxy-groups"].extend(self._provider_proxy_groups(sub_list, has_custom))
+        template["proxy-groups"].extend(
+            self._provider_proxy_groups(sub_list, has_custom)
+        )
 
         subs, userinfo = self._fetch_subscriptions(sub_list, proxies)
         for item, ps in subs:
@@ -339,7 +326,9 @@ class ClashYamlGenerator:
         template = self._load_template(proxies)
 
         has_custom = bool(custom_proxies)
-        template["proxy-groups"].extend(self._provider_proxy_groups(sub_list, has_custom))
+        template["proxy-groups"].extend(
+            self._provider_proxy_groups(sub_list, has_custom)
+        )
 
         subs, userinfo = self._fetch_subscriptions(sub_list, proxies)
         for item, ps in subs:

{pymecli-0.6.7 → pymecli-0.6.8}/pyproject.toml

@@ -39,7 +39,7 @@
   name = "pymecli"
   readme = "README.md"
   requires-python = ">=3.10"
-  version = "0.6.7"
+  version = "0.6.8"
 
 [project.urls]
   Homepage = "https://pypi.org/project/pymecli"