void }) {
+export type ModsSlideRef = {
+ loadMods: () => Promise;
+}
+
+type Props = { version: BSVersion; isActive?: boolean, onDisclamerDecline: () => void };
+
+export const ModsSlide = forwardRef(({ version, isActive, onDisclamerDecline }, forwaredRef) => {
const ACCEPTED_DISCLAIMER_KEY = "accepted-mods-disclaimer";
const { text: t } = useTranslationV2();
@@ -100,14 +106,7 @@ export function ModsSlide({ version, isActive, onDisclamerDecline }: { version:
return Array.from(collectedDependencies);
};
- const installMods = (reinstallAll: boolean): void => {
-
- setReinstallAllMods(false);
-
- if (installing) {
- return;
- }
-
+ const getModsToInstall = (reinstallAll?: boolean): BbmFullMod[] => {
let modsToInstall = [
...modsSelected,
...getAllDependencies(modsSelected, Array.from(modsAvailable.values()).flat())
@@ -127,18 +126,30 @@ export function ModsSlide({ version, isActive, onDisclamerDecline }: { version:
set.delete(null);
set.delete(undefined);
- modsToInstall = Array.from(set); // Remove duplicates
+ return Array.from(set); // Remove duplicates
+ }
+
+ const installMods = (reinstallAll: boolean): Promise => {
+
+ setReinstallAllMods(false);
+
+ if (installing) {
+ return Promise.resolve();
+ }
+
+ const modsToInstall = getModsToInstall(reinstallAll);
if (!modsToInstall.length) {
notification.notifyInfo({ title: "pages.version-viewer.mods.notifications.all-mods-already-installed.title", desc: "pages.version-viewer.mods.notifications.all-mods-already-installed.description" });
- loadMods();
- return;
+ return loadMods();
}
setInstalling(() => true)
- lastValueFrom(modsManager.installMods(modsToInstall, version)).then(() => {
- loadMods();
- }).catch(noop).finally(() => setInstalling(() => false));
+ return lastValueFrom(modsManager.installMods(modsToInstall, version)).then(() => (
+ loadMods()
+ )).catch(noop).finally(() => (
+ setInstalling(() => false)
+ ));
};
const importMods = (files: string[]): void => {
@@ -179,26 +190,19 @@ export function ModsSlide({ version, isActive, onDisclamerDecline }: { version:
return Promise.resolve();
}
- const promise = async (): Promise<[BbmFullMod[], BbmModVersion[]]> => {
- const available = await lastValueFrom(modsManager.getAvailableMods(version));
- const installed = await lastValueFrom(modsManager.getInstalledMods(version));
- return [available, installed];
- }
-
- return promise().then(([available, installed]) => {
+ return modsManager.getVersionModsState(version).then(({ available, installed }) => {
const defaultMods = installed?.length ? [] : available.filter(m => m.mod.category === BbmCategories.Core || m.mod.category === BbmCategories.Essential);
setModsAvailable(() => modsToCategoryMap(available));
- const installedMods: BbmFullMod[] = installed.map(version => {
- const mod = available.find(m => m.mod.id === version.modId);
- return mod ? { ...mod, version } : null;
- }).filter(mod => mod);
-
- setModsSelected(available.filter(m => m.mod.category === BbmCategories.Core || defaultMods.some(d => m.mod.name.toLowerCase() === d.mod.name.toLowerCase()) || installedMods.some(i => m.mod.id === i.mod.id)));
- setModsInstalled(modsToCategoryMap(installedMods));
+ setModsSelected(available.filter(m => m.mod.category === BbmCategories.Core || defaultMods.some(d => m.mod.name.toLowerCase() === d.mod.name.toLowerCase()) || installed.some(i => m.mod.id === i.mod.id)));
+ setModsInstalled(modsToCategoryMap(installed));
});
};
+ useImperativeHandle(forwaredRef, () => ({
+ loadMods
+ }), [version]);
+
useEffect(() => {
if(!isActive || !isOnline){
@@ -325,7 +329,7 @@ export function ModsSlide({ version, isActive, onDisclamerDecline }: { version:
);
-}
+});
function ModStatus({ text, image, spin = false, children }: { text: string; image: string; spin?: boolean, children?: ReactNode}) {
const t = useTranslation();
diff --git a/src/renderer/config/default-configuration.config.ts b/src/renderer/config/default-configuration.config.ts
index a9763d2d..e2c2bd90 100644
--- a/src/renderer/config/default-configuration.config.ts
+++ b/src/renderer/config/default-configuration.config.ts
@@ -25,7 +25,7 @@ export const defaultConfiguration: {
"second-color": "#ff4444",
theme: "os",
language: window.navigator.language.length <= 2 ? `${window.navigator.language}-${window.navigator.language.toLocaleUpperCase()}` : window.navigator.language,
- supported_languages: ["en-US", "en-EN", "fr-FR", "es-ES", "it-IT", "de-DE", "ru-RU", "zh-CN", "zh-TW", "ja-JP", "ko-KR"],
+ supported_languages: ["en-US", "en-EN", "fr-FR", "es-ES", "it-IT", "de-DE", "ru-RU", "zh-CN", "zh-TW", "ja-JP", "ko-KR", "pt-BR"],
default_mods: ["SongCore", "WhyIsThereNoLeaderboard", "BeatSaverDownloader", "BeatSaverVoting", "PlaylistManager"],
"default-shared-folders": [
window.electron.path.join("Beat Saber_Data", "CustomLevels"),
diff --git a/src/renderer/pages/version-viewer.component.tsx b/src/renderer/pages/version-viewer.component.tsx
index d79f9d67..601e3063 100644
--- a/src/renderer/pages/version-viewer.component.tsx
+++ b/src/renderer/pages/version-viewer.component.tsx
@@ -1,5 +1,5 @@
import { BSVersion } from "shared/bs-version.interface";
-import { useState } from "react";
+import { useRef, useState } from "react";
import { Navigate, useLocation, useNavigate } from "react-router-dom";
import { TabNavBar } from "renderer/components/shared/tab-nav-bar.component";
import { BsmDropdownButton } from "renderer/components/shared/bsm-dropdown-button.component";
@@ -10,7 +10,7 @@ import { ModalExitCode, ModalService } from "../services/modale.service";
import DefautVersionImage from "../../../assets/images/default-version-img.jpg";
import { IpcService } from "renderer/services/ipc.service";
import { LaunchSlide } from "renderer/components/version-viewer/slides/launch/launch-slide.component";
-import { ModsSlide } from "renderer/components/version-viewer/slides/mods/mods-slide.component";
+import { ModsSlide, ModsSlideRef } from "renderer/components/version-viewer/slides/mods/mods-slide.component";
import { UninstallModal } from "renderer/components/modal/modal-types/uninstall-modal.component";
import { MapsPlaylistsPanel } from "renderer/components/maps-playlists-panel/maps-playlists-panel.component";
import { ShareFoldersModal } from "renderer/components/modal/modal-types/share-folders-modal.component";
@@ -25,12 +25,18 @@ import { useOnUpdate } from "renderer/hooks/use-on-update.hook";
import { safeLt } from "shared/helpers/semver.helpers";
import { ConfigurationService } from "renderer/services/configuration.service";
import { logRenderError } from "renderer";
+import { BsModsManagerService } from "renderer/services/bs-mods-manager.service";
+import { noop } from "shared/helpers/function.helpers";
+import { useTranslationV2 } from "renderer/hooks/use-translation.hook";
export function VersionViewer() {
+ const { text: t } = useTranslationV2();
+
const bsUninstallerService = useService(BSUninstallerService);
const bsVersionManagerService = useService(BSVersionManagerService);
const modalService = useService(ModalService);
+ const modsService = useService(BsModsManagerService);
const bsDownloader = useService(BsDownloaderService);
const ipcService = useService(IpcService);
const bsLauncher = useService(BSLauncherService);
@@ -40,10 +46,12 @@ export function VersionViewer() {
const { state, pathname: url } = useLocation() as { state: BSVersion; pathname: string };
const navigate = useNavigate();
const [currentTabIndex, setCurrentTabIndex] = useState(0);
+ const modsSlideRef = useRef(null);
useOnUpdate(() => {
checkIsVersionOutaded();
+ checkOutdatedMods();
}, [state]);
@@ -70,6 +78,42 @@ export function VersionViewer() {
}
}
+ const checkOutdatedMods = async () => {
+
+ if(config.get("not-show-outdated-mods-notification")){
+ return;
+ }
+
+ const { available: availableMods, installed: installedMods } = await modsService.getVersionModsState(state);
+
+ const modsToUpdate = availableMods.filter(availableMod => {
+ const installedMod = installedMods.find(installedMod => installedMod.mod.id === availableMod.mod.id);
+ return installedMod && safeLt(installedMod.version.modVersion, availableMod.version.modVersion);
+ });
+
+ if(!modsToUpdate.length){
+ return;
+ }
+
+ const choice = await notification.notifyInfo({
+ title: modsToUpdate.length > 1 ? t("pages.version-viewer.mods.notifications.outdated-mods.title-plural") : t("pages.version-viewer.mods.notifications.outdated-mods.title"),
+ desc: modsToUpdate.length > 1 ? t("pages.version-viewer.mods.notifications.outdated-mods.description-plural", { nb: `${modsToUpdate.length}` }) : t("pages.version-viewer.mods.notifications.outdated-mods.description", { name: `${modsToUpdate[0].mod.name}` }),
+ duration: 9000,
+ actions: [
+ { id: "0", title: "pages.version-viewer.mods.notifications.outdated-mods.dont-remind-me", cancel: true },
+ { id: "1", title: "pages.version-viewer.mods.notifications.outdated-mods.update" }
+ ]
+ });
+
+ if(choice === "1"){
+ lastValueFrom(modsService.installMods(modsToUpdate, state)).then(() => {
+ modsSlideRef?.current?.loadMods?.();
+ }).catch(noop);
+ } else if(choice === "0"){
+ config.set("not-show-outdated-mods-notification", true);
+ }
+ }
+
const navigateToVersion = (version?: BSVersion) => {
if (!version) {
return navigate("/available-versions");
@@ -153,7 +197,7 @@ export function VersionViewer() {
setCurrentTabIndex(() => 3)} />
-
+
("not-rewind-backup-oculus");
- }
-
- private setNotRewindBackupOculus(value: boolean): void{
- this.config.set("not-rewind-backup-oculus", value);
- }
-
- public getLaunchOptions(version: BSVersion): LaunchOption{
+ public getLaunchOptions(version: BSVersion): LaunchOption {
return {
version,
launchMods: this.config.get("launch-mods") ?? [],
- additionalArgs: (this.config.get("additionnal-args") || "").split(";").map(arg => arg.trim()).filter(arg => arg.length > 0),
+ command: this.config.get("launch-command") || "",
}
}
@@ -61,7 +53,12 @@ export class BSLauncherService {
this.notificationService.notifySuccess({title: `notifications.bs-launch.success.titles.${event.type}`, desc: `notifications.bs-launch.success.msg.${event.type}`});
},
error: (err: CustomError) => {
- if(!err?.code || !Object.values(BSLaunchError).includes(err.code as BSLaunchError)){
+ if (err?.code?.startsWith("generic.")) {
+ this.notificationService.notifyError({
+ title: "notifications.bs-launch.errors.titles.UNKNOWN_ERROR",
+ desc: err.code,
+ });
+ } else if(!err?.code || !Object.values(BSLaunchError).includes(err.code as BSLaunchError)){
this.notificationService.notifyError({title: "notifications.bs-launch.errors.titles.UNKNOWN_ERROR", desc: "notifications.bs-launch.errors.msg.UNKNOWN_ERROR"});
} else {
this.notificationService.notifyError({title: `notifications.bs-launch.errors.titles.${err.code}`, desc: `notifications.bs-launch.errors.msg.${err.code}`, duration: sToMs(9)})
diff --git a/src/renderer/services/bs-mods-manager.service.ts b/src/renderer/services/bs-mods-manager.service.ts
index 2abb07d2..1fe17e10 100644
--- a/src/renderer/services/bs-mods-manager.service.ts
+++ b/src/renderer/services/bs-mods-manager.service.ts
@@ -7,6 +7,7 @@ import { NotificationService } from "./notification.service";
import { Progression } from "main/helpers/fs.helpers";
import { ProgressionInterface } from "shared/models/progress-bar";
import { BbmFullMod, BbmModVersion } from "shared/models/mods/mod.interface";
+import { logRenderError } from "renderer";
export class BsModsManagerService {
private static instance: BsModsManagerService;
@@ -180,4 +181,27 @@ export class BsModsManagerService {
});
}
+ public async getVersionModsState(version: BSVersion): Promise<{available: BbmFullMod[], installed: BbmFullMod[]}> {
+ const [available, installed]: [BbmFullMod[], BbmModVersion[]] = await (async () => {
+ const available = await lastValueFrom(this.getAvailableMods(version));
+ const installed = await lastValueFrom(this.getInstalledMods(version));
+ return [available ?? [], installed ?? []] as [BbmFullMod[], BbmModVersion[]]; // Make TS happy
+ })().catch(e => {
+ logRenderError(e);
+ return [[], []] as [BbmFullMod[], BbmModVersion[]]; // Make TS happy
+ })
+
+ const installedMods: BbmFullMod[] = installed.reduce((acc, installedMod) => {
+ const mod = available.find(m => m.mod.id === installedMod.modId);
+
+ if(mod){
+ acc.push({ ...mod, version: installedMod } as BbmFullMod);
+ }
+
+ return acc;
+ }, []);
+
+ return { available: (available ?? []), installed: (installedMods ?? []) };
+ }
+
}
diff --git a/src/shared/helpers/error.helpers.ts b/src/shared/helpers/error.helpers.ts
index 33f71fce..a8fc2543 100644
--- a/src/shared/helpers/error.helpers.ts
+++ b/src/shared/helpers/error.helpers.ts
@@ -8,8 +8,8 @@ export function tryit(func: () => Return): TryitReturn {
if(isPromise(result)){
return result
- .then((value) => ({ error: null, result: value }))
- .catch((err) => ({ error: err instanceof Error ? err : new Error(`${err}`), result: null })) as Return extends Promise
+ .then((value) => ({ error: null as null, result: value }))
+ .catch((err) => ({ error: err instanceof Error ? err : new Error(`${err}`), result: null as null })) as Return extends Promise
? Promise<{error: Error, result: undefined} | {error: undefined, result: Awaited}>
: {error: Error, result: undefined} | {error: undefined, result: Return};
}
diff --git a/src/shared/models/bs-launch/launch-option.interface.ts b/src/shared/models/bs-launch/launch-option.interface.ts
index 6199fdde..d255e67a 100644
--- a/src/shared/models/bs-launch/launch-option.interface.ts
+++ b/src/shared/models/bs-launch/launch-option.interface.ts
@@ -14,6 +14,6 @@ export type LaunchMod = typeof LaunchMods[keyof typeof LaunchMods];
export interface LaunchOption {
version: BSVersion,
launchMods?: LaunchMod[],
- additionalArgs?: string[],
+ command?: string,
admin?: boolean
}