Fun/TeyvatGuide
1
0
Fork 0
mirror of https://github.com/BTMuli/TeyvatGuide.git synced 2026-05-10 00:44:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

🚨 尝试修复database is locked

Browse Source
This commit is contained in:
BTMuli
2026-05-06 15:36:06 +08:00
parent 17435ddad0
commit aa4a20b402
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pages/User/Gacha.vue
View File

@@ -669,7 +669,17 @@ async function refreshGachaPool(
gachaDataMap[item.time].push(item.id.toString());
}
}
await TSUserGacha.mergeUIGF(ac.gameUid, uigfList);
try {
await TSUserGacha.mergeUIGF(ac.gameUid, uigfList);
} catch (e) {
const errMsg = TGHttps.getErrMsg(e);
showSnackbar.error(`[${label}] 保存祈愿数据失败：${errMsg}`);
await TGLogger.Error(
`[Gacha][${ac.gameUid}][refreshGachaPool] 保存${label}数据异常：${errMsg}`,
);
await TGLogger.Error(`[Gacha][${ac.gameUid}][refreshGachaPool] ${e}`);
break;
}
if (!force && gachaList.some((i) => i.id.toString() === endId.toString())) break;
reqId = gachaList[gachaList.length - 1].id.toString();
if (force) await new Promise<void>((resolve) => setTimeout(resolve, 1000));

23
src/plugins/Sqlite/modules/userGacha.ts
View File

@@ -1,11 +1,12 @@
/**
* 用户祈愿模块
* @since Beta v0.10.1
* @since Beta v0.10.2
*/
import showDialog from "@comp/func/dialog.js";
import showLoading from "@comp/func/loading.js";
import showSnackbar from "@comp/func/snackbar.js";
import TGLogger from "@utils/TGLogger.js";
import Database from "@tauri-apps/plugin-sql";
import { getUtc8Time, getWikiBrief, timestampToDate } from "@utils/toolFunc.js";
import { ref, type Ref } from "vue";
@@ -85,7 +86,7 @@ async function insertGachaList(
} catch (e) {
await db.execute("ROLLBACK;");
const msg = String(e);
if (/BUSY|LOCKED|SQLITE_BUSY|SQLITE_LOCKED/i.test(msg)) {
if (/BUSY|LOCKED|SQLITE_BUSY|SQLITE_LOCKED|database is locked/i.test(msg)) {
await showDialog.check(`数据库锁定`, `请刷新页面(F5)后重试操作`);
return;
}
@@ -310,11 +311,19 @@ async function mergeUIGF(
});
}, 1000);
}
const transformed = data.map((g) => transGacha(g));
await insertGachaList(db, uid, transformed, 100, cnt);
if (timer) {
clearInterval(timer);
await showLoading.update(`[100%] 完成`, { timeout: 0 });
try {
const transformed = data.map((g) => transGacha(g));
await insertGachaList(db, uid, transformed, 100, cnt);
} catch (e) {
await TGLogger.Error(`[UserGacha][mergeUIGF] 合并祈愿数据异常`);
await TGLogger.Error(`[UserGacha][mergeUIGF] UID: ${uid}, 数据量: ${data.length}`);
await TGLogger.Error(`[UserGacha][mergeUIGF] ${e}`);
throw e;
} finally {
if (timer) {
clearInterval(timer);
await showLoading.update(`[100%] 完成`, { timeout: 0 });
}
}
}

2
src/plugins/Sqlite/modules/userGachaB.ts
View File

@@ -86,7 +86,7 @@ async function insertGachaBList(
} catch (e) {
await db.execute("ROLLBACK;");
const msg = String(e);
if (/BUSY|LOCKED|SQLITE_BUSY|SQLITE_LOCKED/i.test(msg)) {
if (/BUSY|LOCKED|SQLITE_BUSY|SQLITE_LOCKED|database is locked/i.test(msg)) {
await showDialog.check(`数据库锁定`, `请刷新页面(F5)后重试操作`);
return;
}