starsswp/QuantumultX
1
0
Fork 0
mirror of https://github.com/KOP-XIAO/QuantumultX.git synced 2026-01-25 21:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
Shawn
2020-09-08 21:26:05 +08:00
parent 4daa23b293
commit 37e3dd9f7b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Scripts/resource-parser.js
View File

@@ -1,5 +1,5 @@
/** /**
☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧 ⟦2020-09-07 21:59⟧ ☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧 ⟦2020-09-08 21:59⟧
---------------------------------------------------------- ----------------------------------------------------------
🛠 发现 𝐁𝐔𝐆 请反馈: @Shawn_KOP_bot 🛠 发现 𝐁𝐔𝐆 请反馈: @Shawn_KOP_bot
⛳️ 关注 🆃🅶 相关频道: https://t.me/QuanX_API ⛳️ 关注 🆃🅶 相关频道: https://t.me/QuanX_API
@@ -189,7 +189,7 @@ if (type0 == "Subs-B64Encode") {
total = total.join("\n") total = total.join("\n")
} else if (type0 == "Rule") { // rule 类型, 已处理完毕 } else if (type0 == "Rule") { // rule 类型, 已处理完毕
flag = 3; flag = 3;
total = Rule_Handle(content0.split("\n"), Pout0, Pin0); total = Rule_Handle(content0.split("\n"), Pout0, Pin0).filter(Boolean);
if (Preg && total.length!=0) { // 正则筛选规则 filter if (Preg && total.length!=0) { // 正则筛选规则 filter
total = total.map(Regex).filter(Boolean).join("\n") total = total.map(Regex).filter(Boolean).join("\n")
if (Preplace) { total = ReplaceReg(total, Preplace) } if (Preplace) { total = ReplaceReg(total, Preplace) }
@@ -577,7 +577,7 @@ function Rule_Handle(subs, Pout, Pin) {
if (Tout != "" && Tout != null) { // 有 out 参数时 if (Tout != "" && Tout != null) { // 有 out 参数时
var dlist = []; var dlist = [];
for (var i = 0; i < cnt.length; i++) { for (var i = 0; i < cnt.length; i++) {
cc = cnt[i].indexOf(" - ") != -1? cnt[i].split(" - ")[1].trim() : cnt[i].trim() cc = cnt[i].trim().replace(/^\s*\-/g,"")
const exclude = (item) => cc.indexOf(item) != -1; // 删除项 const exclude = (item) => cc.indexOf(item) != -1; // 删除项
const RuleCheck = (item) => cc.indexOf(item) != -1; //无视注释行 const RuleCheck = (item) => cc.indexOf(item) != -1; //无视注释行
if (Tout.some(exclude) && !RuleK.some(RuleCheck)) { if (Tout.some(exclude) && !RuleK.some(RuleCheck)) {
@@ -616,7 +616,7 @@ function Rule_Handle(subs, Pout, Pin) {
} else if (Tin != "" && Tin != null) { //if Tout } else if (Tin != "" && Tin != null) { //if Tout
var dlist = []; var dlist = [];
for (var i = 0; i < cnt.length; i++) { for (var i = 0; i < cnt.length; i++) {
cc = cnt[i].indexOf(" - ") != -1? cnt[i].split(" - ")[1].trim() : cnt[i].trim() cc = cnt[i].trim().replace(/^\s*\-/g,"")
const RuleCheck = (item) => cc.indexOf(item) != -1; //无视注释行 const RuleCheck = (item) => cc.indexOf(item) != -1; //无视注释行
if (!RuleK.some(RuleCheck) && cc) { //if Pout.some, 不操作注释项 if (!RuleK.some(RuleCheck) && cc) { //if Pout.some, 不操作注释项
dd = Rule_Policy(cc); dd = Rule_Policy(cc);
@@ -639,7 +639,7 @@ function Rule_Handle(subs, Pout, Pin) {
} }
function Rule_Policy(content) { //增加、替换 policy function Rule_Policy(content) { //增加、替换 policy
var cnt = content.replace(/ - /g,"").trim().split(","); var cnt = content.replace(/^\s*\-/g,"").trim().split(",");
var RuleK = ["//", "#", ";"]; var RuleK = ["//", "#", ";"];
var RuleK1 = ["host", "domain", "ip-cidr", "geoip", "user-agent", "ip6-cidr"]; var RuleK1 = ["host", "domain", "ip-cidr", "geoip", "user-agent", "ip6-cidr"];
const RuleCheck = (item) => cnt[0].toLowerCase().indexOf(item) != -1; //无视注释行 const RuleCheck = (item) => cnt[0].toLowerCase().indexOf(item) != -1; //无视注释行