earthjasonlin/zzz-signal-search-export
1
0
Fork 0
mirror of https://github.com/earthjasonlin/zzz-signal-search-export.git synced 2024-11-22 21:30:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: missing region in saved JSON

Browse Source
This commit is contained in:
mio 2023-05-11 21:01:29 +08:00
parent 69042728da
commit dcaad1d544
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "star-rail-warp-export", "name": "star-rail-warp-export",
"version": "0.0.14", "version": "0.0.15",
"main": "./dist/electron/main/main.js", "main": "./dist/electron/main/main.js",
"author": "biuuu <https://github.com/biuuu>", "author": "biuuu <https://github.com/biuuu>",
"license": "MIT", "license": "MIT",

26
src/main/getData.js
View File

@ -163,7 +163,7 @@ const getGachaLog = async ({ key, page, name, retryCount, url, endId }) => {
const text = i18n.log const text = i18n.log
try { try {
const res = await request(`${url}&gacha_type=${key}&page=${page}&size=${20}${endId ? '&end_id=' + endId : ''}`) const res = await request(`${url}&gacha_type=${key}&page=${page}&size=${20}${endId ? '&end_id=' + endId : ''}`)
return res.data.list return res.data
} catch (e) { } catch (e) {
if (retryCount) { if (retryCount) {
sendMsg(i18n.parse(text.fetch.retry, { name, page, count: 6 - retryCount })) sendMsg(i18n.parse(text.fetch.retry, { name, page, count: 6 - retryCount }))
@ -181,7 +181,8 @@ const getGachaLogs = async ({ name, key }, queryString) => {
const text = i18n.log const text = i18n.log
let page = 1 let page = 1
let list = [] let list = []
let res = [] let res = null
let logs = []
let uid = '' let uid = ''
let region = '' let region = ''
let region_time_zone = '' let region_time_zone = ''
@ -195,8 +196,9 @@ const getGachaLogs = async ({ name, key }, queryString) => {
sendMsg(i18n.parse(text.fetch.current, { name, page })) sendMsg(i18n.parse(text.fetch.current, { name, page }))
res = await getGachaLog({ key, page, name, url, endId, retryCount: 5 }) res = await getGachaLog({ key, page, name, url, endId, retryCount: 5 })
await sleep(0.3) await sleep(0.3)
if (!uid && res.length) { logs = res.list || []
uid = res[0].uid if (!uid && logs.length) {
uid = logs[0].uid
} }
if (!region) { if (!region) {
region = res.region region = res.region
@ -204,14 +206,14 @@ const getGachaLogs = async ({ name, key }, queryString) => {
if (!region_time_zone) { if (!region_time_zone) {
region_time_zone = res.region_time_zone region_time_zone = res.region_time_zone
} }
list.push(...res) list.push(...logs)
page += 1 page += 1
if (res.length) { if (logs.length) {
endId = res[res.length - 1].id endId = logs[logs.length - 1].id
} }
if (!config.fetchFullHistory && res.length && uid && dataMap.has(uid)) { if (!config.fetchFullHistory && logs.length && uid && dataMap.has(uid)) {
const result = dataMap.get(uid).result const result = dataMap.get(uid).result
if (result.has(key)) { if (result.has(key)) {
const arr = result.get(key) const arr = result.get(key)
@ -219,7 +221,7 @@ const getGachaLogs = async ({ name, key }, queryString) => {
const localLatestId = arr[arr.length - 1].id const localLatestId = arr[arr.length - 1].id
if (localLatestId) { if (localLatestId) {
let shouldBreak = false let shouldBreak = false
res.forEach(item => { logs.forEach(item => {
if (item.id === localLatestId) { if (item.id === localLatestId) {
shouldBreak = true shouldBreak = true
} }
@ -231,7 +233,7 @@ const getGachaLogs = async ({ name, key }, queryString) => {
} }
} }
} }
} while (res.length > 0) } while (logs.length > 0)
return { list, uid, region, region_time_zone } return { list, uid, region, region_time_zone }
} }
@ -402,6 +404,7 @@ const fetchData = async (urlOverride) => {
const gachaType = await getGachaType(searchParams.get('lang')) const gachaType = await getGachaType(searchParams.get('lang'))
const result = new Map() const result = new Map()
const typeMap = new Map()
const lang = searchParams.get('lang') const lang = searchParams.get('lang')
let originUid = '' let originUid = ''
let originRegion = '' let originRegion = ''
@ -413,6 +416,7 @@ const fetchData = async (urlOverride) => {
return { id, item_id, item_type, name, rank_type, time, gacha_id, gacha_type } return { id, item_id, item_type, name, rank_type, time, gacha_id, gacha_type }
}) })
logs.reverse() logs.reverse()
typeMap.set(type.key, type.name)
result.set(type.key, logs) result.set(type.key, logs)
if (!originUid) { if (!originUid) {
originUid = uid originUid = uid
@ -424,7 +428,7 @@ const fetchData = async (urlOverride) => {
originTimeZone = region_time_zone originTimeZone = region_time_zone
} }
} }
const data = { result, time: Date.now(), uid: originUid, lang, region: originRegion, region_time_zone: originTimeZone } const data = { result, typeMap, time: Date.now(), uid: originUid, lang, region: originRegion, region_time_zone: originTimeZone }
const localData = dataMap.get(originUid) const localData = dataMap.get(originUid)
const mergedResult = mergeData(localData, data) const mergedResult = mergeData(localData, data)
data.result = mergedResult data.result = mergedResult