Local-GitHub-Proxy/Sub-Store
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/sub-store-org/Sub-Store.git synced 2026-04-01 18:03:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 支持按顺序合并本地和远程订阅(前端版本 > 2.14.14 可输入)

Browse Source
This commit is contained in:
xream
2023-11-29 03:42:25 +08:00
parent 3054d5cd5d
commit c541b83037
5 changed files with 68 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
backend/src/restful/sync.js
View File

@@ -22,14 +22,24 @@ export default function register($app) {
$app.get('/api/sync/artifact/:name', syncArtifact);
}
async function produceArtifact({ type, name, platform, url, ua, content }) {
async function produceArtifact({
type,
name,
platform,
url,
ua,
content,
mergeSources,
}) {
platform = platform || 'JSON';
if (type === 'subscription') {
const allSubs = $.read(SUBS_KEY);
const sub = findByName(allSubs, name);
let raw;
if (url) {
if (content && !['localFirst', 'remoteFirst'].includes(mergeSources)) {
raw = content;
} else if (url) {
raw = await Promise.all(
url
.split(/[\r\n]+/)
@@ -37,9 +47,15 @@ async function produceArtifact({ type, name, platform, url, ua, content }) {
.filter((i) => i.length)
.map((url) => download(url, ua)),
);
} else if (content) {
raw = content;
} else if (sub.source === 'local') {
if (mergeSources === 'localFirst') {
raw.unshift(content);
} else if (mergeSources === 'remoteFirst') {
raw.push(content);
}
} else if (
sub.source === 'local' &&
!['localFirst', 'remoteFirst'].includes(sub.mergeSources)
) {
raw = sub.content;
} else {
raw = await Promise.all(
@@ -49,6 +65,11 @@ async function produceArtifact({ type, name, platform, url, ua, content }) {
.filter((i) => i.length)
.map((url) => download(url, sub.ua)),
);
if (sub.mergeSources === 'localFirst') {
raw.unshift(sub.content);
} else if (sub.mergeSources === 'remoteFirst') {
raw.push(sub.content);
}
}
// parse proxies
let proxies = (Array.isArray(raw) ? raw : [raw])
@@ -102,7 +123,12 @@ async function produceArtifact({ type, name, platform, url, ua, content }) {
try {
$.info(`正在处理子订阅：${sub.name}...`);
let raw;
if (sub.source === 'local') {
if (
sub.source === 'local' &&
!['localFirst', 'remoteFirst'].includes(
sub.mergeSources,
)
) {
raw = sub.content;
} else {
raw = await await Promise.all(
@@ -112,6 +138,11 @@ async function produceArtifact({ type, name, platform, url, ua, content }) {
.filter((i) => i.length)
.map((url) => download(url, sub.ua)),
);
if (sub.mergeSources === 'localFirst') {
raw.unshift(sub.content);
} else if (sub.mergeSources === 'remoteFirst') {
raw.push(sub.content);
}
}
// parse proxies
let currentProxies = (Array.isArray(raw) ? raw : [raw])