refactor: update IPC event name for Google Picker and enhance handling of picker actions

troyeguo · troyeguo · commit 9e92a76eaad7 · 2025-08-17T16:56:28.000+08:00
refactor: improve success message for added books in ImportLocal component
diff --git a/main.js b/main.js
@@ -616,13 +616,14 @@ const createMainWin = () => {
       googlePickerView.webContents.loadURL(config.url)
     }
   });
-  ipcMain.on('finish-picker', (event, config) => {
+  ipcMain.on('picker-action', (event, config) => {
     console.log("Picker finished with data:", config);
     //将数据传递给主窗口
-    if (mainWin && !mainWin.isDestroyed()) {
+
+    if (mainWin && !mainWin.isDestroyed() && config.action === 'picked') {
       mainWin.webContents.send('picker-finished', config);
     }
-    if (googlePickerView) {
+    if (googlePickerView && (config.action === 'cancel' || config.action === 'picked')) {
       mainWin.contentView.removeChildView(googlePickerView);
       googlePickerView = null;
     }
diff --git a/src/components/dialogs/importDialog/component.tsx b/src/components/dialogs/importDialog/component.tsx
@@ -310,8 +310,6 @@ class ImportDialog extends React.Component<
   // 处理Google文件导入
   handleImportGoogleFile = async (googleFile: any) => {
     try {
-      const tokenConfig = await getCloudConfig("google");
-
       // 检查文件格式
       const fileExtension =
         "." + googleFile.name.split(".").pop()?.toLowerCase();
@@ -335,10 +333,6 @@ class ImportDialog extends React.Component<
 
       toast.dismiss("google-download-" + googleFile.id);
       await this.props.importBookFunc(file);
-
-      toast.success(
-        this.props.t("Addition successful") + ": " + googleFile.name
-      );
     } catch (error) {
       console.error("Error importing Google file:", error);
       toast.error(this.props.t("Failed to import") + ": " + googleFile.name);
diff --git a/src/components/importLocal/component.tsx b/src/components/importLocal/component.tsx
@@ -137,7 +137,7 @@ class ImportLocal extends React.Component<ImportLocalProps, ImportLocalState> {
               "shelfList"
             );
           }
-          toast.success(this.props.t("Addition successful"));
+          toast.success(this.props.t("Addition successful") + ": " + book.name);
           setTimeout(() => {
             this.state.isOpenFile && this.handleJump(book);
             if (

Original file line number	Diff line number	Diff line change
`@@ -616,13 +616,14 @@ const createMainWin = () => {`
`616`	`616`	`googlePickerView.webContents.loadURL(config.url)`
`617`	`617`	`}`
`618`	`618`	`});`
`619`		`- ipcMain.on('finish-picker', (event, config) => {`
	`619`	`+ ipcMain.on('picker-action', (event, config) => {`
`620`	`620`	`console.log("Picker finished with data:", config);`
`621`	`621`	`//将数据传递给主窗口`
`622`		`- if (mainWin && !mainWin.isDestroyed()) {`
	`622`	`+`
	`623`	`+ if (mainWin && !mainWin.isDestroyed() && config.action === 'picked') {`
`623`	`624`	`mainWin.webContents.send('picker-finished', config);`
`624`	`625`	`}`
`625`		`- if (googlePickerView) {`
	`626`	`+ if (googlePickerView && (config.action === 'cancel' \|\| config.action === 'picked')) {`
`626`	`627`	`mainWin.contentView.removeChildView(googlePickerView);`
`627`	`628`	`googlePickerView = null;`
`628`	`629`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ class ImportLocal extends React.Component<ImportLocalProps, ImportLocalState> {`
`137`	`137`	`"shelfList"`
`138`	`138`	`);`
`139`	`139`	`}`
`140`		`- toast.success(this.props.t("Addition successful"));`
	`140`	`+ toast.success(this.props.t("Addition successful") + ": " + book.name);`
`141`	`141`	`setTimeout(() => {`
`142`	`142`	`this.state.isOpenFile && this.handleJump(book);`
`143`	`143`	`if (`