Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-05-09 02:47:12 +02:00
Code Issues Packages Projects Releases Activity

fix(desktop): timing issues when starting import from cold start

Browse Source
This commit is contained in:
Elian Doran
2026-02-08 19:03:10 +02:00
parent d4ae10dd82
commit 979bf26b9e
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/client/src/widgets/dialogs/import_preview.tsx
View File

@@ -114,10 +114,11 @@ export default function ImportPreviewDialog() {
setImportButtonTimeout(IMPORT_BUTTON_TIMEOUT);
hasSubmittedRef.current = false;
};
ipcRenderer.send("import-preview-ready");
ipcRenderer.on("show-import-preview-dialog", onShow);
return () => {
ipcRenderer.removeListener("show-import-preview-dialog", onShow);
}
};
}, []);
return (

26
apps/desktop/src/main.ts
View File

@@ -1,19 +1,19 @@
import { initializeTranslations } from "@triliumnext/server/src/services/i18n.js";
import { t } from "i18next";
import { app, globalShortcut, BrowserWindow } from "electron";
import sqlInit from "@triliumnext/server/src/services/sql_init.js";
import windowService from "@triliumnext/server/src/services/window.js";
import tray from "@triliumnext/server/src/services/tray.js";
import previewZipForImport from "@triliumnext/server/src/services/import/zip_preview";
import options from "@triliumnext/server/src/services/options.js";
import port from "@triliumnext/server/src/services/port.js";
import sqlInit from "@triliumnext/server/src/services/sql_init.js";
import tray from "@triliumnext/server/src/services/tray.js";
import windowService from "@triliumnext/server/src/services/window.js";
import { app, BrowserWindow,globalShortcut } from "electron";
import { ipcMain } from "electron/main";
import electronDebug from "electron-debug";
import electronDl from "electron-dl";
import { PRODUCT_NAME } from "./app-info";
import port from "@triliumnext/server/src/services/port.js";
import { t } from "i18next";
import { join } from "path";
import { deferred, LOCALES } from "../../../packages/commons/src";
import previewZipForImport from "@triliumnext/server/src/services/import/zip_preview";
import { ipcMain } from "electron/main";
import { PRODUCT_NAME } from "./app-info";
async function main() {
const userDataPath = getUserData();
@@ -141,9 +141,7 @@ async function handleImportArguments(args: string[], window: BrowserWindow) {
if (filesToImport.length === 0) return;
const previews = await Promise.all(filesToImport.map(file => previewZipForImport(file)));
console.log("Sendimg import preview data to window", window);
ipcMain.on("initial-render-complete", () => {
console.log("READYYY!!!");
ipcMain.on("import-preview-ready", () => {
window.webContents.send("show-import-preview-dialog", {
previews
});
@@ -158,7 +156,7 @@ function getElectronLocale() {
// For RTL, we have to force the UI locale to align the window buttons properly.
if (formattingLocale && !correspondingLocale?.rtl) return formattingLocale;
return uiLocale || "en"
return uiLocale || "en";
}
main();