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 2025-09-12 19:53:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复正则排序不生效的bug

Browse Source
This commit is contained in:
Peng-YM 2020-12-11 10:26:57 +08:00
parent fbfc1084fa
commit 1f998f70b5
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/sub-store.js
View File

@ -1783,9 +1783,9 @@ var ProxyUtils = (function () {
function RegexSortOperator(expressions) { function RegexSortOperator(expressions) {
return { return {
name: "Regex Sort Operator", name: "Regex Sort Operator",
func: (proxies) => func: (proxies) => {
proxies.sort((a, b) => {
expressions = expressions.map(expr => buildRegex(expr)); expressions = expressions.map(expr => buildRegex(expr));
return proxies.sort((a, b) => {
const oA = getRegexOrder(expressions, a.name); const oA = getRegexOrder(expressions, a.name);
const oB = getRegexOrder(expressions, b.name); const oB = getRegexOrder(expressions, b.name);
if (oA && !oB) return -1; if (oA && !oB) return -1;
@ -1793,7 +1793,9 @@ var ProxyUtils = (function () {
if (oA && oB) return oA < oB ? -1 : 1; if (oA && oB) return oA < oB ? -1 : 1;
if ((!oA && !oB) || (oA && oB && oA === oB)) if ((!oA && !oB) || (oA && oB && oA === oB))
return a.name < b.name ? -1 : 1; // fallback to normal sort return a.name < b.name ? -1 : 1; // fallback to normal sort
}), })
}
}; };
} }
@ -3074,6 +3076,7 @@ function clone(object) {
} }
function buildRegex(str, ...options) { function buildRegex(str, ...options) {
console.log("OOOOOOO: " + str);
options = options.join(""); options = options.join("");
if (str.startsWith("(?i)")) { if (str.startsWith("(?i)")) {
str = str.substr(4); str = str.substr(4);

4
backend/sub-store.min.js vendored
View File

File diff suppressed because one or more lines are too long