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-07 10:23:24 +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

22
backend/src/restful/preview.js
View File

@@ -16,7 +16,10 @@ async function compareSub(req, res) {
const sub = req.body;
const target = req.query.target || 'JSON';
let content;
if (sub.source === 'local') {
if (
sub.source === 'local' &&
!['localFirst', 'remoteFirst'].includes(sub.mergeSources)
) {
content = sub.content;
} else {
try {
@@ -38,6 +41,11 @@ async function compareSub(req, res) {
);
return;
}
if (sub.mergeSources === 'localFirst') {
content.unshift(sub.content);
} else if (sub.mergeSources === 'remoteFirst') {
content.push(sub.content);
}
}
// parse proxies
const original = (Array.isArray(content) ? content : [content])
@@ -85,7 +93,12 @@ async function compareCollection(req, res) {
const sub = findByName(allSubs, name);
try {
let raw;
if (sub.source === 'local') {
if (
sub.source === 'local' &&
!['localFirst', 'remoteFirst'].includes(
sub.mergeSources,
)
) {
raw = sub.content;
} else {
raw = await Promise.all(
@@ -95,6 +108,11 @@ async function compareCollection(req, res) {
.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])