diff --git a/assets/jsons/translations/de.json b/assets/jsons/translations/de.json index 80f204e4..9e3bcd60 100644 --- a/assets/jsons/translations/de.json +++ b/assets/jsons/translations/de.json @@ -442,6 +442,8 @@ "OCULUS_NOT_RUNNING": "Oculus läuft nicht", "BS_ALREADY_RUNNING": "Beat Saber läuft bereits", "EXE_NOT_FINDED": "Dateien fehlen", + "PROTON_NOT_SET": "Proton folder not set", + "PROTON_NOT_FOUND": "Proton binary not found", "EXIT": "Abrupter Stop", "OCULUS_LIB_NOT_FOUND": "Oculus-Bibliothek nicht gefunden" }, @@ -452,7 +454,9 @@ "BS_ALREADY_RUNNING": "Schließe Beat Saber, bevor du es erneut startest.", "EXE_NOT_FINDED": "Einige Dateien scheinen zu fehlen. Versuche, die Dateien zu überprüfen.", "EXIT": "Beat Saber stoppte abrupt. Versuche, die Dateien zu überprüfen.", - "OCULUS_LIB_NOT_FOUND": "Überprüfe, ob die Oculus-Anwendung korrekt installiert ist und dass die Bibliotheken in Oculus richtig definiert sind." + "OCULUS_LIB_NOT_FOUND": "Überprüfe, ob die Oculus-Anwendung korrekt installiert ist und dass die Bibliotheken in Oculus richtig definiert sind.", + "PROTON_NOT_SET": "Set the Proton path in settings", + "PROTON_NOT_FOUND": "Set the Proton path in settings" }, "actions": { "STEAM_NOT_RUNNING": "Starte Steam" @@ -832,6 +836,12 @@ "choose-folder": "Ordner Wählen", "default": "Standard", "default-tooltip": "Standardmäßig in Ihrem persönlichen Ordner" + }, + "linux-setup": { + "title": "Linux Setup", + "proton-folder": "Proton folder", + "proton-folder-description": "Choose the folder to the Proton path. (eg. Proton - Experimental)", + "choose-folder": "Ordner Wählen" } }, "maps": { diff --git a/assets/jsons/translations/en.json b/assets/jsons/translations/en.json index 670f3d5f..ea30205a 100644 --- a/assets/jsons/translations/en.json +++ b/assets/jsons/translations/en.json @@ -442,7 +442,8 @@ "OCULUS_NOT_RUNNING": "Oculus is not running", "BS_ALREADY_RUNNING": "Beat Saber already running", "EXE_NOT_FINDED": "Missing files", - "PROTON_NOT_SET": "Proton path not set", + "PROTON_NOT_SET": "Proton folder not set", + "PROTON_NOT_FOUND": "Proton binary not found", "EXIT": "Abrupt stop", "OCULUS_LIB_NOT_FOUND": "Oculus library not found" }, @@ -454,7 +455,8 @@ "EXE_NOT_FINDED": "Some files seem to be missing, try to verify the files.", "EXIT": "BeatSaber stopped abruptly, tries to check the files.", "OCULUS_LIB_NOT_FOUND": "Check that the Oculus application is properly installed, and that the libraries are correctly defined in Oculus.", - "PROTON_NOT_SET": "Set the Proton path in settings" + "PROTON_NOT_SET": "Set the Proton path in settings", + "PROTON_NOT_FOUND": "Set the Proton path in settings" }, "actions": { "STEAM_NOT_RUNNING": "Launch Steam" @@ -834,6 +836,12 @@ "choose-folder": "Choose folder", "default": "Default", "default-tooltip": "Defaults to your home folder" + }, + "linux-setup": { + "title": "Linux Setup", + "proton-folder": "Proton folder", + "proton-folder-description": "Choose the folder to the Proton path. (eg. Proton - Experimental)", + "choose-folder": "Choose folder" } }, "maps": { diff --git a/assets/jsons/translations/es.json b/assets/jsons/translations/es.json index e631221f..2230fd39 100644 --- a/assets/jsons/translations/es.json +++ b/assets/jsons/translations/es.json @@ -442,6 +442,8 @@ "OCULUS_NOT_RUNNING": "Oculus no funciona", "BS_ALREADY_RUNNING": "Beat Saber ya está en marcha", "EXE_NOT_FINDED": "Archivos no encontrados", + "PROTON_NOT_SET": "Proton folder not set", + "PROTON_NOT_FOUND": "Proton binary not found", "EXIT": "Parada abrupta", "OCULUS_LIB_NOT_FOUND": "Librería Oculus no encontrada" }, @@ -452,7 +454,9 @@ "BS_ALREADY_RUNNING": "Cierra Beat Saber antes de volver a iniciarlo.", "EXE_NOT_FINDED": "Parece que faltan algunos archivos, intenta verificar los archivos.", "EXIT": "Beat Saber se detuvo abruptamente, trata de verificar los archivos.", - "OCULUS_LIB_NOT_FOUND": "Verifica que la aplicación Oculus esté correctamente instalada y que las librerías estén bien definidas en Oculus." + "OCULUS_LIB_NOT_FOUND": "Verifica que la aplicación Oculus esté correctamente instalada y que las librerías estén bien definidas en Oculus.", + "PROTON_NOT_SET": "Set the Proton path in settings", + "PROTON_NOT_FOUND": "Set the Proton path in settings" }, "actions": { "STEAM_NOT_RUNNING": "Iniciar Steam" @@ -832,6 +836,12 @@ "choose-folder": "Elige la carpeta", "default": "Predeterminado", "default-tooltip": "Por defecto, en su carpeta personal" + }, + "linux-setup": { + "title": "Linux Setup", + "proton-folder": "Proton folder", + "proton-folder-description": "Choose the folder to the Proton path. (eg. Proton - Experimental)", + "choose-folder": "Elige la carpeta" } }, "maps": { diff --git a/assets/jsons/translations/fr.json b/assets/jsons/translations/fr.json index eaa48089..9fc2cb9b 100644 --- a/assets/jsons/translations/fr.json +++ b/assets/jsons/translations/fr.json @@ -442,6 +442,8 @@ "OCULUS_NOT_RUNNING": "Oculus n'est pas lancé", "BS_ALREADY_RUNNING": "Beat Saber est déjà lancé", "EXE_NOT_FINDED": "Fichiers manquants", + "PROTON_NOT_SET": "Proton folder not set", + "PROTON_NOT_FOUND": "Proton binary not found", "EXIT": "Arrêt brutal", "OCULUS_LIB_NOT_FOUND": "Librairie Oculus introuvable" }, @@ -452,7 +454,9 @@ "BS_ALREADY_RUNNING": "Ferme Beat Saber avant de le lancer à nouveau.", "EXE_NOT_FINDED": "Quelques fichiers semblent manquants. Essaye de vérifier les fichiers.", "EXIT": "Beat Saber s'est arrêté brusquement, essaye de vérifier les fichiers.", - "OCULUS_LIB_NOT_FOUND": "Vérifie que l'application Oculus est correctement installée, et que les librairies sont bien définies dans Oculus." + "OCULUS_LIB_NOT_FOUND": "Vérifie que l'application Oculus est correctement installée, et que les librairies sont bien définies dans Oculus.", + "PROTON_NOT_SET": "Set the Proton path in settings", + "PROTON_NOT_FOUND": "Set the Proton path in settings" }, "actions": { "STEAM_NOT_RUNNING": "Lancer Steam" @@ -833,6 +837,12 @@ "choose-folder": "Choisir un dossier", "default": "Par défaut", "default-tooltip": "Par défaut, dans votre dossier personnel" + }, + "linux-setup": { + "title": "Linux Setup", + "proton-folder": "Proton folder", + "proton-folder-description": "Choose the folder to the Proton path. (eg. Proton - Experimental)", + "choose-folder": "Choisir un dossier" } }, "maps": { diff --git a/assets/jsons/translations/ja.json b/assets/jsons/translations/ja.json index bd57898f..35da9543 100644 --- a/assets/jsons/translations/ja.json +++ b/assets/jsons/translations/ja.json @@ -442,6 +442,8 @@ "OCULUS_NOT_RUNNING": "Oculusが起動していません", "BS_ALREADY_RUNNING": "Beat Saberはすでに起動しています", "EXE_NOT_FINDED": "ファイルが見つかりません", + "PROTON_NOT_SET": "Proton folder not set", + "PROTON_NOT_FOUND": "Proton binary not found", "EXIT": "緊急停止", "OCULUS_LIB_NOT_FOUND": "Oculusライブラリが見つかりません" }, @@ -452,7 +454,9 @@ "BS_ALREADY_RUNNING": "再度起動する前にBeatSaberを閉じてください。", "EXE_NOT_FINDED": "いくつかのファイルが見つからないようです。", "EXIT": "BeatSaberが緊急停止したため、ファイルをチェックします。", - "OCULUS_LIB_NOT_FOUND": "Oculusアプリケーションが正しくインストールしていることと、Oculusライブラリが正しく定義されていることを確認してください。" + "OCULUS_LIB_NOT_FOUND": "Oculusアプリケーションが正しくインストールしていることと、Oculusライブラリが正しく定義されていることを確認してください。", + "PROTON_NOT_SET": "Set the Proton path in settings", + "PROTON_NOT_FOUND": "Set the Proton path in settings" }, "actions": { "STEAM_NOT_RUNNING": "Steamを起動" @@ -832,6 +836,12 @@ "choose-folder": "フォルダーを選択", "default": "デフォルト", "default-tooltip": "デフォルトでは、ホームフォルダに設定されます" + }, + "linux-setup": { + "title": "Linux Setup", + "proton-folder": "Proton folder", + "proton-folder-description": "Choose the folder to the Proton path. (eg. Proton - Experimental)", + "choose-folder": "フォルダーを選択" } }, "maps": { diff --git a/assets/jsons/translations/ru.json b/assets/jsons/translations/ru.json index 33909402..79741e47 100644 --- a/assets/jsons/translations/ru.json +++ b/assets/jsons/translations/ru.json @@ -442,6 +442,8 @@ "OCULUS_NOT_RUNNING": "Oculus не запущен", "BS_ALREADY_RUNNING": "Beat Saber уде запущен", "EXE_NOT_FINDED": "Отсутствуют файлы", + "PROTON_NOT_SET": "Proton folder not set", + "PROTON_NOT_FOUND": "Proton binary not found", "EXIT": "Вылет", "OCULUS_LIB_NOT_FOUND": "Библиотека Oculus не найдена" }, @@ -452,7 +454,9 @@ "BS_ALREADY_RUNNING": "Закройте Beat Saber, чтобы запустить его.", "EXE_NOT_FINDED": "Некоторые файлы отсутствуют, пробуем их проверить.", "EXIT": "Beat Saber вылетел, пытаемся проверить файлы.", - "OCULUS_LIB_NOT_FOUND": "Проверьте, правильно ли установлено приложение Oculus, и правильно ли определены библиотеки в Oculus." + "OCULUS_LIB_NOT_FOUND": "Проверьте, правильно ли установлено приложение Oculus, и правильно ли определены библиотеки в Oculus.", + "PROTON_NOT_SET": "Set the Proton path in settings", + "PROTON_NOT_FOUND": "Set the Proton path in settings" }, "actions": { "STEAM_NOT_RUNNING": "Запустить Steam" @@ -831,6 +835,12 @@ "choose-folder": "Изменить папку", "default": "По умолчанию", "default-tooltip": "По умолчанию в вашей домашней папке" + }, + "linux-setup": { + "title": "Linux Setup", + "proton-folder": "Proton folder", + "proton-folder-description": "Choose the folder to the Proton path. (eg. Proton - Experimental)", + "choose-folder": "Изменить папку" } }, "maps": { diff --git a/assets/jsons/translations/zh-tw.json b/assets/jsons/translations/zh-tw.json index 60e975ad..052f76b7 100644 --- a/assets/jsons/translations/zh-tw.json +++ b/assets/jsons/translations/zh-tw.json @@ -442,6 +442,8 @@ "OCULUS_NOT_RUNNING": "Oculus 未運行", "BS_ALREADY_RUNNING": "Beat Saber 已在運行", "EXE_NOT_FINDED": "缺少文件", + "PROTON_NOT_SET": "Proton folder not set", + "PROTON_NOT_FOUND": "Proton binary not found", "EXIT": "突然停止", "OCULUS_LIB_NOT_FOUND": "未找到 Oculus 庫" }, @@ -452,7 +454,9 @@ "BS_ALREADY_RUNNING": "再次啟動前請關閉 BeatSaber。", "EXE_NOT_FINDED": "某些文件似乎遺失了，嘗試驗證文件。", "EXIT": "BeatSaber 突然停止，請檢查文件。", - "OCULUS_LIB_NOT_FOUND": "檢查 Oculus 應用是否正確安裝，以及庫是否在 Oculus 中正確定義。" + "OCULUS_LIB_NOT_FOUND": "檢查 Oculus 應用是否正確安裝，以及庫是否在 Oculus 中正確定義。", + "PROTON_NOT_SET": "Set the Proton path in settings", + "PROTON_NOT_FOUND": "Set the Proton path in settings" }, "actions": { "STEAM_NOT_RUNNING": "啟動 Steam" @@ -832,6 +836,12 @@ "choose-folder": "選擇文件夾", "default": "預設", "default-tooltip": "預設為您的主資料夾" + }, + "linux-setup": { + "title": "Linux Setup", + "proton-folder": "Proton folder", + "proton-folder-description": "Choose the folder to the Proton path. (eg. Proton - Experimental)", + "choose-folder": "選擇文件夾" } }, "maps": { diff --git a/assets/jsons/translations/zh.json b/assets/jsons/translations/zh.json index 0469ed39..19123d5d 100644 --- a/assets/jsons/translations/zh.json +++ b/assets/jsons/translations/zh.json @@ -442,6 +442,8 @@ "OCULUS_NOT_RUNNING": "Oculus 未运行", "BS_ALREADY_RUNNING": "Beat Saber 已在运行", "EXE_NOT_FINDED": "缺少文件", + "PROTON_NOT_SET": "Proton folder not set", + "PROTON_NOT_FOUND": "Proton binary not found", "EXIT": "突然停止", "OCULUS_LIB_NOT_FOUND": "未找到 Oculus 库" }, @@ -452,7 +454,9 @@ "BS_ALREADY_RUNNING": "再次启动前请关闭 BeatSaber。", "EXE_NOT_FINDED": "某些文件似乎丢失了，尝试验证文件。", "EXIT": "BeatSaber 突然停止，请检查文件。", - "OCULUS_LIB_NOT_FOUND": "检查 Oculus 应用是否正确安装，以及库是否在 Oculus 中正确定义。" + "OCULUS_LIB_NOT_FOUND": "检查 Oculus 应用是否正确安装，以及库是否在 Oculus 中正确定义。", + "PROTON_NOT_SET": "Set the Proton path in settings", + "PROTON_NOT_FOUND": "Set the Proton path in settings" }, "actions": { "STEAM_NOT_RUNNING": "启动 Steam" @@ -832,6 +836,12 @@ "choose-folder": "选择文件夹", "default": "默认", "default-tooltip": "默认为您的主文件夹" + }, + "linux-setup": { + "title": "Linux Setup", + "proton-folder": "Proton folder", + "proton-folder-description": "Choose the folder to the Proton path. (eg. Proton - Experimental)", + "choose-folder": "选择文件夹" } }, "maps": { diff --git a/src/main/constants.ts b/src/main/constants.ts index 3a3ba13f..a43daebd 100644 --- a/src/main/constants.ts +++ b/src/main/constants.ts @@ -16,3 +16,12 @@ export const CACHE_PATH = path.join(app.getPath("userData"), "CachedData"); export const IMAGE_CACHE_PATH = path.join(CACHE_PATH, "imagescache"); export const HTTP_STATUS_CODES = constants; + +// Linux related stuff + +export const PROTON_BINARY_PREFIX = "proton"; +export const WINE_BINARY_PREFIX = path.join( + "files", "bin", "wine" +); + + diff --git a/src/main/ipcs/index.ts b/src/main/ipcs/index.ts index f80cf9f8..b8d20b46 100644 --- a/src/main/ipcs/index.ts +++ b/src/main/ipcs/index.ts @@ -14,3 +14,4 @@ import "./model-saber.ipcs"; import "./bs-model-ipcs"; import "./bs-version-download/bs-download-ipcs"; import "./static-configuration.ipcs"; +import "./linux.ipcs.ts"; diff --git a/src/main/ipcs/linux.ipcs.ts b/src/main/ipcs/linux.ipcs.ts new file mode 100644 index 00000000..8a1a413c --- /dev/null +++ b/src/main/ipcs/linux.ipcs.ts @@ -0,0 +1,11 @@ +import { LinuxService } from "main/services/linux.service"; +import { IpcService } from "../services/ipc.service"; +import { of } from "rxjs"; + +const ipc = IpcService.getInstance(); +const linuxService = LinuxService.getInstance(); + +ipc.on("linux.verify-proton-folder", (_, reply) => { + reply(of(linuxService.verifyProtonPath())); +}); + diff --git a/src/main/services/bs-launcher/steam-launcher.service.ts b/src/main/services/bs-launcher/steam-launcher.service.ts index e2a42a27..5154d2e2 100644 --- a/src/main/services/bs-launcher/steam-launcher.service.ts +++ b/src/main/services/bs-launcher/steam-launcher.service.ts @@ -4,7 +4,7 @@ import { StoreLauncherInterface } from "./store-launcher.interface"; import { pathExists, pathExistsSync, rename } from "fs-extra"; import { SteamService } from "../steam.service"; import path from "path"; -import { BS_APP_ID, BS_EXECUTABLE, STEAMVR_APP_ID } from "../../constants"; +import { BS_APP_ID, BS_EXECUTABLE, PROTON_BINARY_PREFIX, STEAMVR_APP_ID } from "../../constants"; import log from "electron-log"; import { AbstractLauncherService } from "./abstract-launcher.service"; import { CustomError } from "../../../shared/models/exceptions/custom-error.class"; @@ -135,7 +135,7 @@ export class SteamLauncherService extends AbstractLauncherService implements Sto if (!this.staticConfig.has("proton-folder")) { throw CustomError.fromError(new Error("Proton folder not set"), BSLaunchError.PROTON_NOT_SET); } - exePath = path.join(this.staticConfig.get("proton-folder"), "proton"); + exePath = path.join(this.staticConfig.get("proton-folder"), PROTON_BINARY_PREFIX); if (!pathExistsSync(exePath)) { throw CustomError.fromError( new Error("Could not locate proton binary"), diff --git a/src/main/services/linux.service.ts b/src/main/services/linux.service.ts new file mode 100644 index 00000000..beeb1122 --- /dev/null +++ b/src/main/services/linux.service.ts @@ -0,0 +1,36 @@ +import path from "path"; +import { StaticConfigurationService } from "./static-configuration.service"; +import { pathExistsSync } from "fs-extra"; +import { PROTON_BINARY_PREFIX, WINE_BINARY_PREFIX } from "main/constants"; + + +// Linux handling +export class LinuxService { + private static instance: LinuxService; + + public static getInstance(): LinuxService { + if (!LinuxService.instance) { + LinuxService.instance = new LinuxService(); + } + return LinuxService.instance; + } + + private readonly staticConfig: StaticConfigurationService; + + private constructor() { + this.staticConfig = StaticConfigurationService.getInstance(); + } + + public verifyProtonPath(): boolean { + if (!this.staticConfig.has("proton-folder")) { + return false; + } + + const protonFolder = this.staticConfig.get("proton-folder"); + const protonPath = path.join(protonFolder, PROTON_BINARY_PREFIX); + const winePath = path.join(protonFolder, WINE_BINARY_PREFIX); + + return pathExistsSync(protonPath) && pathExistsSync(winePath); + } + +} diff --git a/src/main/services/mods/bs-mods-manager.service.ts b/src/main/services/mods/bs-mods-manager.service.ts index f91e967e..b5392a08 100644 --- a/src/main/services/mods/bs-mods-manager.service.ts +++ b/src/main/services/mods/bs-mods-manager.service.ts @@ -6,7 +6,7 @@ import path from "path"; import md5File from "md5-file"; import { RequestService } from "../request.service"; import { spawn } from "child_process"; -import { BS_EXECUTABLE } from "../../constants"; +import { BS_EXECUTABLE, WINE_BINARY_PREFIX } from "../../constants"; import log from "electron-log"; import { deleteFolder, pathExist, Progression, unlinkPath } from "../../helpers/fs.helpers"; import { lastValueFrom, Observable } from "rxjs"; @@ -153,7 +153,7 @@ export class BsModsManagerService { winePath = path.join( this.staticConfig.get("proton-folder"), - "files", "bin", "wine" + WINE_BINARY_PREFIX ); if (!pathExistsSync(winePath)) { diff --git a/src/main/services/static-configuration.service.ts b/src/main/services/static-configuration.service.ts index 112aa891..508df1ea 100644 --- a/src/main/services/static-configuration.service.ts +++ b/src/main/services/static-configuration.service.ts @@ -1,6 +1,7 @@ import ElectronStore from "electron-store"; import { pathExistsSync } from "fs-extra"; import path from "path"; +import { PROTON_BINARY_PREFIX, WINE_BINARY_PREFIX } from "main/constants"; import { Observable, Subject } from "rxjs"; import { BSVersion } from "shared/bs-version.interface"; import { CustomError } from "shared/models/exceptions/custom-error.class"; @@ -58,8 +59,8 @@ export class StaticConfigurationService { // Setters with validation private validateProtonFolder(protonFolder: string): void { - const protonPath = path.join(protonFolder, "proton"); - const winePath = path.join(protonFolder, "files", "bin", "wine"); + const protonPath = path.join(protonFolder, PROTON_BINARY_PREFIX); + const winePath = path.join(protonFolder, WINE_BINARY_PREFIX); if (!pathExistsSync(protonPath) || !pathExistsSync(winePath)) { throw new CustomError("Invalid proton folder path", "invalid-folder"); } diff --git a/src/renderer/components/modal/modal-types/ask-install-path.component.tsx b/src/renderer/components/modal/modal-types/setup/ask-install-path.component.tsx similarity index 100% rename from src/renderer/components/modal/modal-types/ask-install-path.component.tsx rename to src/renderer/components/modal/modal-types/setup/ask-install-path.component.tsx diff --git a/src/renderer/components/modal/modal-types/setup/linux-setup-modal.component.tsx b/src/renderer/components/modal/modal-types/setup/linux-setup-modal.component.tsx new file mode 100644 index 00000000..be6bef68 --- /dev/null +++ b/src/renderer/components/modal/modal-types/setup/linux-setup-modal.component.tsx @@ -0,0 +1,99 @@ +import { lastValueFrom } from "rxjs"; +import { useState } from "react"; +import { useTranslation } from "renderer/hooks/use-translation.hook"; +import { useService } from "renderer/hooks/use-service.hook"; + +import { IpcService } from "renderer/services/ipc.service"; +import { ModalComponent, ModalExitCode } from "renderer/services/modale.service"; +import { NotificationService } from "renderer/services/notification.service"; +import { StaticConfigurationService } from "renderer/services/static-configuration.service"; + +import { BsmButton } from "renderer/components/shared/bsm-button.component"; +import { SettingContainer } from "renderer/components/settings/setting-container.component"; + +export const LinuxSetupModal: ModalComponent<{}, {}> = ({ resolver }) => { + + const t = useTranslation(); + const ipcService = useService(IpcService); + const notificationService = useService(NotificationService); + const staticConfigService = useService(StaticConfigurationService); + + const [protonFolder, setProtonFolder] = useState(""); + + const validateFields = () => { + return !!protonFolder; + } + + const selectProtonPath = async () => { + const response = await lastValueFrom(ipcService.sendV2("choose-folder")); + if (response.canceled || !response.filePaths?.length) { + return; + } + + const path = response.filePaths[0]; + try { + await staticConfigService.set("proton-folder", path); + setProtonFolder(path); + validateFields(); + } catch (error: any) { + notificationService.notifyError({ + title: "pages.settings.proton-folder.errors.title", + desc: ["invalid-folder"].includes(error?.code) + ? `pages.settings.proton-folder.errors.${error.code}` + : "misc.unknown" + }); + } + } + + const onConfirmButtonPressed = async () => { + resolver({ + exitCode: ModalExitCode.COMPLETED + }); + } + + return ( +
{ + event.preventDefault(); + onConfirmButtonPressed(); + }}> + +

+ {t("modals.linux-setup.title")} +

+ + +
+ + {protonFolder} + + +
+ + +
+ +
+
+ ) +} diff --git a/src/renderer/services/setup.service.ts b/src/renderer/services/setup.service.ts index 5bb38f18..0c871836 100644 --- a/src/renderer/services/setup.service.ts +++ b/src/renderer/services/setup.service.ts @@ -6,7 +6,8 @@ import { InstallationLocationService } from "./installation-location.service"; import { IpcService } from "./ipc.service"; import { ModalService } from "./modale.service"; -import { AskInstallPathModal } from "renderer/components/modal/modal-types/ask-install-path.component"; +import { AskInstallPathModal } from "renderer/components/modal/modal-types/setup/ask-install-path.component"; +import { LinuxSetupModal } from "renderer/components/modal/modal-types/setup/linux-setup-modal.component"; // Handle setup modals/prompts, ordering of the modals/prompts may be done here export class SetupService { @@ -35,6 +36,10 @@ export class SetupService { try { // NOTE: for modal sequencing await this.checkInstallationPath(); + + if (window.electron.platform === "linux") { + await this.checkProtonFolder(); + } } catch (error) { logRenderError(error); } @@ -61,4 +66,20 @@ export class SetupService { } } + private async checkProtonFolder(): Promise { + try { + const valid = await lastValueFrom(this.ipcService.sendV2("linux.verify-proton-folder")); + if (valid) { + return; + } + + await this.modalService.openModal( + LinuxSetupModal, + { closable: false } + ); + } catch (error) { + logRenderError(error); + } + } + } diff --git a/src/shared/models/ipc/ipc-routes.ts b/src/shared/models/ipc/ipc-routes.ts index ef7a71f7..89eac79c 100644 --- a/src/shared/models/ipc/ipc-routes.ts +++ b/src/shared/models/ipc/ipc-routes.ts @@ -150,6 +150,9 @@ export interface IpcChannelMapping { "static-configuration.get": StaticConfigGetIpcRequestResponse; "static-configuration.set": StaticConfigSetIpcRequest; + /* ** linux.ipcs ** */ + "linux.verify-proton-folder": { request: void, response: boolean }; + /* ** OTHERS (if your IPC channel is not in a "-ipcs" file, put it here) ** */ "shortcut-launch-options": { request: void, response: LaunchOption }; }