From d4ee25e75a29be834e38843470042893c0075e0d Mon Sep 17 00:00:00 2001 From: SukkaW Date: Sun, 8 Sep 2024 00:15:57 +0800 Subject: [PATCH] Chore: remove outdated files --- Build/build-apple-cdn.ts | 30 +++++++++--------------------- Build/build-common.ts | 22 ---------------------- Build/build-deprecate-files.ts | 17 +++++++++++++++-- Build/index.ts | 4 +--- Source/domainset/steam.conf | 1 - 5 files changed, 25 insertions(+), 49 deletions(-) diff --git a/Build/build-apple-cdn.ts b/Build/build-apple-cdn.ts index 8e7183d8..2fc3c5af 100644 --- a/Build/build-apple-cdn.ts +++ b/Build/build-apple-cdn.ts @@ -32,27 +32,15 @@ export const buildAppleCdn = task(require.main === module, __filename)(async (sp ' - https://github.com/felixonmars/dnsmasq-china-list' ]; - const ruleset = res.map(domain => `DOMAIN-SUFFIX,${domain}`); const domainset = res.map(i => `.${i}`); - return Promise.all([ - createRuleset( - span, - 'Sukka\'s Ruleset - Apple CDN', - description, - new Date(), - ruleset, - 'ruleset', - output('apple_cdn', 'non_ip') - ), - createRuleset( - span, - 'Sukka\'s Ruleset - Apple CDN', - description, - new Date(), - domainset, - 'domainset', - output('apple_cdn', 'domainset') - ) - ]); + return createRuleset( + span, + 'Sukka\'s Ruleset - Apple CDN', + description, + new Date(), + domainset, + 'domainset', + output('apple_cdn', 'domainset') + ); }); diff --git a/Build/build-common.ts b/Build/build-common.ts index a5e730a2..c075f524 100644 --- a/Build/build-common.ts +++ b/Build/build-common.ts @@ -10,11 +10,9 @@ import { task } from './trace'; import { SHARED_DESCRIPTION } from './lib/constants'; import { fdir as Fdir } from 'fdir'; import { appendArrayInPlace } from './lib/append-array-in-place'; -import { removeFiles } from './lib/misc'; import { OUTPUT_CLASH_DIR, OUTPUT_SINGBOX_DIR, OUTPUT_SURGE_DIR, SOURCE_DIR } from './constants/dir'; const MAGIC_COMMAND_SKIP = '# $ custom_build_script'; -const MAGIC_COMMAND_RM = '# $ custom_no_output'; const MAGIC_COMMAND_TITLE = '# $ meta_title '; const MAGIC_COMMAND_DESCRIPTION = '# $ meta_description '; @@ -68,7 +66,6 @@ export const buildCommon = task(require.main === module, __filename)(async (span }); const $skip = Symbol('skip'); -const $rm = Symbol('rm'); const processFile = (span: Span, sourcePath: string) => { // console.log('Processing', sourcePath); @@ -80,9 +77,6 @@ const processFile = (span: Span, sourcePath: string) => { try { for await (const line of readFileByLine(sourcePath)) { - if (line.startsWith(MAGIC_COMMAND_RM)) { - return $rm; - } if (line.startsWith(MAGIC_COMMAND_SKIP)) { return $skip; } @@ -121,14 +115,6 @@ function transformDomainset(parentSpan: Span, sourcePath: string, relativePath: const clashFileBasename = relativePath.slice(0, -path.extname(relativePath).length); - if (res === $rm) { - return removeFiles([ - path.resolve(OUTPUT_SURGE_DIR, relativePath), - path.resolve(OUTPUT_CLASH_DIR, `${clashFileBasename}.txt`), - path.resolve(OUTPUT_SINGBOX_DIR, `${clashFileBasename}.json`) - ]); - } - const [title, descriptions, lines] = res; const deduped = domainDeduper(lines); @@ -170,14 +156,6 @@ async function transformRuleset(parentSpan: Span, sourcePath: string, relativePa const clashFileBasename = relativePath.slice(0, -path.extname(relativePath).length); - if (res === $rm) { - return removeFiles([ - path.resolve(OUTPUT_SURGE_DIR, relativePath), - path.resolve(OUTPUT_CLASH_DIR, `${clashFileBasename}.txt`), - path.resolve(OUTPUT_SINGBOX_DIR, `${clashFileBasename}.json`) - ]); - } - const [title, descriptions, lines] = res; let description: string[]; diff --git a/Build/build-deprecate-files.ts b/Build/build-deprecate-files.ts index 7b0faa18..e6447018 100644 --- a/Build/build-deprecate-files.ts +++ b/Build/build-deprecate-files.ts @@ -1,7 +1,8 @@ -import { OUTPUT_CLASH_DIR, OUTPUT_SURGE_DIR } from './constants/dir'; +import { OUTPUT_CLASH_DIR, OUTPUT_SURGE_DIR, PUBLIC_DIR } from './constants/dir'; import { compareAndWriteFile } from './lib/create-file'; import { task } from './trace'; import path from 'node:path'; +import fsp from 'node:fs/promises'; const DEPRECATED_FILES = [ ['non_ip/global_plus', 'This file has been merged with non_ip/global'], @@ -9,8 +10,20 @@ const DEPRECATED_FILES = [ ['domainset/reject_phishing', 'This file has been merged with domainset/reject'] ]; +const REMOVED_FILES = [ + 'Internal/cdn.txt', + 'List/domainset/steam.conf', + 'List/internal/appprofile.php', + 'Clash/domainset/steam.txt', + 'sing-box/domainset/steam.json' +]; + export const buildDeprecateFiles = task(require.main === module, __filename)((span) => span.traceChildAsync('create deprecated files', async (childSpan) => { - const promises: Array> = []; + const promises: Array> = REMOVED_FILES + .map(f => fsp.rm( + path.join(PUBLIC_DIR, f), + { force: true, recursive: true } + )); for (const [filePath, description] of DEPRECATED_FILES) { const surgeFile = path.resolve(OUTPUT_SURGE_DIR, `${filePath}.conf`); diff --git a/Build/index.ts b/Build/index.ts index d6337cc2..05d0ab2a 100644 --- a/Build/index.ts +++ b/Build/index.ts @@ -71,8 +71,6 @@ process.on('unhandledRejection', (reason) => { const buildCloudMounterRulesPromise = downloadPreviousBuildPromise.then(() => buildCloudMounterRules(rootSpan)); - const buildDeprecateFilesPromise = downloadPreviousBuildPromise.then(() => buildDeprecateFiles(rootSpan)); - await Promise.all([ downloadPreviousBuildPromise, buildCommonPromise, @@ -93,10 +91,10 @@ process.on('unhandledRejection', (reason) => { buildMicrosoftCdnPromise, buildSSPanelUIMAppProfilePromise, buildCloudMounterRulesPromise, - buildDeprecateFilesPromise, downloadMockAssetsPromise ]); + await buildDeprecateFiles(rootSpan); await buildPublic(rootSpan); rootSpan.stop(); diff --git a/Source/domainset/steam.conf b/Source/domainset/steam.conf index 05dfd700..d815df5f 100644 --- a/Source/domainset/steam.conf +++ b/Source/domainset/steam.conf @@ -1,4 +1,3 @@ -# $ custom_no_output # $ custom_build_script -- will be included in download.conf # Steam