Fixed a bug in parsing subscription result

2dust · 2dust · commit 120e8d068615 · 2025-08-16T20:05:56.000+08:00
2dust#7734
diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -1412,6 +1412,11 @@ private static async Task<int> AddBatchServers4Custom(Config config, string strD
         {
             profileItem = V2rayFmt.ResolveFull(strData, subRemarks);
         }
+        //Is Html Page
+        if (profileItem is null && HtmlPageFmt.IsHtmlPage(strData))
+        {
+            return -1;
+        }
         //Is Clash configuration
         if (profileItem is null)
         {
diff --git a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
@@ -220,14 +220,7 @@ protected static int ResolveStdTransport(NameValueCollection query, ref ProfileI
 
     protected static bool Contains(string str, params string[] s)
     {
-        foreach (var item in s)
-        {
-            if (str.Contains(item, StringComparison.OrdinalIgnoreCase))
-            {
-                return true;
-            }
-        }
-        return false;
+        return s.All(item => str.Contains(item, StringComparison.OrdinalIgnoreCase));
     }
 
     protected static string WriteAllText(string strData, string ext = "json")
diff --git a/v2rayN/ServiceLib/Handler/Fmt/HtmlPageFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/HtmlPageFmt.cs
@@ -0,0 +1,11 @@
+using SkiaSharp;
+
+namespace ServiceLib.Handler.Fmt;
+
+public class HtmlPageFmt : BaseFmt
+{
+    public static bool IsHtmlPage(string strData)
+    {
+        return Contains(strData, "<html", "<!doctype html", "<head");
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1412,6 +1412,11 @@ private static async Task<int> AddBatchServers4Custom(Config config, string strD`
`1412`	`1412`	`{`
`1413`	`1413`	`profileItem = V2rayFmt.ResolveFull(strData, subRemarks);`
`1414`	`1414`	`}`
	`1415`	`+ //Is Html Page`
	`1416`	`+ if (profileItem is null && HtmlPageFmt.IsHtmlPage(strData))`
	`1417`	`+ {`
	`1418`	`+ return -1;`
	`1419`	`+ }`
`1415`	`1420`	`//Is Clash configuration`
`1416`	`1421`	`if (profileItem is null)`
`1417`	`1422`	`{`
Original file line number	Diff line number	Diff line change
`@@ -220,14 +220,7 @@ protected static int ResolveStdTransport(NameValueCollection query, ref ProfileI`
`220`	`220`
`221`	`221`	`protected static bool Contains(string str, params string[] s)`
`222`	`222`	`{`
`223`		`- foreach (var item in s)`
`224`		`- {`
`225`		`- if (str.Contains(item, StringComparison.OrdinalIgnoreCase))`
`226`		`- {`
`227`		`- return true;`
`228`		`- }`
`229`		`- }`
`230`		`- return false;`
	`223`	`+ return s.All(item => str.Contains(item, StringComparison.OrdinalIgnoreCase));`
`231`	`224`	`}`
`232`	`225`
`233`	`226`	`protected static string WriteAllText(string strData, string ext = "json")`