From 7aae6ae6bc343a2a94ed1abc38587224e67d7efe Mon Sep 17 00:00:00 2001 From: silentrald Date: Thu, 6 Feb 2025 12:49:18 +0800 Subject: [PATCH 1/7] [bugfix] fixed issue with null folderVersion --- src/main/services/bs-local-version.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/services/bs-local-version.service.ts b/src/main/services/bs-local-version.service.ts index 14d31dde..c97ac1ea 100644 --- a/src/main/services/bs-local-version.service.ts +++ b/src/main/services/bs-local-version.service.ts @@ -106,10 +106,10 @@ export class BSLocalVersionService { const versionFilePath = path.join(bsPath, 'Beat Saber_Data', 'globalgamemanagers'); const folderVersion = await this.getVersionFromGlobalGameManagerFile(versionFilePath); - folderVersion.path = bsPath; - if(!folderVersion){ return null; } + folderVersion.path = bsPath; + if(options?.steam || options?.oculus){ return {...folderVersion, ...options}; } From c83b630e1a59250eee10fa8bb4651d6fe650a086 Mon Sep 17 00:00:00 2001 From: GaetanGrd <40648115+GaetanGrd@users.noreply.github.com> Date: Fri, 7 Feb 2025 17:15:55 +0100 Subject: [PATCH 2/7] Update CONTRIBUTING.md --- CONTRIBUTING.md | 114 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 92 insertions(+), 22 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 961b371f..3e7cb6b2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,33 +1,103 @@ -## Contributing +# Contributing to BS-Manager -[code-of-conduct]: CODE_OF_CONDUCT.md -[fork]: https://github.com/Zagrios/bs-manager/fork -[pr]: https://github.com/Zagrios/bs-manager/compare -[style]: https://github.com/basarat/typescript-book/blob/master/docs/styleguide/styleguide.md +[code-of-conduct]: CODE_OF_CONDUCT.md +[fork]: https://github.com/Zagrios/bs-manager/fork +[pr]: https://github.com/Zagrios/bs-manager/compare -Hi there! We're thrilled that you'd like to contribute to this project. Your help is essential for keeping it great. +Hello! We’re delighted that you’re interested in contributing to **BS-Manager**. Your help is essential to maintaining and improving this project. -Please note that this project is released with a [Contributor Code of Conduct][code-of-conduct]. By participating in this project you agree to abide by its terms. +> [!NOTE] +> This project is released with a [Contributor Code of Conduct][code-of-conduct]. By participating, you agree to abide by its terms. -## Issues and PRs +--- -If you have suggestions for how this project could be improved, or want to report a bug, open an issue! We'd love all and any contributions. If you have questions, too, we'd love to hear them. +## Opening Issues -We'd also love PRs. If you're thinking of a large PR, we advise opening up an issue first to talk about it, though! Look at the links below if you're not sure how to open a PR. +- **Reporting Bugs** + If you find a bug or any unexpected behavior, feel free to open an issue. Be sure to include steps to reproduce it, relevant logs, versions, and any other pertinent details. +- **Suggesting Enhancements** + Have an idea for improving BS-Manager? We welcome all suggestions—open an issue to discuss your proposal. -## Submitting a pull request +> [!TIP] +> Before opening a new issue, please check if there’s already an existing one for the same topic to avoid duplicates. -1. [Fork][fork] and clone the repository. -1. Install the correct NodeJS version (highly recommend installing [Volta](https://volta.sh/) for that). -1. Configure and install the dependencies: `npm install`. -1. Create a new branch following naming convention: `git checkout -b (feature|bugfix|hotfix|chore)/(short-description)(/issue-id)`. -1. Make your change, test, and make sure BSManager work fine. -1. Push to your fork and [submit a pull request][pr]. -1. Pat your self on the back and wait for your pull request to be reviewed and merged. +--- -Here are a few things you can do that will increase the likelihood of your pull request being accepted: +## Submitting Pull Requests -- Follow the [style guide][style] which is using standard. -- Keep your changes as focused as possible. If there are multiple changes you would like to make that are not dependent upon each other, consider submitting them as separate pull requests. +### Before You Begin -Work in Progress pull requests are also welcome to get feedback early on, or if there is something blocked you. +1. **[Fork the repository][fork]** and **clone** your fork locally. +2. **Install the required Node.js version** (we recommend using [Volta](https://volta.sh/) to manage Node versions). +3. **Install project dependencies**: + ```bash + npm install + ``` + +### Create a Dedicated Branch + +Use a clear naming convention for your branch: + +```bash +git checkout -b (feature|bugfix|hotfix|chore)/(short-description)(/issue-id) +``` + +> [!NOTE] +> Exemple : `git checkout -b feature/update-docs/42` + +### Develop and Test + +- Make the necessary changes on your new branch. +- Test your changes manually to ensure everything is working correctly. +- Verify that your updates do not introduce regressions or break existing functionality. + +### 2.4 Open a Pull Request + +1. **Push** your branch to your fork. +2. Visit the main **BS-Manager** repository and click “Compare & pull request” or use [this link][pr]. +3. Provide a **clear description** of your changes (the context, what problem it solves, etc.). +4. **Submit** your pull request. A maintainer will review it and may ask for adjustments or clarifications. + +--- + +## 3. Useful Commands + +### Development + +```bash +npm start +``` + +> Runs the application in development mode. + +### Packaging + +```bash +npm run package +``` + +> Packages the application using Electron Builder. + +```bash +npm run build && electron-builder --config electron-builder.config.js --publish never --x64 --linux +``` + +> Package for Linux distros (deb, rpm, pacman) + +```bash +npm run publish +``` + +> Publishes the application (primarily for Windows). + +```bash +npm run publish:flatpak +``` + +> Build a Flatpak package + +## Need Help? + +If you have any questions or need further assistance, feel free to **open an issue** or reach out via the project’s communication channels. We appreciate any and all contributions you make to BS-Manager! + +Thank you for your interest in making BS-Manager better! From 3e1c595cd7266167d5148984ba99fff93e52b342 Mon Sep 17 00:00:00 2001 From: GaetanGrd <40648115+GaetanGrd@users.noreply.github.com> Date: Fri, 7 Feb 2025 17:16:31 +0100 Subject: [PATCH 3/7] Update CONTRIBUTING.md --- CONTRIBUTING.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3e7cb6b2..0124b523 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,8 +1,9 @@ # Contributing to BS-Manager -[code-of-conduct]: CODE_OF_CONDUCT.md -[fork]: https://github.com/Zagrios/bs-manager/fork -[pr]: https://github.com/Zagrios/bs-manager/compare +[code-of-conduct]: CODE_OF_CONDUCT.md +[fork]: https://github.com/Zagrios/bs-manager/fork +[pr]: https://github.com/Zagrios/bs-manager/compare +[style]: https://github.com/basarat/typescript-book/blob/master/docs/styleguide/styleguide.md Hello! We’re delighted that you’re interested in contributing to **BS-Manager**. Your help is essential to maintaining and improving this project. From 3f8b3a0594eff26f99b0789994d1981285fafa61 Mon Sep 17 00:00:00 2001 From: GaetanGrd <40648115+GaetanGrd@users.noreply.github.com> Date: Fri, 7 Feb 2025 17:22:58 +0100 Subject: [PATCH 4/7] Update CONTRIBUTING.md --- CONTRIBUTING.md | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0124b523..1984783b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,11 +1,11 @@ -# Contributing to BS-Manager +# Contributing to BSManager [code-of-conduct]: CODE_OF_CONDUCT.md [fork]: https://github.com/Zagrios/bs-manager/fork [pr]: https://github.com/Zagrios/bs-manager/compare [style]: https://github.com/basarat/typescript-book/blob/master/docs/styleguide/styleguide.md -Hello! We’re delighted that you’re interested in contributing to **BS-Manager**. Your help is essential to maintaining and improving this project. +Hello! We’re delighted that you’re interested in contributing to **BSManager**. Your help is essential to maintaining and improving this project. > [!NOTE] > This project is released with a [Contributor Code of Conduct][code-of-conduct]. By participating, you agree to abide by its terms. @@ -17,7 +17,7 @@ Hello! We’re delighted that you’re interested in contributing to **BS-Manage - **Reporting Bugs** If you find a bug or any unexpected behavior, feel free to open an issue. Be sure to include steps to reproduce it, relevant logs, versions, and any other pertinent details. - **Suggesting Enhancements** - Have an idea for improving BS-Manager? We welcome all suggestions—open an issue to discuss your proposal. + Have an idea for improving BSManager? We welcome all suggestions—open an issue to discuss your proposal. > [!TIP] > Before opening a new issue, please check if there’s already an existing one for the same topic to avoid duplicates. @@ -48,20 +48,24 @@ git checkout -b (feature|bugfix|hotfix|chore)/(short-description)(/issue-id) ### Develop and Test +> [!TIP] +> - Follow the [style guide][style] which is using standard. +> - Keep your changes as focused as possible. If there are multiple changes you would like to make that are not dependent upon each other, consider submitting them as separate pull requests. + - Make the necessary changes on your new branch. - Test your changes manually to ensure everything is working correctly. - Verify that your updates do not introduce regressions or break existing functionality. -### 2.4 Open a Pull Request +### Open a Pull Request 1. **Push** your branch to your fork. -2. Visit the main **BS-Manager** repository and click “Compare & pull request” or use [this link][pr]. +2. Visit the main **BSManager** repository and click “Compare & pull request” or use [this link][pr]. 3. Provide a **clear description** of your changes (the context, what problem it solves, etc.). 4. **Submit** your pull request. A maintainer will review it and may ask for adjustments or clarifications. --- -## 3. Useful Commands +## Useful Commands ### Development @@ -99,6 +103,6 @@ npm run publish:flatpak ## Need Help? -If you have any questions or need further assistance, feel free to **open an issue** or reach out via the project’s communication channels. We appreciate any and all contributions you make to BS-Manager! +If you have any questions or need further assistance, feel free to **open an issue** or reach out via the project’s communication channels. We appreciate any and all contributions you make to BSManager! -Thank you for your interest in making BS-Manager better! +Thank you for your interest in making BSManager better! From 1f5904d135cc2f6841d11ef392bd733184058229 Mon Sep 17 00:00:00 2001 From: GaetanGrd <40648115+GaetanGrd@users.noreply.github.com> Date: Fri, 7 Feb 2025 17:33:22 +0100 Subject: [PATCH 5/7] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1984783b..1749270c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -103,6 +103,6 @@ npm run publish:flatpak ## Need Help? -If you have any questions or need further assistance, feel free to **open an issue** or reach out via the project’s communication channels. We appreciate any and all contributions you make to BSManager! +If you have any questions or need further assistance, feel free to **open an issue** or reach out via our [discord](https://discord.gg/uSqbHVpKdV). We appreciate any and all contributions you make to BSManager! Thank you for your interest in making BSManager better! From 04f1b00a0b8f654a2f4fb20ff3ccfc599be0b4f0 Mon Sep 17 00:00:00 2001 From: Iluhadesu <92525749+Iluhadesu@users.noreply.github.com> Date: Fri, 7 Feb 2025 22:17:15 +0000 Subject: [PATCH 6/7] Add 1.40.2 to bs-version.json --- assets/jsons/bs-versions.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/assets/jsons/bs-versions.json b/assets/jsons/bs-versions.json index e66b9a5c..9de46cb6 100644 --- a/assets/jsons/bs-versions.json +++ b/assets/jsons/bs-versions.json @@ -822,5 +822,12 @@ "ReleaseImg": "https://clan.fastly.steamstatic.com/images/32055887/5cc1ca353151ed31da2764716cdcbe89442aeeeb.png", "ReleaseDate": "1738144954", "year": "2025" + }, + { + "BSVersion": "1.40.2", + "BSManifest": "5496832903170665287", + "OculusBinaryId": "8626990240734012", + "ReleaseDate": "1738951837", + "year": "2025" } ] \ No newline at end of file From 913ef5c281c9c3933cad87c3794b12aa24115efe Mon Sep 17 00:00:00 2001 From: Iluhadesu <92525749+Iluhadesu@users.noreply.github.com> Date: Sat, 8 Feb 2025 14:26:40 +0000 Subject: [PATCH 7/7] Update bs-versions.json according to the late announcement --- assets/jsons/bs-versions.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/jsons/bs-versions.json b/assets/jsons/bs-versions.json index 9de46cb6..db1aeb23 100644 --- a/assets/jsons/bs-versions.json +++ b/assets/jsons/bs-versions.json @@ -827,6 +827,8 @@ "BSVersion": "1.40.2", "BSManifest": "5496832903170665287", "OculusBinaryId": "8626990240734012", + "ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/510697606000673692", + "ReleaseImg": "https://clan.fastly.steamstatic.com/images/32055887/04ad25256ffc2686f4ea19830e70df6b2752f728.png", "ReleaseDate": "1738951837", "year": "2025" }