fix: Fix the problem of mistakenly deleting paths and launcher config…

…urations when downloading game materials
ximu3 · Dec 15, 2024 · d507c30 · d507c30
1 parent 4ec55ae
commit d507c30
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/src/main/adder/common.ts b/src/main/adder/common.ts
@@ -20,22 +20,20 @@ import { rebuildRecords } from '~/database/record'
 export async function addGameToDB({
   dataSource,
   id,
-  dbId,
+  preExistingDbId,
   screenshotUrl,
   playingTime
 }: {
   dataSource: string
   id: string
-  dbId?: string
+  preExistingDbId?: string
   screenshotUrl?: string
   playingTime?: number
 }): Promise<void> {
   const metadata = await getGameMetadata(dataSource, id)
   const coverUrl = await getGameCover(dataSource, id)
   const iconUrl = await getGameIcon(dataSource, id)
-  if (!dbId) {
-    dbId = generateUUID()
-  }
+  const dbId = preExistingDbId || generateUUID()
 
   await getDataPath(`games/${dbId}/`, true)
 
@@ -66,11 +64,12 @@ export async function addGameToDB({
     ...metadata
   })
 
-  await setDBValue(`games/${dbId}/record.json`, ['addDate'], new Date().toISOString())
-
-  await setDBValue(`games/${dbId}/launcher.json`, ['#all'], {})
-  await setDBValue(`games/${dbId}/path.json`, ['#all'], {})
-  await setDBValue(`games/${dbId}/save.json`, ['#all'], {})
+  if (!preExistingDbId) {
+    await setDBValue(`games/${dbId}/record.json`, ['addDate'], new Date().toISOString())
+    await setDBValue(`games/${dbId}/launcher.json`, ['#all'], {})
+    await setDBValue(`games/${dbId}/path.json`, ['#all'], {})
+    await setDBValue(`games/${dbId}/save.json`, ['#all'], {})
+  }
 
   const mainWindow = BrowserWindow.getAllWindows()[0]
 

diff --git a/src/main/adder/services.ts b/src/main/adder/services.ts
@@ -12,18 +12,18 @@ import log from 'electron-log/main.js'
 export async function addGameToDatabase({
   dataSource,
   id,
-  dbId,
+  preExistingDbId,
   screenshotUrl,
   playingTime
 }: {
   dataSource: string
   id: string
-  dbId?: string
+  preExistingDbId?: string
   screenshotUrl?: string
   playingTime?: number
 }): Promise<void> {
   try {
-    await addGameToDB({ dataSource, id, dbId, screenshotUrl, playingTime })
+    await addGameToDB({ dataSource, id, preExistingDbId, screenshotUrl, playingTime })
   } catch (error) {
     log.error('Error adding game to database:', error)
     throw error

diff --git a/src/main/ipc/adder.ts b/src/main/ipc/adder.ts
@@ -13,16 +13,16 @@ export function setupAdderIPC(mainWindow: BrowserWindow): void {
       {
         dataSource,
         id,
-        dbId,
+        preExistingDbId,
         screenshotUrl
       }: {
         dataSource: string
         id: string
-        dbId?: string
+        preExistingDbId?: string
         screenshotUrl?: string
       }
     ) => {
-      await addGameToDatabase({ dataSource, id, dbId, screenshotUrl })
+      await addGameToDatabase({ dataSource, id, preExistingDbId, screenshotUrl })
     }
   )
 

diff --git a/src/renderer/src/pages/GameAdder/ScreenshotList.tsx b/src/renderer/src/pages/GameAdder/ScreenshotList.tsx
@@ -52,7 +52,7 @@ export function ScreenshotList(): JSX.Element {
     setIsAdding(true)
     toast.promise(
       (async (): Promise<void> => {
-        await ipcInvoke('add-game-to-db', { dataSource, id, dbId, screenshotUrl })
+        await ipcInvoke('add-game-to-db', { dataSource, id, preExistingDbId: dbId, screenshotUrl })
         setIsAdding(false)
         setIsOpen(false)
         setDbId('')