chickliu/quark-auto-save
1
0
Fork 0
mirror of https://github.com/Cp0204/quark-auto-save.git synced 2026-01-16 01:10:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #56 from x1ao4/dev

Browse Source 
修复资源搜索结果排序时未进行时区转换的问题
This commit is contained in:
x1ao4 2025-08-31 09:54:21 +08:00 committed by GitHub
commit e3678a02cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/templates/index.html
View File

@ -4448,7 +4448,7 @@
const batchSize = 5; const batchSize = 5;
// 解析时间用于排序（降序：最新在前） // 解析时间用于排序（降序：最新在前）
const getItemTs = (item) => this.parsePublishTs(item && item.publish_date); const getItemTs = (item) => this.parsePublishTs(item && item.publish_date, item && item.source, item && item.pansou_source);
// 处理单个链接的函数 // 处理单个链接的函数
const processLink = (link) => { const processLink = (link) => {
@ -4593,7 +4593,7 @@
this.smart_param._hasShownInterimResults = false; this.smart_param._hasShownInterimResults = false;
// 结束前做一次排序，确保最终顺序正确 // 结束前做一次排序，确保最终顺序正确
const getItemTs = (item) => this.parsePublishTs(item && item.publish_date); const getItemTs = (item) => this.parsePublishTs(item && item.publish_date, item && item.source, item && item.pansou_source);
validResults.sort((a, b) => getItemTs(b) - getItemTs(a)); validResults.sort((a, b) => getItemTs(b) - getItemTs(a));
// 更新搜索结果 // 更新搜索结果
@ -6704,24 +6704,46 @@
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}, },
// 统一解析资源发布日期为时间戳 // 统一解析资源发布日期为时间戳
parsePublishTs(raw) { parsePublishTs(raw, source = null, pansouSource = null) {
if (!raw) return 0; if (!raw) return 0;
const s = String(raw).trim(); const s = String(raw).trim();
// 判断是否需要+8小时：
// 1. 如果是PanSou的tg来源，需要+8小时
// 2. 如果是CloudSaver来源，需要+8小时
// 3. 其他来源都不+8小时
const needAdd8Hours = (pansouSource && pansouSource.startsWith('tg:')) ||
(source === 'CloudSaver');
// YYYY-MM-DD HH:mm:ss // YYYY-MM-DD HH:mm:ss
let m = /^\s*(\d{4})-(\d{2})-(\d{2})\s+(\d{2}):(\d{2}):(\d{2})\s*$/.exec(s); let m = /^\s*(\d{4})-(\d{2})-(\d{2})\s+(\d{2}):(\d{2}):(\d{2})\s*$/.exec(s);
if (m) { if (m) {
const [, y, mo, d, h, mi, se] = m; const [, y, mo, d, h, mi, se] = m;
return new Date(Number(y), Number(mo) - 1, Number(d), Number(h), Number(mi), Number(se)).getTime(); const date = new Date(Number(y), Number(mo) - 1, Number(d), Number(h), Number(mi), Number(se));
if (needAdd8Hours) {
date.setHours(date.getHours() + 8);
}
return date.getTime();
} }
// YYYY-MM-DD // YYYY-MM-DD
m = /^\s*(\d{4})-(\d{2})-(\d{2})\s*$/.exec(s); m = /^\s*(\d{4})-(\d{2})-(\d{2})\s*$/.exec(s);
if (m) { if (m) {
const [, y, mo, d] = m; const [, y, mo, d] = m;
return new Date(Number(y), Number(mo) - 1, Number(d), 0, 0, 0).getTime(); const date = new Date(Number(y), Number(mo) - 1, Number(d), 0, 0, 0);
if (needAdd8Hours) {
date.setHours(date.getHours() + 8);
}
return date.getTime();
} }
// ISO 回退 // ISO 回退
const ts = Date.parse(s); const ts = Date.parse(s);
return isNaN(ts) ? 0 : ts; if (isNaN(ts)) return 0;
if (needAdd8Hours) {
const date = new Date(ts);
date.setHours(date.getHours() + 8);
return date.getTime();
}
return ts;
}, },
// 规范化资源发布日期展示：将 ISO 格式（含 T/Z/偏移）转为 "YYYY-MM-DD HH:mm:ss" // 规范化资源发布日期展示：将 ISO 格式（含 T/Z/偏移）转为 "YYYY-MM-DD HH:mm:ss"
formatPublishDate(value, pansouSource = null, source = null) { formatPublishDate(value, pansouSource = null, source = null) {