fix: 修复 Windows 无法修改数据存储路径的问题 (#927)

EcoPasteHub · Jan 6, 2025 · 77eb3f8 · 77eb3f8
1 parent 4ab4108
commit 77eb3f8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/src/database/index.tsx b/src/database/index.tsx
@@ -1,15 +1,16 @@
 import type { TableName, TablePayload } from "@/types/database";
-import { emit } from "@tauri-apps/api/event";
 import { remove } from "@tauri-apps/plugin-fs";
 import Database from "@tauri-apps/plugin-sql";
 import { entries, isBoolean, isNil, map, omitBy, some } from "lodash-es";
 
-let db: Database | null;
+let db: Database | null = null;
 
 /**
  * 初始化数据库
  */
 export const initDatabase = async () => {
+	if (db) return;
+
 	const path = await getSaveDatabasePath();
 
 	db = await Database.load(`sqlite:${path}`);
@@ -62,9 +63,7 @@ const handlePayload = (payload: TablePayload) => {
  * @param sql sql 语句
  */
 export const executeSQL = async (query: string, values?: unknown[]) => {
-	if (!db) {
-		await initDatabase();
-	}
+	await initDatabase();
 
 	if (query.startsWith("SELECT") || query.startsWith("PRAGMA")) {
 		return await db!.select(query, values);
@@ -167,8 +166,6 @@ export const closeDatabase = async () => {
 	await db.close();
 
 	db = null;
-
-	emit(LISTEN_KEY.CLOSE_DATABASE);
 };
 
 /**

diff --git a/src/pages/Backup/components/Manual/index.tsx b/src/pages/Backup/components/Manual/index.tsx
@@ -45,7 +45,9 @@ const Manual: FC<{ state: State }> = (props) => {
 
 			state.spinning = true;
 
-			await closeDatabase();
+			emit(LISTEN_KEY.CLOSE_DATABASE);
+
+			await wait();
 
 			await decompress(path, getSaveDataPath());
 

diff --git a/src/pages/Backup/components/SavePath/index.tsx b/src/pages/Backup/components/SavePath/index.tsx
@@ -31,7 +31,9 @@ const SavePath: FC<{ state: State }> = (props) => {
 
 			state.spinning = true;
 
-			await closeDatabase();
+			emit(LISTEN_KEY.CLOSE_DATABASE);
+
+			await wait();
 
 			await transfer(getSaveDataPath(), dstPath, {
 				includes: [

diff --git a/src/utils/shared.ts b/src/utils/shared.ts
@@ -0,0 +1,8 @@
+/**
+ * 返回一个延迟指定时间后解决的 Promise，用于异步操作中的延时控制。
+ *
+ * @param 等待的时间，单位为毫秒，默认为 1000 毫秒。
+ */
+export const wait = (ms = 1000) => {
+	return new Promise((resolve) => setTimeout(resolve, ms));
+};