parsing !<str> tags correctly when load yaml

ohaoz · Jul 16, 2024 · 98e03e8 · 98e03e8
1 parent 75f633f
commit 98e03e8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/subscribe/airport.py b/subscribe/airport.py
@@ -693,7 +693,7 @@ def clean_text(document: str) -> str:
                     reader.seek(0, 0)
                     yaml.add_multi_constructor(
                         "str",
-                        lambda loader, suffix, node: None,
+                        lambda loader, suffix, node: str(node.value),
                         Loader=yaml.SafeLoader,
                     )
                     config = yaml.load(reader, Loader=yaml.SafeLoader)
@@ -715,7 +715,7 @@ def clean_text(document: str) -> str:
                 text = clean_text(document=text)
                 nodes = yaml.load(text, Loader=yaml.SafeLoader).get("proxies", [])
             except yaml.constructor.ConstructorError:
-                yaml.add_multi_constructor("str", lambda loader, suffix, node: None, Loader=yaml.SafeLoader)
+                yaml.add_multi_constructor("str", lambda loader, suffix, node: str(node.value), Loader=yaml.SafeLoader)
                 nodes = yaml.load(text, Loader=yaml.FullLoader).get("proxies", [])
             except Exception as e:
                 if throw:

diff --git a/subscribe/crawl.py b/subscribe/crawl.py
@@ -1268,7 +1268,7 @@ def check_status(
         try:
             proxies = yaml.load(content, Loader=yaml.SafeLoader).get("proxies", [])
         except ConstructorError:
-            yaml.add_multi_constructor("str", lambda loader, suffix, node: None, Loader=yaml.SafeLoader)
+            yaml.add_multi_constructor("str", lambda loader, suffix, node: str(node.value), Loader=yaml.SafeLoader)
             proxies = yaml.load(content, Loader=yaml.FullLoader).get("proxies", [])
         except:
             proxies = []

diff --git a/subscribe/process.py b/subscribe/process.py
@@ -542,6 +542,7 @@ def aggregate(args: argparse.Namespace) -> None:
         push_conf = group_configs.get(k, {})
         target = utils.trim(push_conf.get("target", "")) or "clash"
         mixed = target in ["v2ray", "mixed"]
+        emoji = push_conf.get("emoji", True)
 
         regularize = push_conf.get("regularize", {})
         if regularize and isinstance(regularize, dict) and regularize.get("enable", False):
@@ -579,7 +580,7 @@ def aggregate(args: argparse.Namespace) -> None:
             if os.path.exists(generate_conf) and os.path.isfile(generate_conf):
                 os.remove(generate_conf)
 
-            success = subconverter.generate_conf(generate_conf, artifact, source_file, dest_file, target)
+            success = subconverter.generate_conf(generate_conf, artifact, source_file, dest_file, target, emoji)
             if not success:
                 logger.error(f"cannot generate subconverter config file, group=[{k}]")
                 continue

diff --git a/tools/clean.py b/tools/clean.py
@@ -42,8 +42,9 @@ def main(args: argparse.Namespace) -> None:
         try:
             nodes = yaml.load(f, Loader=yaml.SafeLoader).get("proxies", [])
         except yaml.constructor.ConstructorError:
-            yaml.add_multi_constructor("str", lambda loader, suffix, node: None, Loader=yaml.SafeLoader)
-            nodes = yaml.load(f, Loader=yaml.FullLoader).get("proxies", [])
+            f.seek(0, 0)
+            yaml.add_multi_constructor("str", lambda loader, suffix, node: str(node.value), Loader=yaml.SafeLoader)
+            nodes = yaml.load(f, Loader=yaml.SafeLoader).get("proxies", [])
         except:
             nodes = []
 

diff --git a/tools/filter.py b/tools/filter.py
@@ -292,7 +292,7 @@ def process(
         try:
             nodes = yaml.load(f, Loader=yaml.SafeLoader).get("proxies", [])
         except yaml.constructor.ConstructorError:
-            yaml.add_multi_constructor("str", lambda loader, suffix, node: None, Loader=yaml.SafeLoader)
+            yaml.add_multi_constructor("str", lambda loader, suffix, node: str(node.value), Loader=yaml.SafeLoader)
             nodes = yaml.load(f, Loader=yaml.FullLoader).get("proxies", [])
 
     proxies = [x for x in nodes if x.get("name", "") not in names]