diff --git a/src/main/index.ts b/src/main/index.ts index 0f7c0297..2a18fa31 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -9,6 +9,7 @@ import resources from "@locales"; import { PythonRPC } from "./services/python-rpc"; import { Aria2 } from "./services/aria2"; import { db, levelKeys } from "./level"; +import { loadState } from "./main"; const { autoUpdater } = updater; @@ -57,7 +58,7 @@ app.whenReady().then(async () => { return net.fetch(url.pathToFileURL(decodeURI(filePath)).toString()); }); - await import("./main"); + await loadState(); const language = await db.get(levelKeys.language, { valueEncoding: "utf-8", diff --git a/src/main/main.ts b/src/main/main.ts index 7f03a247..d5d23cdb 100644 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -21,7 +21,17 @@ import { import { Auth, User, type UserPreferences } from "@types"; import { knexClient } from "./knex-client"; -export const loadState = async (userPreferences: UserPreferences | null) => { +export const loadState = async () => { + const userPreferences = await migrateFromSqlite().then(async () => { + await db.put(levelKeys.sqliteMigrationDone, true, { + valueEncoding: "json", + }); + + return db.get(levelKeys.userPreferences, { + valueEncoding: "json", + }); + }); + await import("./events"); Aria2.spawn(); @@ -192,15 +202,3 @@ const migrateFromSqlite = async () => { migrateUser, ]); }; - -migrateFromSqlite().then(async () => { - await db.put(levelKeys.sqliteMigrationDone, true, { - valueEncoding: "json", - }); - - db.get(levelKeys.userPreferences, { - valueEncoding: "json", - }).then((userPreferences) => { - loadState(userPreferences); - }); -});