GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2026-02-03 04:21:53 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Refactor: refine writing strategy
Some checks are pending
Build / Build (push) Waiting to run
Details
Build / Diff output (push) Blocked by required conditions
Details
Build / Deploy to Cloudflare Pages (push) Blocked by required conditions
Details
Build / Deploy to GitHub and GitLab (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
SukkaW
2025-02-01 00:04:09 +08:00
parent 3926fb3484
commit 2035f5ea96
8 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Build/lib/rules/base.ts
View File

@@ -8,7 +8,7 @@ import { fastStringArrayJoin } from 'foxts/fast-string-array-join';
import { readFileByLine } from '../fetch-text-by-line';
import { asyncWriteToStream } from 'foxts/async-write-to-stream';
import type { BaseWriteStrategy } from '../writing-strategy/base';
import { merge } from 'fast-cidr-tools';
import { merge as mergeCidr } from 'fast-cidr-tools';
import { createRetrieKeywordFilter as createKeywordFilter } from 'foxts/retrie';
import path from 'node:path';
import { SurgeMitmSgmodule } from '../writing-strategy/surge';
@@ -369,10 +369,10 @@ export class FileOutput {
let ipcidr6NoResolve: string[] | null = null;
if (this.ipcidr.size) {
ipcidr = merge(Array.from(this.ipcidr), true);
ipcidr = mergeCidr(Array.from(this.ipcidr), true);
}
if (this.ipcidrNoResolve.size) {
ipcidrNoResolve = merge(Array.from(this.ipcidrNoResolve), true);
ipcidrNoResolve = mergeCidr(Array.from(this.ipcidrNoResolve), true);
}
if (this.ipcidr6.size) {
ipcidr6 = Array.from(this.ipcidr6);
@@ -433,9 +433,12 @@ export class FileOutput {
this.title,
this.description,
this.date,
strategy.type
? path.join(strategy.type, basename)
: basename
path.join(
strategy.outputDir,
strategy.type
? path.join(strategy.type, basename)
: basename
)
));
}
}