From 0f0a67b55e65826b838686bdfded80ce817053b9 Mon Sep 17 00:00:00 2001 From: Chubby Granny Chaser Date: Tue, 21 Jan 2025 10:44:43 +0000 Subject: [PATCH] chore: merge with main --- src/main/events/library/open-game.ts | 3 +-- src/main/events/library/remove-game-from-library.ts | 3 +-- src/main/events/library/remove-game.ts | 3 +-- src/main/events/library/select-game-wine-prefix.ts | 3 +-- src/main/events/library/update-launch-options.ts | 3 +-- .../notifications/publish-new-repacks-notification.ts | 3 +-- src/main/events/torrenting/pause-game-seed.ts | 3 +-- src/main/events/torrenting/resume-game-seed.ts | 3 +-- .../events/user/get-compared-unlocked-achievements.ts | 3 +-- src/main/main.ts | 8 ++++++-- 10 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/main/events/library/open-game.ts b/src/main/events/library/open-game.ts index 2a74c5d4..3bbf7cdc 100644 --- a/src/main/events/library/open-game.ts +++ b/src/main/events/library/open-game.ts @@ -1,8 +1,7 @@ import { registerEvent } from "../register-event"; import { shell } from "electron"; import { parseExecutablePath } from "../helpers/parse-executable-path"; -import { levelKeys } from "@main/level"; -import { gamesSublevel } from "@main/level"; +import { gamesSublevel, levelKeys } from "@main/level"; import { GameShop } from "@types"; const openGame = async ( diff --git a/src/main/events/library/remove-game-from-library.ts b/src/main/events/library/remove-game-from-library.ts index dd398819..6a33ffaf 100644 --- a/src/main/events/library/remove-game-from-library.ts +++ b/src/main/events/library/remove-game-from-library.ts @@ -1,7 +1,6 @@ import { registerEvent } from "../register-event"; import { HydraApi } from "@main/services"; -import { levelKeys } from "@main/level"; -import { gamesSublevel } from "@main/level"; +import { gamesSublevel, levelKeys } from "@main/level"; import type { GameShop } from "@types"; const removeGameFromLibrary = async ( diff --git a/src/main/events/library/remove-game.ts b/src/main/events/library/remove-game.ts index afc205f7..a5310bc9 100644 --- a/src/main/events/library/remove-game.ts +++ b/src/main/events/library/remove-game.ts @@ -1,7 +1,6 @@ import { registerEvent } from "../register-event"; -import { downloadsSublevel } from "@main/level"; +import { levelKeys, downloadsSublevel } from "@main/level"; import { GameShop } from "@types"; -import { levelKeys } from "@main/level"; const removeGame = async ( _event: Electron.IpcMainInvokeEvent, diff --git a/src/main/events/library/select-game-wine-prefix.ts b/src/main/events/library/select-game-wine-prefix.ts index 87bc2cde..c085dbad 100644 --- a/src/main/events/library/select-game-wine-prefix.ts +++ b/src/main/events/library/select-game-wine-prefix.ts @@ -1,6 +1,5 @@ import { registerEvent } from "../register-event"; -import { gamesSublevel } from "@main/level"; -import { levelKeys } from "@main/level"; +import { levelKeys, gamesSublevel } from "@main/level"; import type { GameShop } from "@types"; const selectGameWinePrefix = async ( diff --git a/src/main/events/library/update-launch-options.ts b/src/main/events/library/update-launch-options.ts index 9e0277f3..3e6c15cf 100644 --- a/src/main/events/library/update-launch-options.ts +++ b/src/main/events/library/update-launch-options.ts @@ -1,6 +1,5 @@ import { registerEvent } from "../register-event"; -import { levelKeys } from "@main/level"; -import { gamesSublevel } from "@main/level"; +import { gamesSublevel, levelKeys } from "@main/level"; import { GameShop } from "@types"; const updateLaunchOptions = async ( diff --git a/src/main/events/notifications/publish-new-repacks-notification.ts b/src/main/events/notifications/publish-new-repacks-notification.ts index cb5c1f5f..1f23eeb1 100644 --- a/src/main/events/notifications/publish-new-repacks-notification.ts +++ b/src/main/events/notifications/publish-new-repacks-notification.ts @@ -1,8 +1,7 @@ import { Notification } from "electron"; import { registerEvent } from "../register-event"; import { t } from "i18next"; -import { db } from "@main/level"; -import { levelKeys } from "@main/level"; +import { db, levelKeys } from "@main/level"; import type { UserPreferences } from "@types"; const publishNewRepacksNotification = async ( diff --git a/src/main/events/torrenting/pause-game-seed.ts b/src/main/events/torrenting/pause-game-seed.ts index 49aefc66..b19da525 100644 --- a/src/main/events/torrenting/pause-game-seed.ts +++ b/src/main/events/torrenting/pause-game-seed.ts @@ -1,5 +1,4 @@ -import { downloadsSublevel } from "@main/level"; -import { levelKeys } from "@main/level"; +import { downloadsSublevel, levelKeys } from "@main/level"; import { registerEvent } from "../register-event"; import { DownloadManager } from "@main/services"; import type { GameShop } from "@types"; diff --git a/src/main/events/torrenting/resume-game-seed.ts b/src/main/events/torrenting/resume-game-seed.ts index 62493717..63bab952 100644 --- a/src/main/events/torrenting/resume-game-seed.ts +++ b/src/main/events/torrenting/resume-game-seed.ts @@ -1,5 +1,4 @@ -import { downloadsSublevel } from "@main/level"; -import { levelKeys } from "@main/level"; +import { downloadsSublevel, levelKeys } from "@main/level"; import { registerEvent } from "../register-event"; import { DownloadManager } from "@main/services"; import type { GameShop } from "@types"; diff --git a/src/main/events/user/get-compared-unlocked-achievements.ts b/src/main/events/user/get-compared-unlocked-achievements.ts index b2358199..33b37584 100644 --- a/src/main/events/user/get-compared-unlocked-achievements.ts +++ b/src/main/events/user/get-compared-unlocked-achievements.ts @@ -2,8 +2,7 @@ import type { ComparedAchievements, GameShop, UserPreferences } from "@types"; import { registerEvent } from "../register-event"; import { HydraApi } from "@main/services"; -import { db } from "@main/level"; -import { levelKeys } from "@main/level"; +import { db, levelKeys } from "@main/level"; const getComparedUnlockedAchievements = async ( _event: Electron.IpcMainInvokeEvent, diff --git a/src/main/main.ts b/src/main/main.ts index 4e7bb5ab..5ebcc723 100644 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -6,9 +6,13 @@ import { Aria2 } from "./services/aria2"; import { downloadsSublevel } from "./level/sublevels/downloads"; import { sortBy } from "lodash-es"; import { Downloader } from "@shared"; -import { gameAchievementsSublevel, gamesSublevel, levelKeys } from "./level"; +import { + gameAchievementsSublevel, + gamesSublevel, + levelKeys, + db, +} from "./level"; import { Auth, User, type UserPreferences } from "@types"; -import { db } from "./level"; import { knexClient } from "./knex-client"; const loadState = async (userPreferences: UserPreferences | null) => {