Chore: minor changes

This commit is contained in:
SukkaW 2024-12-16 22:39:39 +08:00
parent f706b8fdc4
commit 730eec003e
3 changed files with 23 additions and 27 deletions

View File

@ -7,6 +7,7 @@ import { CN_CIDR_MISSING_IN_CHNROUTE, NON_CN_CIDR_INCLUDED_IN_CHNROUTE } from '.
import { appendArrayInPlace } from './lib/append-array-in-place';
import { IPListOutput } from './lib/create-file';
import { cachedOnlyFail } from './lib/fs-memo';
import { createFileDescription } from './constants/description';
const PROBE_CHN_CIDR_V4 = [
// NetEase Hangzhou
@ -48,12 +49,7 @@ export const buildChnCidr = task(require.main === module, __filename)(async (spa
const [filteredCidr4, cidr6] = await span.traceChildAsync('download chnroutes2', getChnCidrPromise);
// Can not use SHARED_DESCRIPTION here as different license
const description = [
'License: CC BY-SA 2.0',
'Homepage: https://ruleset.skk.moe',
'GitHub: https://github.com/SukkaW/Surge',
''
];
const description = createFileDescription('CC BY-SA 2.0');
return Promise.all([
new IPListOutput(span, 'china_ip', false)

View File

@ -1,5 +1,9 @@
export const SHARED_DESCRIPTION = [
'License: AGPL 3.0',
export function createFileDescription(license = 'AGPL 3.0') {
return [
`License: ${license}`,
'Homepage: https://ruleset.skk.moe',
'GitHub: https://github.com/SukkaW/Surge'
];
}
export const SHARED_DESCRIPTION = createFileDescription('AGPL 3.0');

View File

@ -63,7 +63,18 @@ export const downloadPreviousBuild = task(require.main === module, __filename)(a
const extract = tarExtract(
publicDir,
{
ignore: tarOnIgnore,
ignore(_: string, header?: TarEntryHeaders) {
if (header) {
if (header.type !== 'file' && header.type !== 'directory') {
return true;
}
if (header.type === 'file' && path.extname(header.name) === '.ts') {
return true;
}
}
return false;
},
map(header) {
header.name = header.name.replace(pathPrefix, '');
return header;
@ -78,18 +89,3 @@ export const downloadPreviousBuild = task(require.main === module, __filename)(a
);
});
});
function tarOnIgnore(_: string, header?: TarEntryHeaders) {
if (header) {
if (header.type !== 'file' && header.type !== 'directory') {
return true;
}
const extname = path.extname(header.name);
if (extname === '.ts') {
return true;
}
}
return false;
}