onItemSelected(i)} key={i.id} className={`py-3 w-full flex cursor-pointer justify-between items-center rounded-md px-2 transition-colors duration-300 ${isSelected(i) ? "bg-light-main-color-3 dark:bg-main-color-3" : "bg-light-main-color-1 dark:bg-main-color-1"} ${i.className}`}>
+
onItemSelected(i)} key={i.id} className={`h-12 py-3 w-full flex cursor-pointer justify-between rounded-md px-2 transition-colors duration-300 ${isSelected(i) ? "bg-light-main-color-3 dark:bg-main-color-3" : "bg-light-main-color-1 dark:bg-main-color-1"} ${i.className}`}>
-
{t(i.text)}
+
{t(i.text)}
{i.icon && (
-
+
{i.textIcon && {t(i.textIcon)}}
{i.icon}
diff --git a/src/renderer/pages/settings-page.component.tsx b/src/renderer/pages/settings-page.component.tsx
index 5a4a6afe..06ffd199 100644
--- a/src/renderer/pages/settings-page.component.tsx
+++ b/src/renderer/pages/settings-page.component.tsx
@@ -498,7 +498,7 @@ export function SettingsPage() {
-
+
From b00d41f98f68655d70d8e2571ddf84bc558278f2 Mon Sep 17 00:00:00 2001
From: silentrald
Date: Sat, 14 Jun 2025 20:53:56 +0800
Subject: [PATCH 16/21] [fix] custom mods should be appended on version page
load (#878)
* [fix] custom mods should be appended on version page load
* refactored the code to use hooks for readability
* Use "useCallback" to avoid unnecessary redeclarations
---------
Co-authored-by: Zagrios <40181755+Zagrios@users.noreply.github.com>
---
.../slides/launch/launch-slide.component.tsx | 152 +++++++++++++-----
1 file changed, 108 insertions(+), 44 deletions(-)
diff --git a/src/renderer/components/version-viewer/slides/launch/launch-slide.component.tsx b/src/renderer/components/version-viewer/slides/launch/launch-slide.component.tsx
index 7c8e52cb..37d3dce1 100644
--- a/src/renderer/components/version-viewer/slides/launch/launch-slide.component.tsx
+++ b/src/renderer/components/version-viewer/slides/launch/launch-slide.component.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
import { BsmButton } from "renderer/components/shared/bsm-button.component";
import { useObservable } from "renderer/hooks/use-observable.hook";
import { useTranslationV2 } from "renderer/hooks/use-translation.hook";
@@ -30,29 +30,13 @@ import { CreateCustomLaunchOptionModal } from "renderer/components/modal/modal-t
type Props = { version: BSVersion };
-export function LaunchSlide({ version }: Props) {
- const { text: t, element: te } = useTranslationV2();
-
- const configService = useService(ConfigurationService);
+function useLaunchMods() {
const bsLauncherService = useService(BSLauncherService);
- const bsDownloader = useService(BsDownloaderService);
- const versions = useService(BSVersionManagerService);
- const modal = useService(ModalService);
+ const configService = useService(ConfigurationService);
- const [advancedLaunch, setAdvancedLaunch] = useState(false);
- const [command, setCommand] = useState(configService.get("launch-command") || "");
- const customLaunchOptions = useObservable(() => configService.watch("custom-launch-options"), []);
- const [customLaunchModsArgs, setCustomLaunchModsArgs] = useState([]);
- const versionDownloading = useObservable(() => bsDownloader.downloadingVersion$);
const [activeLaunchMods, setActiveLaunchMods] = useState(configService.get("launch-mods") ?? []);
const [pinnedLaunchMods, setPinnedLaunchMods] = useState(configService.get("pinned-launch-mods" as DefaultConfigKey) ?? []);
- const versionRunning = useObservable(() => bsLauncherService.versionRunning$);
-
- useEffect(() => {
- configService.set("launch-command", command);
- }, [command]);
-
useEffect(() => {
configService.set("pinned-launch-mods", pinnedLaunchMods);
}, [pinnedLaunchMods])
@@ -65,24 +49,66 @@ export function LaunchSlide({ version }: Props) {
}
}, [activeLaunchMods]);
- const toggleActiveLaunchMod = (checked: boolean, launchMod: string) => checked
+ const toggleActiveLaunchMod = useCallback((checked: boolean, launchMod: string) => checked
? setActiveLaunchMods(prev => [...prev, launchMod])
- : setActiveLaunchMods(prev => prev.filter(mod => mod !== launchMod));
+ : setActiveLaunchMods(prev => prev.filter(mod => mod !== launchMod)),
+ []);
- const togglePinnedLaunchMod = (pinned: boolean, launchMod: string) => pinned
+ const togglePinnedLaunchMod = useCallback((pinned: boolean, launchMod: string) => pinned
? setPinnedLaunchMods(prev => [...prev, launchMod])
- : setPinnedLaunchMods(prev => prev.filter(mod => mod !== launchMod));
+ : setPinnedLaunchMods(prev => prev.filter(mod => mod !== launchMod)),
+ []);
- const launchModItems = useMemo(() => {
+ return {
+ activeLaunchMods,
+ pinnedLaunchMods,
+ toggleActiveLaunchMod,
+ togglePinnedLaunchMod,
+ }
+}
- let protonLogsPath: string[] = [];
- if (window.electron.platform === "linux") {
- protonLogsPath = version.steam
- ? [version.path, "Logs"]
- : ["BSInstances", version.name, "Logs"];
- }
+function useCustomLaunchMods({
+ activeLaunchMods, pinnedLaunchMods,
+ toggleActiveLaunchMod,
+ togglePinnedLaunchMod,
+}: {
+ activeLaunchMods: string[];
+ pinnedLaunchMods: string[];
- const customOptions = customLaunchOptions?.map(option => ({
+ toggleActiveLaunchMod: (checked: boolean, launchMod: string) => void;
+ togglePinnedLaunchMod: (checked: boolean, launchMod: string) => void;
+}) {
+ const configService = useService(ConfigurationService);
+ const modalService = useService(ModalService);
+
+ const customLaunchOptions = useObservable(() => (
+ configService.watch("custom-launch-options")
+ ), []);
+
+ const [customLaunchModsArgs, setCustomLaunchModsArgs] = useState([]);
+
+ useEffect(() => {
+ const command = customLaunchOptions
+ ?.map(option => option.data.command || "")
+ .filter(Boolean);
+ setCustomLaunchModsArgs(() => command ?? []);
+ }, [customLaunchOptions]);
+
+ const deleteCustomLaunchOption = useCallback((id: string) => {
+ const newCustomLaunchOptions = (customLaunchOptions ?? []).filter(mode => mode.id !== id);
+ configService.set("custom-launch-options", newCustomLaunchOptions);
+ }, [customLaunchOptions]);
+
+ const saveCustomLaunchOption = useCallback(async (option: Partial) => {
+ const result = await modalService.openModal(CreateCustomLaunchOptionModal, { data: option });
+ if(result.exitCode !== ModalExitCode.COMPLETED) { return; }
+ const newCustomLaunchOptions = (customLaunchOptions ?? []).filter(mode => mode.id !== result.data.id);
+ newCustomLaunchOptions.push(result.data);
+ configService.set("custom-launch-options", newCustomLaunchOptions);
+ }, [customLaunchOptions]);
+
+ const getCustomLaunch = useCallback(() => {
+ return customLaunchOptions?.map(option => ({
id: option.id,
label: option.label,
active: activeLaunchMods.includes(option.id),
@@ -104,6 +130,57 @@ export function LaunchSlide({ version }: Props) {
deleteCustomLaunchOption(option.id);
},
})) ?? [];
+ }, [customLaunchOptions, activeLaunchMods, pinnedLaunchMods])
+
+ return {
+ customLaunchOptions,
+ customLaunchModsArgs,
+ getCustomLaunch,
+ saveCustomLaunchOption
+ };
+}
+
+export function LaunchSlide({ version }: Props) {
+ const { text: t, element: te } = useTranslationV2();
+
+ const configService = useService(ConfigurationService);
+ const bsLauncherService = useService(BSLauncherService);
+ const bsDownloader = useService(BsDownloaderService);
+ const versions = useService(BSVersionManagerService);
+
+ const [advancedLaunch, setAdvancedLaunch] = useState(false);
+ const [command, setCommand] = useState(configService.get("launch-command") || "");
+ const versionDownloading = useObservable(() => bsDownloader.downloadingVersion$);
+ const versionRunning = useObservable(() => bsLauncherService.versionRunning$);
+
+ const {
+ activeLaunchMods, pinnedLaunchMods,
+ toggleActiveLaunchMod, togglePinnedLaunchMod,
+ } = useLaunchMods();
+
+ const {
+ customLaunchOptions, customLaunchModsArgs,
+ getCustomLaunch, saveCustomLaunchOption,
+ } = useCustomLaunchMods({
+ activeLaunchMods, pinnedLaunchMods,
+ toggleActiveLaunchMod,
+ togglePinnedLaunchMod,
+ });
+
+ useEffect(() => {
+ configService.set("launch-command", command);
+ }, [command]);
+
+ const launchModItems = useMemo(() => {
+
+ let protonLogsPath: string[] = [];
+ if (window.electron.platform === "linux") {
+ protonLogsPath = version.steam
+ ? [version.path, "Logs"]
+ : ["BSInstances", version.name, "Logs"];
+ }
+
+ const customOptions = getCustomLaunch();
return [
{
@@ -187,19 +264,6 @@ export function LaunchSlide({ version }: Props) {
return safeLt(version?.BSVersion, versions.getRecommendedVersion()?.BSVersion);
}, [version]);
- const saveCustomLaunchOption = async (option: Partial) => {
- const result = await modal.openModal(CreateCustomLaunchOptionModal, { data: option });
- if(result.exitCode !== ModalExitCode.COMPLETED) { return; }
- const newCustomLaunchOptions = (customLaunchOptions ?? []).filter(mode => mode.id !== result.data.id);
- newCustomLaunchOptions.push(result.data);
- configService.set("custom-launch-options", newCustomLaunchOptions);
- }
-
- const deleteCustomLaunchOption = (id: string) => {
- const newCustomLaunchOptions = (customLaunchOptions ?? []).filter(mode => mode.id !== id);
- configService.set("custom-launch-options", newCustomLaunchOptions);
- }
-
return (
From c6500f7cf60f6fae79fdccff1cd4b1a0e4e30bc6 Mon Sep 17 00:00:00 2001
From: silentrald
Date: Sat, 21 Jun 2025 16:35:28 +0800
Subject: [PATCH 17/21] [fix] use a caching method for ipv4/6 request calls
(#872)
* Revert "[bugfix] Remove the ipv4/ipv6 stuff that cause more issue than is solves"
This reverts commit c763e0fefc265e470fb306ef3657f9c8ceb7bf31.
* [fix] use a caching method for ipv4/6 request calls
* Add caching logs
---------
Co-authored-by: Zagrios <40181755+Zagrios@users.noreply.github.com>
---
.../services/mods/beat-mods-api.service.ts | 3 +-
src/main/services/request.service.ts | 210 ++++++++++++------
2 files changed, 141 insertions(+), 72 deletions(-)
diff --git a/src/main/services/mods/beat-mods-api.service.ts b/src/main/services/mods/beat-mods-api.service.ts
index c0136b96..8e63f141 100644
--- a/src/main/services/mods/beat-mods-api.service.ts
+++ b/src/main/services/mods/beat-mods-api.service.ts
@@ -76,8 +76,7 @@ export class BeatModsApiService {
}
return this.requestService.getJSON<{ modVersions: BbmModVersion[] }>(
- `${this.MODS_REPO_API_URL}/hashlookup?hash=${hash}`,
- { silentError: true }
+ `${this.MODS_REPO_API_URL}/hashlookup?hash=${hash}`
).then(({ data }) => {
this.updateModsHashCache(data?.modVersions ?? []);
return data?.modVersions?.at(0);
diff --git a/src/main/services/request.service.ts b/src/main/services/request.service.ts
index 8ade56ce..863c1bd9 100644
--- a/src/main/services/request.service.ts
+++ b/src/main/services/request.service.ts
@@ -9,6 +9,7 @@ import { tryit } from 'shared/helpers/error.helpers';
import path from 'path';
import { pipeline } from 'stream/promises';
import sanitize from 'sanitize-filename';
+import internal from 'stream';
import { app } from 'electron';
export class RequestService {
@@ -17,31 +18,55 @@ export class RequestService {
'User-Agent': `BSManager/${app.getVersion()} (Electron/${process.versions.electron} Chrome/${process.versions.chrome} Node/${process.versions.node})`,
}
+ private readonly PREFERRED_FAMILY_TESTS = [4, 6];
+ private preferredFamilyCache: Record = {};
public static getInstance(): RequestService {
if (!RequestService.instance) {
RequestService.instance = new RequestService();
}
return RequestService.instance;
-
}
private constructor() {}
- public async getJSON(url: string, options?: {
- silentError?: boolean
- }): Promise<{ data: T; headers: IncomingHttpHeaders }> {
-
- try {
- // @ts-ignore (ESM is not well supported in this project, We need to move out electron-react-boilerplate, and use Vite)
- const res = await got(url, { responseType: 'json', headers: this.baseHeaders });
- return { data: res.body as T, headers: res.headers };
- } catch (err) {
- if (options?.silentError !== true) {
- log.error(`Failed to get JSON from URL: ${url}`, err);
+ public async getJSON(url: string): Promise<{ data: T; headers: IncomingHttpHeaders }> {
+ const domain = (new URL(url)).hostname;
+ const cachedFamily = this.preferredFamilyCache[domain];
+ if (cachedFamily) {
+ try {
+ return await this.requestData(url, cachedFamily);
+ } catch (error: any) {
+ throw new Error(`Request failed: ${url}`, error);
}
- throw err;
}
+
+ // Try on each IPv4/6 families on first request to a domain/website
+ for (const family of this.PREFERRED_FAMILY_TESTS) {
+ try {
+ const response = await this.requestData(url, family);
+ log.info(`Caching "${domain}" with IPv${family}`);
+ this.preferredFamilyCache[domain] = family;
+ return response;
+ } catch (err) {
+ log.warn(`IPv${family} request failed, trying next one... URL: ${url}`, err);
+ }
+ }
+
+ throw new Error(`IPv4 and IPv6 requests failed for URL: ${url}`);
+ }
+
+ private async requestData(url: string, family: number): Promise<{ data: T; headers: IncomingHttpHeaders }> {
+ const response = await got(url, {
+ // @ts-ignore (ESM is not well supported in this project, We need to move out electron-react-boilerplate, and use Vite)
+ dnsLookupIpVersion: family,
+ responseType: "json",
+ headers: this.baseHeaders
+ });
+ return {
+ data: response.body as T,
+ headers: response.headers
+ };
}
public downloadFile(
@@ -52,46 +77,69 @@ export class RequestService {
return new Observable>((subscriber) => {
const progress: Progression = { current: 0, total: 0 };
- let file: WriteStream | undefined;
+ let attempt = 0;
+ let stream: got.GotEmitter & internal.Duplex;
- // @ts-ignore (ESM is not well supported in this project, We need to move out electron-react-boilerplate, and use Vite)
- const stream = got.stream(url, { headers: this.baseHeaders });
+ const domain = (new URL(url)).hostname;
+ const cachedFamily = this.preferredFamilyCache[domain];
+ const familiesToTry = cachedFamily
+ ? [ cachedFamily ] : this.PREFERRED_FAMILY_TESTS;
- stream.on('response', (response) => {
-
- const filename = opt?.preferContentDisposition ? this.getFilenameFromContentDisposition(response.headers['content-disposition']) : null;
-
- if (filename) {
- dest = path.join(path.dirname(dest), sanitize(filename));
+ const tryNextFamily = () => {
+ if (attempt >= familiesToTry.length) {
+ subscriber.error(new Error(`Download failed over IPv4 and IPv6 for URL: ${url}`));
+ return;
}
- progress.data = dest;
- file = createWriteStream(dest);
+ const family = familiesToTry[attempt++];
+ let file: WriteStream | undefined;
- pipeline(stream, file).catch(err => {
- file?.destroy();
- tryit(() => deleteFileSync(dest));
- subscriber.error(err);
+ // @ts-ignore (ESM is not well supported in this project, We need to move out electron-react-boilerplate, and use Vite)
+ stream = got.stream(url, { dnsLookupIpVersion: family, headers: this.baseHeaders });
+
+ stream.on('response', (response) => {
+ if (!cachedFamily) {
+ log.info(`Caching "${domain}" with IPv${family}`);
+ this.preferredFamilyCache[domain] = family;
+ }
+
+ const filename = opt?.preferContentDisposition ? this.getFilenameFromContentDisposition(response.headers['content-disposition']) : null;
+
+ if (filename) {
+ dest = path.join(path.dirname(dest), sanitize(filename));
+ }
+
+ progress.data = dest;
+ file = createWriteStream(dest);
+
+ pipeline(stream, file).catch(err => {
+ file?.destroy();
+ tryit(() => deleteFileSync(dest));
+ subscriber.error(err);
+ });
});
- });
- stream.on('downloadProgress', ({ transferred, total }) => {
- progress.current = transferred;
- progress.total = total;
- subscriber.next(progress);
- });
+ stream.on('downloadProgress', ({ transferred, total }) => {
+ progress.current = transferred;
+ progress.total = total;
+ subscriber.next(progress);
+ });
- stream.on('error', err => {
- log.error(`Download failed for URL: ${url}`, err);
- stream.destroy();
- file?.destroy();
- });
+ stream.on('error', err => {
+ log.warn(`Download failed over IPv${family} for URL: ${url}`, err);
+ stream.destroy();
+ file?.destroy();
+ tryNextFamily();
+ });
- stream.on('end', () => {
- file?.end();
- subscriber.next(progress);
- subscriber.complete();
- });
+ stream.on('end', () => {
+ file?.end();
+ subscriber.next(progress);
+ subscriber.complete();
+ });
+ };
+
+ tryNextFamily();
return () => {
stream?.destroy();
@@ -106,7 +154,6 @@ export class RequestService {
url: string,
options?: got.GotOptions
): Observable> {
-
return new Observable>((subscriber) => {
const progress: Progression = {
current: 0,
@@ -116,37 +163,60 @@ export class RequestService {
const headers = { ...this.baseHeaders, ...(options?.headers ?? {}) };
- // @ts-ignore (ESM is not well supported in this project, We need to move out electron-react-boilerplate, and use Vite)
- const stream = got.stream(url, { ...(options ?? {}), headers });
+ let attempt = 0;
+ let stream: got.GotEmitter & internal.Duplex;
- let data = Buffer.alloc(0);
- let response: IncomingMessage;
+ const domain = (new URL(url)).hostname;
+ const cachedFamily = this.preferredFamilyCache[domain];
+ const familiesToTry = cachedFamily
+ ? [ cachedFamily ] : this.PREFERRED_FAMILY_TESTS;
- stream.once('response', (res) => {
- response = res;
- });
+ const tryNextFamily = () => {
+ if (attempt >= familiesToTry.length) {
+ subscriber.error(new Error(`Download failed over IPv4 and IPv6 for URL: ${url}`));
+ return;
+ }
- stream.on('data', (chunk: Buffer) => {
- data = Buffer.concat([data, chunk]);
- });
+ const family = familiesToTry[attempt++];
+ // @ts-ignore (ESM is not well supported in this project, We need to move out electron-react-boilerplate, and use Vite)
+ stream = got.stream(url, { dnsLookupIpVersion: family, ...(options ?? {}), headers });
- stream.on('downloadProgress', ({ transferred, total }) => {
- progress.current = transferred;
- progress.total = total;
- subscriber.next(progress);
- });
+ let data = Buffer.alloc(0);
+ let response: IncomingMessage;
- stream.on('error', err => {
- log.error(`Download failed for URL: ${url}`, err);
- stream.destroy();
- });
+ stream.once('response', (res) => {
+ if (!cachedFamily) {
+ log.info(`Caching "${domain}" with IPv${family}`);
+ this.preferredFamilyCache[domain] = family;
+ }
+ response = res;
+ });
- stream.on('end', () => {
- progress.data = data;
- progress.extra = response;
- subscriber.next(progress);
- subscriber.complete();
- });
+ stream.on('data', (chunk: Buffer) => {
+ data = Buffer.concat([data, chunk]);
+ });
+
+ stream.on('downloadProgress', ({ transferred, total }) => {
+ progress.current = transferred;
+ progress.total = total;
+ subscriber.next(progress);
+ });
+
+ stream.on('error', err => {
+ log.warn(`Download failed over IPv${family} for URL: ${url}`, err);
+ stream.destroy();
+ tryNextFamily();
+ });
+
+ stream.on('end', () => {
+ progress.data = data;
+ progress.extra = response;
+ subscriber.next(progress);
+ subscriber.complete();
+ });
+ };
+
+ tryNextFamily();
return () => {
stream?.destroy();
From 06c242eb01632c4b71e5f838be3a317604a2869f Mon Sep 17 00:00:00 2001
From: silentrald
Date: Sat, 21 Jun 2025 19:54:04 +0800
Subject: [PATCH 18/21] [fix] fixed issue with double http prepending on http
proxy (#889)
---
src/main/helpers/proxy.helpers.ts | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/main/helpers/proxy.helpers.ts b/src/main/helpers/proxy.helpers.ts
index 0a102b13..98175230 100644
--- a/src/main/helpers/proxy.helpers.ts
+++ b/src/main/helpers/proxy.helpers.ts
@@ -51,7 +51,15 @@ async function enableWindowsProxy(enable: boolean): Promise {
}
if (enable) {
- const httpProxyUrl = `http://${await getProxyServer().catch(err => log.error(err))}`
+ const httpProxyServer = await getProxyServer().catch(err => log.error(err));
+ let httpProxyUrl: string | null = null;
+ if (httpProxyServer) {
+ // Prepend the http protocol
+ httpProxyUrl = httpProxyServer.startsWith("http://")
+ ? httpProxyServer
+ : `http://${httpProxyServer}`;
+ }
+
globalProxyAgent.HTTP_PROXY = httpProxyUrl;
globalProxyAgent.HTTPS_PROXY = httpProxyUrl;
globalProxyAgent.NO_PROXY = `${await getProxyOverride().catch(err => log.error(err))}`;
From 46556cf3cc428474d2beb34d2844d74e48c1c64d Mon Sep 17 00:00:00 2001
From: silentrald
Date: Tue, 1 Jul 2025 14:54:22 +0800
Subject: [PATCH 19/21] [fix] added error logging when getting the steam
version path (#890)
---
src/main/services/bs-local-version.service.ts | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/services/bs-local-version.service.ts b/src/main/services/bs-local-version.service.ts
index 5e73f99d..1c8d29ee 100644
--- a/src/main/services/bs-local-version.service.ts
+++ b/src/main/services/bs-local-version.service.ts
@@ -244,8 +244,12 @@ export class BSLocalVersionService {
private async getSteamVersion(): Promise {
const steamBsFolder = await this.steamService.getGameFolder(BS_APP_ID, "Beat Saber");
- if (!steamBsFolder || !(await pathExists(steamBsFolder))) {
- return null;
+ if (!steamBsFolder) {
+ throw new Error("No Beat Saber Steam version found");
+ }
+
+ if (!(await pathExists(steamBsFolder))) {
+ throw new Error(`Beat Saber Steam version not found in "${steamBsFolder}"`);
}
return this.getVersionOfBSFolder(steamBsFolder, { steam: true });
@@ -265,7 +269,8 @@ export class BSLocalVersionService {
const versions: BSVersion[] = [];
const steamVersion = await this.getSteamVersion().catch(e => {
- log.error("unable to get original Steam version", e);
+ log.error("Unable to get original Steam version", e);
+ return null;
});
if (steamVersion) {
From b1d9a29da982bc2c1e587aa98aabb942377f140c Mon Sep 17 00:00:00 2001
From: Zagrios <40181755+Zagrios@users.noreply.github.com>
Date: Tue, 1 Jul 2025 08:59:51 +0200
Subject: [PATCH 20/21] [fix] do not change the installation path if its the
same path
---
src/renderer/pages/settings-page.component.tsx | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/renderer/pages/settings-page.component.tsx b/src/renderer/pages/settings-page.component.tsx
index 06ffd199..0216f6a6 100644
--- a/src/renderer/pages/settings-page.component.tsx
+++ b/src/renderer/pages/settings-page.component.tsx
@@ -202,11 +202,18 @@ export function SettingsPage() {
const fileChooserRes = await lastValueFrom(ipcService.sendV2("choose-folder"));
if (!fileChooserRes.canceled && fileChooserRes.filePaths?.length) {
+
+ const newInstallationPath = fileChooserRes.filePaths[0];
+
+ if(newInstallationPath === installationFolder){
+ return;
+ }
+
progressBarService.showFake(0.008);
notificationService.notifySuccess({ title: "notifications.settings.move-folder.success.titles.transfer-started", desc: "notifications.settings.move-folder.success.descs.transfer-started" });
- lastValueFrom(installationLocationService.setInstallationFolder(fileChooserRes.filePaths[0], true)).then(res => {
+ lastValueFrom(installationLocationService.setInstallationFolder(newInstallationPath, true)).then(res => {
progressBarService.complete();
progressBarService.hide();
From 5b5a4a0817d7ac2f7a5bd88934a293df291203fc Mon Sep 17 00:00:00 2001
From: Zagrios <40181755+Zagrios@users.noreply.github.com>
Date: Tue, 1 Jul 2025 09:30:47 +0200
Subject: [PATCH 21/21] Make the "create steam shortcut" always visible + make
buttons bigger (#892)
---
...create-launch-shortcut-modal.component.tsx | 27 +++++++------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/src/renderer/components/modal/modal-types/create-launch-shortcut-modal.component.tsx b/src/renderer/components/modal/modal-types/create-launch-shortcut-modal.component.tsx
index 5c44584d..6c2e0057 100644
--- a/src/renderer/components/modal/modal-types/create-launch-shortcut-modal.component.tsx
+++ b/src/renderer/components/modal/modal-types/create-launch-shortcut-modal.component.tsx
@@ -6,13 +6,12 @@ import { BsmButton } from "renderer/components/shared/bsm-button.component";
import { LaunchOption } from "shared/models/bs-launch";
import { useService } from "renderer/hooks/use-service.hook";
import { BSLauncherService } from "renderer/services/bs-launcher.service";
-import { useMemo, useState } from "react";
+import { useState } from "react";
import { BsNoteFill } from "renderer/components/svgs/icons/bs-note-fill.component";
import { useThemeColor } from "renderer/hooks/use-theme-color.hook";
import { ChevronTopIcon } from "renderer/components/svgs/icons/chevron-top-icon.component";
import Tippy from "@tippyjs/react";
import { LaunchMod } from "shared/models/bs-launch/launch-option.interface";
-import { BsStore } from "shared/models/bs-store.enum";
export const CreateLaunchShortcutModal: ModalComponent<{ steamShortcut: boolean, launchOption: LaunchOption }, BSVersion> = ({resolver, options: {data}}) => {
@@ -26,10 +25,6 @@ export const CreateLaunchShortcutModal: ModalComponent<{ steamShortcut: boolean,
const [command, setCommand] = useState(launchOption.command || "");
const [steamShortcut, setSteamShortcut] = useState(false);
- const isSteamVersion = useMemo(() => {
- return data.steam || data.metadata?.store === BsStore.STEAM;
- }, [data]);
-
const completeModal = () => {
launchOption.command = command.trim();
resolver({exitCode: ModalExitCode.COMPLETED, data: { launchOption, steamShortcut }});
@@ -96,17 +91,15 @@ export const CreateLaunchShortcutModal: ModalComponent<{ steamShortcut: boolean,
- {isSteamVersion && (
-
-
- setSteamShortcut(() => e)} />
- {t("modals.create-launch-shortcut.create-steam-shortcut")}
-
-
- )}
-
-
resolver({ exitCode: ModalExitCode.CANCELED })} withBar={false} text="misc.cancel" />
-
+
+
+ setSteamShortcut(() => e)} />
+ {t("modals.create-launch-shortcut.create-steam-shortcut")}
+
+
+
+ resolver({ exitCode: ModalExitCode.CANCELED })} withBar={false} text="misc.cancel" />
+
)
From dfe63e525e7fac54547b9c9ebca9dabebe97b607 Mon Sep 17 00:00:00 2001
From: Sapphire