修复分流解析错误的问题

This commit is contained in:
Peng-YM 2020-11-27 16:26:41 +08:00
parent 1398782595
commit 18164a0c7d
3 changed files with 12 additions and 8 deletions

View File

@ -2643,13 +2643,15 @@ var RuleUtils = (function () {
const parse = (raw) => {
const lines = raw.split("\n");
for (let i = 0; i < lines.length; i++) {
lines[i] = lines[i]
.replace(/host-suffix/i, "DOMAIN-SUFFIX")
.replace(/host-keyword/i, "DOMAIN-KEYWORD")
let type = lines[i].split(",")[0];
type = type
.replace(/host/i, "DOMAIN")
.replace(/-suffix/, "-SUFFIX")
.replace(/-keyword/, "-KEYWORD")
.replace("ip-cidr", "IP-CIDR")
.replace(/ip6-cidr/i, "IP-CIDR6")
.replace("user-agent", "USER-AGENT");
lines[i] = type + "," + lines[i].split(",")[1];
}
return SurgeRuleSet().parse(lines.join("\n"));
};

File diff suppressed because one or more lines are too long

View File

@ -2054,13 +2054,15 @@ var RuleUtils = (function () {
const parse = (raw) => {
const lines = raw.split("\n");
for (let i = 0; i < lines.length; i++) {
lines[i] = lines[i]
.replace(/host-suffix/i, "DOMAIN-SUFFIX")
.replace(/host-keyword/i, "DOMAIN-KEYWORD")
let type = lines[i].split(",")[0];
type = type
.replace(/host/i, "DOMAIN")
.replace(/-suffix/, "-SUFFIX")
.replace(/-keyword/, "-KEYWORD")
.replace("ip-cidr", "IP-CIDR")
.replace(/ip6-cidr/i, "IP-CIDR6")
.replace("user-agent", "USER-AGENT");
lines[i] = type + "," + lines[i].split(",")[1];
}
return SurgeRuleSet().parse(lines.join("\n"));
};