Merge pull request #512 from Zagrios/chore/update-changelog

Chore/update changelog

.github/workflows/build.yaml

@@ -13,7 +13,7 @@ jobs:
 
         strategy:
             matrix:
-                os: [windows-latest]
+                os: [windows-latest, ubuntu-latest]
 
         steps:
             - name: Check out Git repository
@@ -30,5 +30,5 @@ jobs:
             - name: Upload artifact
               uses: actions/upload-artifact@v4
               with:
-                  name: release
+                  name: release-${{ matrix.os }}
                   path: release

.github/workflows/release-linux.yaml

@@ -2,6 +2,9 @@
 
 name: Realease Linux
 
+env:
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
+
 on:
     workflow_dispatch:
 
@@ -23,7 +26,7 @@ jobs:
                   node-version: 18.x
                   cache: "npm"
             - run: npm ci
-            - run: npm run build && electron-builder --linux --x64 --publish always
+            - run: npm run publish:linux
 
             - name: Upload artifact
               uses: actions/upload-artifact@v4

assets/jsons/changelogs.json

@@ -1 +1,8 @@
-{}
+{
+    "1.5.0-alpha.1":{
+        "htmlBody" :"<strong>BSManager continues to get better, thanks to your continued support and contributions!</strong><center>🎈🎉🎈</center><p>Note: This is an alpha release, encountering bugs is expected. Please file new issues for any bugs you find.</p><h2>Features</h2><ul><li>Added playlist support</li><li>Added Linux support (Thanks to @Insprill)</li><li>Added reset button to reset values when editing a Beat Saber version (Thanks to @Liborsaf)</li><li>Added a changelog modal</li></ul><h2>Fixes</h2><ul><li>Fixed an issue where switching between Beat Saber versions too quickly displayed mods for the wrong version</li><li>Fixed an issue where the launch window from a shortcut would never close</li><li>Advanced launch arguments are used even when the input field is closed</li><li>Fixed an issue where having many maps caused some maps to not have their information loaded</li></ul><h2>Other changes</h2><ul><li>.NET Framework is no longer required</li><li>Clear English translations for the Steam credentials popup (Thanks to @Aeywoo)</li><li>NSFW models are now blurred when browsing for models</li><li>When no mods are available for a Beat Saber version, the version number is now shown</li><li>Mods load faster</li><li>After a first full maps loading, maps load almost instantly</li><li>Improved performance in lists with lot of contents</li></ul>",
+        "title" : "What's new ?",
+        "timestamp" : 1721048400,
+        "version" : "1.5.0-alpha.1"
+    }
+}

package-lock.json

@@ -11201,6 +11201,23 @@
                 "esbuild": ">=0.12 <1"
             }
         },
+        "node_modules/esbuild/node_modules/@esbuild/linux-x64": {
+            "version": "0.20.1",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz",
+            "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
         "node_modules/escalade": {
             "version": "3.1.1",
             "dev": true,
@@ -18827,6 +18844,22 @@
                 "query-process-win32-x64-msvc": "0.0.3"
             }
         },
+        "node_modules/query-process-linux-x64-gnu": {
+            "version": "0.0.3",
+            "resolved": "https://registry.npmjs.org/query-process-linux-x64-gnu/-/query-process-linux-x64-gnu-0.0.3.tgz",
+            "integrity": "sha512-j1tGcNnGyVCABJ1PHZD1gKuyuomNzsPow3NDuZzUGjPqvKu67RsmKJJJOhMyT1SvUkcqdLFdtS1KTD20I4GS5Q==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
         "node_modules/query-process-win32-x64-msvc": {
             "version": "0.0.3",
             "resolved": "https://registry.npmjs.org/query-process-win32-x64-msvc/-/query-process-win32-x64-msvc-0.0.3.tgz",

package.json

@@ -2,7 +2,7 @@
     "name": "bs-manager",
     "description": "Manage maps, mods and more for Beat Saber",
     "main": "./src/main/main.ts",
-    "version": "1.5.0",
+    "version": "1.5.0-alpha.1",
     "scripts": {
         "build-rust-scripts": "node -r esbuild-register ./.erb/scripts/build-rust-scripts.js",
         "build": "concurrently \"npm run build:main\" \"npm run build:renderer\"",
@@ -18,7 +18,8 @@
         "start:preload": "cross-env NODE_ENV=development webpack --config ./.erb/configs/webpack.config.preload.dev.ts",
         "start:renderer": "cross-env NODE_ENV=development webpack serve --config ./.erb/configs/webpack.config.renderer.dev.ts",
         "test": "jest",
-        "publish": "npm run build && electron-builder -c.win.certificateSha1=842a817a51e2a1d360fcd62f54bf5f9193e919e1 --publish always --win --x64"
+        "publish": "npm run build && electron-builder -c.win.certificateSha1=842a817a51e2a1d360fcd62f54bf5f9193e919e1 --publish always --win --x64",
+        "publish:linux": "npm run build && electron-builder --publish always --linux --x64"
     },
     "lint-staged": {
         "*.{js,jsx,ts,tsx}": [

release/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bs-manager",
-  "version": "1.5.0",
+  "version": "1.5.0-alpha.1",
   "description": "BSManager",
   "main": "./dist/main/main.js",
   "author": {

src/main/services/mods/bs-mods-manager.service.ts

@@ -14,7 +14,7 @@ import { lastValueFrom } from "rxjs";
 import JSZip from "jszip";
 import { extractZip } from "../../helpers/zip.helpers";
 import recursiveReadDir from "recursive-readdir";
-import { minToMs } from "../../../shared/helpers/time.helpers";
+import { sToMs } from "../../../shared/helpers/time.helpers";
 import { ensureDir } from "fs-extra";
 
 export class BsModsManagerService {
@@ -147,12 +147,18 @@ export class BsModsManagerService {
         return new Promise<boolean>(resolve => {
             const cmd = process.platform === 'linux'
                 ? `screen -dmS "BSIPA" dotnet ${ipaPath} ${args.join(" ")}` // Must run through screen, otherwise BSIPA tries to move console cursor and crashes.
-                : `start /wait /min "" "${ipaPath}" ${args.join(" ")}`;
+                : `${ipaPath} ${args.join(" ")}`;
 
             log.info("START IPA PROCESS", cmd);
             const processIPA = spawn(cmd, { cwd: versionPath, detached: true, shell: true });
 
+            const timemout = setTimeout(() => {
+                log.info("Ipa process timeout");
+                resolve(false)
+            }, sToMs(30));
+
             processIPA.once("exit", code => {
+                clearTimeout(timemout);
                 if (code === 0) {
                     log.info("Ipa process exist with code 0");
                     return resolve(true);
@@ -161,10 +167,7 @@ export class BsModsManagerService {
                 resolve(false);
             });
 
-            setTimeout(() => {
-                log.info("Ipa process timeout");
-                resolve(false)
-            }, minToMs(1));
+
         });
     }
 

src/renderer/components/modal/modal-types/chabgelog-modal/changelog-modal.component.tsx

@@ -14,12 +14,13 @@ export const ChangelogModal: ModalComponent<void, ChangelogVersion> = ({ options
     const openTwitter = () => linkOpener.open("https://twitter.com/BSManager_");
     const openSupportPage = () => linkOpener.open("https://www.patreon.com/bsmanager");
     const openDiscord = () => linkOpener.open("https://discord.gg/uSqbHVpKdV");
+    const openWebSite = () => linkOpener.open("https://bsmanager.io/");
     const date = changelog?.timestamp  ? new Date(changelog.timestamp  * 1000).toLocaleDateString() : '';
 
     return (
         <form className="w-[350px] text-gray-800 dark:text-gray-200 h-[70vh] flex flex-col justify-between">
             <h1 className=" p-4 pt-1 text-3xl uppercase tracking-wide w-full text-center text-gray-800 dark:text-gray-200 font-bold">{changelog?.title}</h1>
-            <div className=" overflow-y-scroll h-full content grow" dangerouslySetInnerHTML={{ __html: DOMPurify.sanitize(changelog?.htmlBody) }}/>
+            <div className=" overflow-y-scroll h-full content grow scrollbar-default" dangerouslySetInnerHTML={{ __html: DOMPurify.sanitize(changelog?.htmlBody) }}/>
             <span className="block w-[100%] mx-auto mt-0 mb-4 h-1 rounded-full bg-main-color-1" />
             <div className="flex flex-row justify-between">
                 <div className="my-auto flex flex-col text-sm">
@@ -39,6 +40,9 @@ export const ChangelogModal: ModalComponent<void, ChangelogVersion> = ({ options
                     <Tippy content="Patreon" placement="top" className="font-bold !bg-neutral-900" duration={[200, 0]} arrow={false}>
                         <div><BsmButton onClick={openSupportPage} className="rounded-md p-1 w-7 h-7 " icon="patreon" withBar={false} iconColor="#fff" color="#000"/></div>
                     </Tippy>
+                    <Tippy content="Web Site" placement="top" className="font-bold !bg-neutral-900" duration={[200, 0]} arrow={false}>
+                        <div><BsmButton onClick={openWebSite} className="rounded-md p-1 w-7 h-7 " icon="web-site" withBar={false} iconColor="#fff" color="#000"/></div>
+                    </Tippy>
                 </div>
             </div>
         </form>

src/renderer/components/svgs/bsm-icon.component.tsx

@@ -50,6 +50,7 @@ import { SyncIcon } from "./icons/sync-icon.component";
 import { VolumeUpIcon } from "./icons/volume-up-icon.component";
 import { VolumeOffIcon } from "./icons/volume-off-icon.component";
 import { VolumeDownIcon } from "./icons/volume-down-icon.component";
+import { WebSiteIcon } from "./icons/web-site-icon.component";
 import { GermanIcon } from "./flags/german-icon.component";
 import { RussianIcon } from "./flags/russian-icon.component";
 import { ChineseIcon } from "./flags/chinese-icon.component";
@@ -61,7 +62,8 @@ import { ShortcutIcon } from "./icons/shortcut-icon.component";
 import { BackupRestoreIcon } from "./icons/backup-restore-icon.component";
 import { SongDetailDiffCharactertistic } from "shared/models/maps/song-details-cache/song-details-cache.model";
 
-export type BsmIconType = SongDetailDiffCharactertistic | ("settings" | "trash" | "favorite" | "folder" | "bsNote" | "check" | "three-dots" | "twitch" | "eye" | "play" | "checkCircleIcon" | "discord" | "info" | "eye-cross" | "terminal" | "desktop" | "oculus" | "add" | "cross" | "task" | "github" | "close" | "thumbUpFill" | "timerFill" | "pause" | "twitter" | "sync" | "chevron-top" | "copy" | "steam" | "edit" | "export" | "patreon" | "search" | "bsMapDifficulty" | "link" | "unlink" | "download" | "filter" | "mee6" | "volume-up" | "volume-off" | "volume-down" | "shortcut" | "backup-restore" | "fr-FR-flag" | "es-ES-flag" | "en-US-flag" | "en-EN-flag" | "de-DE-flag" | "ru-RU-flag" | "zh-CN-flag" | "zh-TW-flag" | "ja-JP-flag");
+
+export type BsmIconType = SongDetailDiffCharactertistic | ("settings" | "trash" | "favorite" | "folder" | "bsNote" | "check" | "three-dots" | "twitch" | "eye" | "play" | "checkCircleIcon" | "discord" | "info" | "eye-cross" | "terminal" | "desktop" | "oculus" | "add" | "cross" | "task" | "github" | "close" | "thumbUpFill" | "timerFill" | "pause" | "twitter" | "sync" | "chevron-top" | "copy" | "steam" | "edit" | "export" | "patreon" | "search" | "bsMapDifficulty" | "link" | "unlink" | "download" | "filter" | "mee6" | "volume-up" | "volume-off" | "volume-down" | "shortcut" | "backup-restore" | "web-site" | "fr-FR-flag" | "es-ES-flag" | "en-US-flag" | "en-EN-flag" | "de-DE-flag" | "ru-RU-flag" | "zh-CN-flag" | "zh-TW-flag" | "ja-JP-flag");
 
 export const BsmIcon = memo(({ className, icon, style }: { className?: string; icon: BsmIconType; style?: CSSProperties }) => {
     // TODO : Very ugly very messy, need to find a better way to do this
@@ -250,7 +252,13 @@ export const BsmIcon = memo(({ className, icon, style }: { className?: string; i
         if (icon === "backup-restore") {
             return <BackupRestoreIcon className={className} style={style} />;
         }
+
+        if(icon === "web-site") {
+            return <WebSiteIcon className={className} style={style} />;
+        }
         return <TrashIcon className={className} style={style} />;
+
+
     };
 
     return <>{renderIcon()}</>;

src/renderer/components/svgs/icons/web-site-icon.component.tsx

@@ -0,0 +1,9 @@
+import { CSSProperties } from "react";
+
+export function WebSiteIcon(props: { className?: string; style?: CSSProperties }) {
+    return (
+        <svg className={props.className} style={props.style} xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960" fill="currentColor">
+            <path d="M480-80q-82 0-155-31.5t-127.5-86Q143-252 111.5-325T80-480q0-83 31.5-155.5t86-127Q252-817 325-848.5T480-880q83 0 155.5 31.5t127 86q54.5 54.5 86 127T880-480q0 82-31.5 155t-86 127.5q-54.5 54.5-127 86T480-80Zm0-82q26-36 45-75t31-83H404q12 44 31 83t45 75Zm-104-16q-18-33-31.5-68.5T322-320H204q29 50 72.5 87t99.5 55Zm208 0q56-18 99.5-55t72.5-87H638q-9 38-22.5 73.5T584-178ZM170-400h136q-3-20-4.5-39.5T300-480q0-21 1.5-40.5T306-560H170q-5 20-7.5 39.5T160-480q0 21 2.5 40.5T170-400Zm216 0h188q3-20 4.5-39.5T580-480q0-21-1.5-40.5T574-560H386q-3 20-4.5 39.5T380-480q0 21 1.5 40.5T386-400Zm268 0h136q5-20 7.5-39.5T800-480q0-21-2.5-40.5T790-560H654q3 20 4.5 39.5T660-480q0 21-1.5 40.5T654-400Zm-16-240h118q-29-50-72.5-87T584-782q18 33 31.5 68.5T638-640Zm-234 0h152q-12-44-31-83t-45-75q-26 36-45 75t-31 83Zm-200 0h118q9-38 22.5-73.5T376-782q-56 18-99.5 55T204-640Z"/>
+        </svg>
+    );
+}