Compare commits

..

68 Commits

Author SHA1 Message Date
MathieuG-P ccbcc8296d change oculus mode description 2023-03-04 22:38:58 +01:00
MathieuG-P bea435439e remove console log 2023-03-04 22:17:08 +01:00
MathieuG-P d9ff78c21d Merge pull request #171 from Zagrios/bugfix/light-theme-issues/168
[bugfix-168] fix light theme issues
2023-03-04 22:15:03 +01:00
MathieuG-P 14a4bf3408 [bugfix-168] fix light theme issues 2023-03-04 22:02:58 +01:00
MathieuG-P 172d7e4578 Merge pull request #170 from Zagrios/hotfix/dotnet-notif-not-appear-sometimes
Hotfix/dotnet notif not appear sometimes
2023-03-04 21:48:18 +01:00
MathieuG-P 5986cf7a15 [hotfix] change methode to check dotnet 6 2023-03-04 21:18:51 +01:00
MathieuG-P a5e4b745ef fix dotnet notif not appear sometimes 2023-03-04 19:28:01 +01:00
MathieuG-P 4cd538fe21 Merge pull request #169 from Zagrios/feature/volume-control/154
feature/volume-control/154
2023-03-04 13:42:34 +01:00
MathieuG-P c406dfee79 [feature-154] volume slider finished 2023-03-04 13:41:48 +01:00
MathieuG-P 8a168d20b3 [feature] sound control in title bar 2023-03-03 23:59:57 +01:00
MathieuG-P b16f7150e8 [feature] add volume control 2023-03-03 01:46:28 +01:00
MathieuG-P c4319f1c6c Merge pull request #167 from Zagrios/hotfix/use-apply-translation
[hotfix] use apply translation
2023-03-03 00:17:34 +01:00
MathieuG-P d9003fa07b [hotfix] use apply translation 2023-03-03 00:15:33 +01:00
MathieuG-P eb2235e017 Merge pull request #166 from Zagrios/bugfix/change-oculus-mode-description/162
[bugfix] change oculus mode description
2023-03-02 09:30:16 +01:00
MathieuG-P 1e784c243b [bugfix] change oculus mode description 2023-03-02 09:20:18 +01:00
MathieuG-P 23e9b52af2 [hotfix] we dont remeber steam session anymore 2023-03-02 00:47:16 +01:00
MathieuG-P e42ac4eca3 bumb version 2023-03-02 00:41:32 +01:00
MathieuG-P 622595a7a0 Merge pull request #165 from Zagrios/bugfix/mods-three-dots-menu-glitch-when-no-mods/152
[bugfix] fix mods menu glitch when no mods
2023-03-02 00:38:42 +01:00
MathieuG-P 556ca1b1e6 fix mods menu glitch when no mods 2023-03-02 00:37:47 +01:00
MathieuG-P cef4f22305 Merge pull request #164 from Zagrios/feature/add-credentials-informations
[FEATURE] add credentials informations
2023-03-02 00:20:24 +01:00
MathieuG-P ee1dd7b21f add credentials informations 2023-03-02 00:19:06 +01:00
MathieuG-P 487b73a859 Merge pull request #161 from Zagrios/bugfix/maps-loding-optimization/144
[bugfix] maps loding optimization (partial)
2023-03-01 23:28:49 +01:00
MathieuG-P a56fdde0e7 add log + use allSettled 2023-03-01 23:26:48 +01:00
MathieuG-P 99f91d25c3 Merge branch 'master' of https://github.com/Zagrios/bs-manager 2023-03-01 21:54:45 +01:00
MathieuG-P 8579b0697d nothing 2023-03-01 21:54:41 +01:00
MathieuG-P f0761c8359 Merge pull request #160 from Zagrios/hotfix/pause-song-on-map-preview
[hotfix] pause song on map preview
2023-03-01 21:44:27 +01:00
MathieuG-P b1833721d0 pause song on map preview 2023-03-01 21:43:07 +01:00
MathieuG-P aba099e15a Merge pull request #159 from Zagrios/hotfix/cant-enable-oculus-mode-with-desktop-mode
[hotfix] cant-enable-oculus-mode-with-desktop-mode
2023-03-01 21:34:08 +01:00
MathieuG-P d25c0cced5 [hotfix] cant-enable-oculus-mode-with-desktop-mode 2023-03-01 21:33:09 +01:00
MathieuG-P bc4f6304db Merge pull request #158 from Zagrios/hotfix/output-console-not-show-with-debug-mode
[hotfix] open debug console when launch BS with debug mode
2023-03-01 21:04:26 +01:00
MathieuG-P 4357454b14 [hotfix] open debug console when launch BS with debug mode 2023-03-01 21:02:06 +01:00
MathieuG-P 528abbcaa3 Merge pull request #153 from legoandmars/master
Change 'Mod' -> 'Mode' in english launch options
2023-03-01 13:23:46 +01:00
legoandmars 9bcc605e00 Change 'Mod' -> 'Mode' 2023-02-28 16:43:04 -08:00
MathieuG-P f7e3b9ae9d Merge pull request #151 from Zagrios/bugfix/bug-header-of-maps-tab-not-translated/150
bugfix/fix-shared-maps-page-title-not-translated/150
2023-03-01 01:07:25 +01:00
MathieuG-P 1b963a99c1 fix shared maps page title not translated 2023-03-01 01:05:55 +01:00
MathieuG-P 363cc3cc5e reduce maps loading by 40% from micro optimization 2023-03-01 00:52:42 +01:00
MathieuG-P 8307a975ea bumb version 2023-02-28 23:39:48 +01:00
MathieuG-P f5ecdfca60 Merge pull request #149 from Zagrios/hotfix/error-download-version-space-in-path
[HOTFIX] fix error when space in path when download a version
2023-02-28 23:38:36 +01:00
MathieuG-P 5bb92d804b fix erreur when space in path when download a version 2023-02-28 23:37:40 +01:00
MathieuG-P 5b4b962015 Merge branch 'master' of https://github.com/Zagrios/bs-manager 2023-02-28 19:17:38 +01:00
MathieuG-P b43cfdd70b add 1.28.0 2023-02-28 19:17:35 +01:00
MathieuG-P 77350a823e Merge pull request #146 from Zagrios/feature/readme-update
Feature/readme update
2023-02-28 11:14:08 +01:00
MathieuG-P 5844aea281 Update FUNDING.yml 2023-02-28 11:12:34 +01:00
Gaëtan Gerard 8af5d8c3e4 Remove BSM Support 2023-02-28 09:58:00 +01:00
Gaëtan Gerard f0f3721ec5 Merge pull request #145 from Zagrios/master
rebase
2023-02-28 09:57:24 +01:00
MathieuG-P 5641c25cc1 bumb version 2023-02-24 01:12:46 +01:00
MathieuG-P c1b32c2fc3 Merge pull request #143 from Zagrios/hotfix/little-fix-en-translation
[HOTFIX] fix unlink maps EN translation
2023-02-24 01:10:58 +01:00
MathieuG-P dc70d2889f fix unlink maps EN translation 2023-02-24 01:10:15 +01:00
MathieuG-P 6b2879d9dc bumb version 2023-02-21 01:39:17 +01:00
MathieuG-P 19e842d721 Merge pull request #142 from Zagrios/hotfix/oneclick-map-not-install-map-in-unlinked-versions
hotfix/oneclick-map-not-install-map-in-unlinked-versions
2023-02-21 01:29:43 +01:00
MathieuG-P 8d28c3cfc8 oneclick map not install map in unlinked versions 2023-02-21 01:28:42 +01:00
MathieuG-P baec206bf3 Merge pull request #141 from Zagrios/bugfix/oneclick-not-work-when-no-versions/139
bugfix/oneclick-not-work-when-no-versions/139
2023-02-21 01:03:23 +01:00
MathieuG-P 3aacd7575b fix oneclick map not work when no BS versions intalled 2023-02-21 01:00:39 +01:00
MathieuG-P d739245e70 Merge pull request #140 from Zagrios/bugfix/ram-usage-maps-list/138
bugfix/ram-usage-maps-list/138
2023-02-21 00:43:56 +01:00
MathieuG-P c88d93b0ab maps optimisation finished + new ipc system + maps progress bars now accurate 2023-02-21 00:33:33 +01:00
MathieuG-P 64280509b0 huge maps deletion and export speed improvement + optimize map component update rate 2023-02-17 01:26:16 +01:00
MathieuG-P a7e81cfa8a virtual scroll maps list resize work 2023-02-16 00:30:23 +01:00
MathieuG-P 2620354888 init virtual scroll maps list 2023-02-15 00:50:49 +01:00
MathieuG-P 61a8790448 bumb version 2023-02-06 22:03:34 +01:00
MathieuG-P 5b4af58baa Merge pull request #135 from Zagrios/hotfix/remove-model-downloader-from-default-mods
hotfix/remove-model-download-from-default-mods
2023-02-06 21:43:42 +01:00
MathieuG-P 6cd3c65362 Merge pull request #134 from Zagrios/hotfix/disable-support-button
hotfix/disable-support-button
2023-02-06 21:41:59 +01:00
MathieuG-P 211a3b9a39 disable support button + fix button hightlight even if disabled + fix click exec even if disabled 2023-02-06 21:37:17 +01:00
MathieuG-P a4fd92a014 remove ModelDownload from default mods 2023-02-06 21:14:40 +01:00
Gaëtan Gerard 295d0f90ba Merge pull request #133 from Synaelle/patch-1
Correction d'orthographe
2023-02-02 21:49:29 +01:00
Synaelle 5592242963 Correction d'orthographe
J'ai corrigé la majorité des fautes que j'ai pu trouvé, ainsi que les problèmes de cohérence dans la mention du jeu. C'est à dire que des fois le jeu est appelé BeatSaber et des fois Beat Saber.
2023-02-02 15:12:47 +01:00
MathieuG-P 0212f3ba26 Merge pull request #132 from 0xAuthenticity/master
Update default-configuration.config.ts
2023-01-28 14:55:56 +01:00
0xAuthenticity 36521a2b1b Update default-configuration.config.ts 2023-01-28 02:23:42 -05:00
Gaëtan Gerard 72daaeee0e Merge pull request #124 from Zagrios/master
Rebase branch
2023-01-24 09:26:10 +01:00
61 changed files with 2649 additions and 595 deletions
+1 -1
View File
@@ -1 +1 @@
custom: https://mee6.gg/m/bsmanager
+1 -1
View File
@@ -43,7 +43,7 @@
<a href="https://github.com/Zagrios/bs-manager/issues"><img alt="GitHub issues" src="https://img.shields.io/github/issues/Zagrios/bs-manager?style=for-the-badge"></a>
<br>
<a href="https://discord.gg/uSqbHVpKdV"><img src ="https://img.shields.io/badge/-DISCORD-5865f2?style=for-the-badge&logo=discord&logoColor=ffffff" alt="discord"/></a>
<a href="https://mee6.xyz/fr/m/bsmanager"><img src ="https://img.shields.io/badge/-🥰%20Support%20BSM-EC4546?style=for-the-badge" alt="Donation"/></a>
<!--<a href="https://mee6.xyz/fr/m/bsmanager"><img src ="https://img.shields.io/badge/-🥰%20Support%20BSM-EC4546?style=for-the-badge" alt="Donation"/></a>-->
<a href="https://twitter.com/BSManager_"><img src ="https://img.shields.io/badge/-Twitter-F5F8FA?style=for-the-badge&logo=Twitter" alt="Twitter"/></a>
<br>
[<a href="#readme-bot">Go to bottom</a>]
+8
View File
@@ -509,5 +509,13 @@
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans//32055887/d9ed8771498be7fc83721aaaaa5b15a08fbeadb1.png",
"ReleaseDate": "1670943003",
"year": "2022"
},
{
"BSVersion": "1.28.0",
"BSManifest": "7463243155526905423",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3666530358620442392",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans//32055887/8f978bbf292810004bca12523e76be8a7eec8c4e.png",
"ReleaseDate": "1677593822",
"year": "2023"
}
]
+15 -5
View File
@@ -18,16 +18,20 @@
"settings": "Settings"
},
"pages": {
"shared-maps":{
"title": "Shared maps"
},
"version-viewer": {
"launch-mods": {
"oculus": "Oculus Mod",
"oculus-description": "If you are running Beat Saber through Steam, this allows you to play the game on an Oculus headset.",
"desktop": "Desktop Mod",
"oculus": "Oculus Mode",
"oculus-description": "If you are using Beat Saber via Steam, it allows you to use Oculus's VR composer without passing by SteamVR, to gain performances This is not necessary for using Oculus headsets.",
"desktop": "Desktop Mode",
"desktop-description": "This allows you to use WASD and the mouse to navigate around the menu in game. This makes testing much easier, because you don't have to put on your headset!",
"debug": "Debug Mod",
"debug": "Debug Mode",
"debug-description": "Enables the output log window for IPA. This will show the debug console that mods use."
},
"maps": {
"title": "Shared maps",
"search-bar": {
"search-placeholder": "Search a map",
"filters-btn": "Filters",
@@ -45,7 +49,7 @@
"link-maps": {
"tooltips": {
"link": "Link maps",
"unlink": "Unling maps"
"unlink": "Unlink maps"
}
}
},
@@ -443,10 +447,16 @@
"label": "Stay connected"
}
},
"why-credentials": "Why do you need my credentials ?",
"buttons": {
"submit": "Login"
}
},
"steam-credentials":{
"title": "Steam Credentials",
"p-1": "The credentials are only used to download the game because steam need to verify that you paid the game in order to be allowed to download it. They aren't saved and directly passed to DepotDownloader. If you don't want to enter your credentials you can follow this tutorial :",
"p-2": "and then click on the gear icon in the top right corner and select \"Import a version\", select the folder where beat saber has been downloaded (If you follow the tutorial above you should have the correct location)"
},
"bs-import-version":{
"title": "Import a version",
"description": "Imports a version of BeatSaber to use with BSManager. The import will copy the selected BeatSaber installation folder to the BSManager versions folder.",
+10 -1
View File
@@ -18,10 +18,13 @@
"settings": "Ajustes"
},
"pages": {
"shared-maps":{
"title": "Mapas comunes"
},
"version-viewer": {
"launch-mods": {
"oculus": "Oculus Mod",
"oculus-description": "Si estás ejecutando Beat Saber a través de Steam, esto te permite jugar en un auricular Oculus.",
"oculus-description": "Si estás usando Beat Saber a través de Steam, te permite usar el compositor VR de Oculus sin pasar por SteamVR, para ganar prestaciones. Esto no es necesario para usar auriculares Oculus.",
"desktop": "Desktop Mod",
"desktop-description": "Esto te permite usar WASD y el mouse para navegar por el menú en juego. Esto hace que las pruebas sean mucho más fáciles, ¡porque no tienes que ponerte el auricular!",
"debug": "Debug Mod",
@@ -443,10 +446,16 @@
"label": "Manténgase conectado"
}
},
"why-credentials": "¿Por qué necesitas mis credenciales?",
"buttons": {
"submit": "Inicio de sesión"
}
},
"steam-credentials":{
"title": "Steam Credentials",
"p-1": "Las credenciales sólo se utilizan para descargar el juego porque steam necesita verificar que has pagado el juego para que se te permita descargarlo. No se guardan y se pasan directamente a DepotDownloader. Si no quieres introducir tus credenciales puedes seguir este tutorial :",
"p-2": "y, a continuación, haga clic en el icono de engranaje en la esquina superior derecha y seleccione \"Importar una versión\", seleccione la carpeta donde se ha descargado beat saber (Si usted sigue el tutorial anterior debe tener la ubicación correcta)"
},
"bs-import-version":{
"title": "Importar una versión",
"description": "Importa una versión de BeatSaber para usar con BSManager. La importación copiará la carpeta de instalación seleccionada de BeatSaber en la carpeta de versiones de BSManager.",
+49 -40
View File
@@ -18,10 +18,13 @@
"settings": "Paramètres"
},
"pages": {
"shared-maps":{
"title": "Maps partagées"
},
"version-viewer": {
"launch-mods": {
"oculus": "Mode Oculus",
"oculus-description": "Si vous exécutez Beat Saber via Steam, cela vous permet de jouer au jeu sur un casque Oculus.",
"oculus-description": "Si vous utilisez Beat Saber via Steam, cela vous permet d'utiliser le compositeur VR d'Oculus sans passer par SteamVR, pour gagner en performances. Ceci n'est pas nécessaire pour utiliser les casques Oculus.",
"desktop": "Mode Bureau",
"desktop-description": "Cela vous permet d'utiliser WASD et la souris pour naviguer dans le menu en jeu. Cela rend les tests beaucoup plus faciles, car vous n'avez pas à mettre votre casque!",
"debug": "Mode Debug",
@@ -84,7 +87,7 @@
}
},
"available-versions": {
"title": "Choisi une version",
"title": "Choisis une version",
"steam-release": "Notes de version",
"dropdown": {
"refresh": "Rafraichir la liste",
@@ -99,7 +102,7 @@
},
"appearance": {
"title": "Apparence",
"description": "Choisi les deux couleurs principales de BSManager.",
"description": "Choisis les deux couleurs principales de BSManager.",
"reset": "Réinitialiser",
"sub-title": "Thème",
"themes": {
@@ -115,7 +118,7 @@
},
"additional-content": {
"title": "Contenus additionnels",
"description": "Les contenus additionnels te permet de personaliser BeatSaber !",
"description": "Les contenus additionnels te permettent de personaliser Beat Saber!",
"deep-links": {
"sub-title": "Installations OneClick"
}
@@ -138,7 +141,7 @@
},
"patreon": {
"title": "Soutenir BSManager 💖",
"description": "Soutien le projet et aide-nous à fournir des améliorations continues à BSManager.",
"description": "Soutiens le projet et aide-nous à fournir des améliorations continues à BSManager.",
"buttons": {
"support": "Soutenir BSManager 🥰",
"supporters": "Supporteurs 👀"
@@ -170,7 +173,7 @@
},
"common": {
"msg": {
"error-occurred": "Une erreur c'est produite"
"error-occurred": "Une erreur s'est produite"
}
},
"shared": {
@@ -180,8 +183,8 @@
"no-internet": "Pas d'internet"
},
"msg": {
"operation-running": "Attend la fin de l'opération en cours puis recommences.",
"no-internet": "Verifie t'a connexion internet et recommence."
"operation-running": "Attends la fin de l'opération en cours puis recommence.",
"no-internet": "Verifie ta connexion internet et recommence."
}
}
},
@@ -194,11 +197,11 @@
},
"warnings": {
"msg": {
"ManifestChecksum": "Le manifest télécharger précédemment ne correspond pas au nouveau 🤔",
"ManifestChecksum": "Le manifest téléchargé précédemment ne correspond pas au nouveau 🤔",
"ConnectionTimeout": "Ta connexion internet semble instable 🥶",
"ConnectionLost": "La connexion a été perdue, retentative...",
"ConnectionError": "Impossible de se connecter à Steam, retentative...",
"Unknown": "Quelque chose d'étrange c'est produit 🤔 Votre connexion est surement instable."
"ConnectionLost": "La connexion a été perdue, nouvelle tentative...",
"ConnectionError": "Impossible de se connecter à Steam, nouvelle tentative...",
"Unknown": "Quelque chose d'étrange s'est produit 🤔 Votre connexion est surement instable."
}
},
"errors": {
@@ -206,31 +209,31 @@
"dotnet-required": ".NET 6 Requis"
},
"msg": {
"401": "Steam semble pas vouloir nous laisser télécharger BeatSaber 😢",
"401": "Steam ne semble pas vouloir nous laisser télécharger Beat Saber 😢",
"404": "Impossible de contacter les serveurs de Steam.",
"Password": "Le mot de passe est invalide.",
"InvalidCredentials": "Ton e-mail ou mot de passe est invalide 😴",
"InvalidPassword": "Ton mot de passe est invalide 😕",
"NoManifest": "Aucun manifest n'a été trouvé.",
"DirectoryCreate": "Impossible d'installer les dossiers nécessaires.",
"NotAvailableApp": "Tu essayes de télécharger BeatSaber alors que tu ne l'as pas ? 🤣",
"DepotNotFound": "Impossible de télécharger BeatSaber 😥 réessaye plus tard 😕",
"NotAvailableApp": "Tu essayes de télécharger Beat Saber alors que tu ne l'as pas ? 🤣",
"DepotNotFound": "Impossible de télécharger Beat Saber 😥 réessaye plus tard 😕",
"NotCompleted": "Le téléchargement n'a pas pu se terminer ¯\\_(ツ)_/¯",
"InvalidManifest": "Impossible de télécharger BeatSaber 😥 réessaye plus tard 😕",
"NoValidKey": "Impossible de télécharger BeatSaber 😥 réessaye plus tard 😕",
"NoManifestCode": "Impossible de télécharger BeatSaber 😥 réessaye plus tard 😕",
"Unknown": "Une erreur inconnue c'est produite ¯\\_(ツ)_/¯",
"InvalidManifest": "Impossible de télécharger Beat Saber 😥 réessaye plus tard 😕",
"NoValidKey": "Impossible de télécharger Beat Saber 😥 réessaye plus tard 😕",
"NoManifestCode": "Impossible de télécharger Beat Saber 😥 réessaye plus tard 😕",
"Unknown": "Une erreur inconnue s'est produite ¯\\_(ツ)_/¯",
"NoServer": "Impossible de contacter les serveurs de Steam.",
"NotAllowed": "Apparemment tu n'es pas autorisé à télécharger BeatSaber 🥱",
"NotAllowed": "Apparemment tu n'es pas autorisé à télécharger Beat Saber 🥱",
"ConnectionTimeout": "Impossible de se connecter à Steam 😕",
"SteamLib": "Si tu à cette erreur, report le bug sur GitHub avec les logs stp.",
"SteamLib": "Si tu as cette erreur, signale le bug sur GitHub avec les logs stp.",
"ConnectionError": "Impossible de se connecter à Steam après 10 essais 🤯",
"LicenceError": "Impossible d'obtenir la liste des licences.",
"verification-failed": "La vérification a échoué, réessaye plus tard.",
"RateLimitExceeded": "Tu as essayé trop de fois attend un peu et recommence plus tard.",
"RateLimitExceeded": "Tu as essayé trop de fois attends un peu et recommence plus tard.",
"AlreadyDownloading": "Un téléchargement est déjà en cours",
"no-internet": "Pas de connexion internet.",
"dotnet-required": ".NET 6 Runtime doit être installé pour pouvoir télécharger une version de BeatSaber. Télécharge-le en cliquant sur le bouton ci-dessous."
"dotnet-required": ".NET 6 Runtime doit être installé pour pouvoir télécharger une version de Beat Saber. Télécharge-le en cliquant sur le bouton ci-dessous."
},
"actions":{
"download-dotnet": "Télécharger .NET 6"
@@ -249,7 +252,7 @@
},
"errors":{
"import-error":{
"desc": "Vérifier que le dossier sélectionné est une installation de BeatSaber."
"desc": "Vérifier que le dossier sélectionné est une installation de Beat Saber."
}
}
},
@@ -316,14 +319,14 @@
"UNABLE_TO_LAUNCH": "Lancement impossible",
"STEAM_NOT_RUNNING": "Steam n'est pas lancé",
"OCULUS_NOT_RUNNING": "Oculus n'est pas lancé",
"BS_ALREADY_RUNNING": "BeatSaber est déjà lancé",
"BS_ALREADY_RUNNING": "Beat Saber est déjà lancé",
"EXE_NOT_FINDED": "Fichiers manquants",
"EXIT": "Arrêt brutal"
},
"msg": {
"STEAM_NOT_RUNNING": "Steam doit être en cours d'exécution pour lancer BeatSaber.",
"OCULUS_NOT_RUNNING": "Oculus doit être en cours d'exécution pour lancer BeatSaber.",
"BS_ALREADY_RUNNING": "Ferme BeatSaber avant de le lancer à nouveau.",
"STEAM_NOT_RUNNING": "Steam doit être en cours d'exécution pour lancer Beat Saber.",
"OCULUS_NOT_RUNNING": "Oculus doit être en cours d'exécution pour lancer Beat Saber.",
"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": "BeatSaber s'est arrêté brusquement, essaye de vérifier les fichiers."
},
@@ -347,12 +350,12 @@
"CantClone": "Clonage impossible"
},
"msg": {
"CantEditSteam": "Tu ne peut pas éditer la version Steam. Tu peut la cloner par contre."
"CantEditSteam": "Tu ne peux pas éditer la version Steam. Tu peux la cloner par contre."
}
},
"success": {
"titles": {
"CloningFinished": "Clonage terminer 🎉"
"CloningFinished": "Clonage terminé 🎉"
}
}
},
@@ -363,10 +366,10 @@
"warning": "Mods installés 🤔"
},
"msg": {
"success": "Tous les mods on été installés.",
"success": "Tous les mods ont été installés.",
"warning": "Un ou plusieurs mods n'ont pas pu être installés.",
"errors": {
"no-mods": "Aucun mods à installer.",
"no-mods": "Aucun mod à installer.",
"cannot-install-bsipa": "L'installation de BSIPA à échoué 😨"
}
}
@@ -386,7 +389,7 @@
"success": "Mods désintallés 🎉"
},
"msg": {
"success": "Tous les mods on été désintallés.",
"success": "Tous les mods ont été désintallés.",
"errors": {
"no-mods": "Aucun mod n'est installé dans dans cette version 😑"
}
@@ -443,10 +446,16 @@
"label": "Rester connecté"
}
},
"why-credentials": "Pourquoi mes identifiants sont nécessaires ?",
"buttons": {
"submit": "Se connecter"
}
},
"steam-credentials":{
"title": "Steam Credentials",
"p-1": "Les informations d'identification ne sont utilisées que pour télécharger le jeu, car Steam doit vérifier que vous avez payé le jeu afin d'être autorisé à le télécharger. Ils ne sont pas sauvegardés et transmis directement à DepotDownloader. Si vous ne voulez pas entrer vos informations d'identification, vous pouvez suivre ce tutoriel :",
"p-2": "puis cliquez sur l'icône de l'engrenage dans le coin supérieur droit et sélectionnez \"Importer une version\", sélectionnez le dossier où beat saber a été téléchargé (Si vous suivez le tutoriel ci-dessus, vous devriez avoir le bon emplacement)."
},
"bs-import-version":{
"title": "Importer une version",
"description": "Importe une version de BeatSaber pour profiter des fonctionnalités de BSManager. L'importation copiera le dossier d'installation de BeatSaber sélectionné dans le dossier de versions de BSManager.",
@@ -456,14 +465,14 @@
},
"bs-uninstall": {
"title": "Désinstaller",
"description": "Est-tu sûr de vouloir désinstaller BeatSaber {version} ? Tu vas devoir la retélécharger pour y jouer.",
"description": "Es-tu sûr de vouloir désinstaller Beat Saber {version} ? Tu vas devoir la retélécharger pour y jouer.",
"buttons": {
"submit": "Désinstaller"
}
},
"install-folder": {
"title": "Dossier d'installation",
"description": "Changer le dossier d'installation par défaut, va engendrer le déplacement de toutes les données installer vers le nouveau dossier.",
"description": "Changer le dossier d'installation par défaut, cela va engendrer le déplacement de toutes les données installer vers le nouveau dossier.",
"buttons": {
"submit": "Choisir un dossier"
}
@@ -506,12 +515,12 @@
"multiple": "Supprimer les maps ?"
},
"desc": {
"single": "Est-tu sur de vouloir supprimer la map {name} ?",
"multiple": "Est-tu sur de vouloir supprimer les {nb} maps ?"
"single": "Es-tu sur de vouloir supprimer la map {name} ?",
"multiple": "Es-tu sur de vouloir supprimer les {nb} maps ?"
},
"info": {
"desc": {
"single": "Cette map fait partie des maps paratagées",
"single": "Cette map fait partie des maps partagées",
"multiple": "Ces maps font parties des maps partagées"
},
"title": {
@@ -552,7 +561,7 @@
"li-1": "Vous pouvez rencontrer des problèmes qui n'existent pas dans le jeu de base. 99.9% des bugs, plantages et ralentissements sont dus aux mods.",
"li-2": "Les mods sont susceptibles de ne plus fonctionner à cause des mises à jour et c'est normal - soyez patient et respectueux lorsque cela se produit, parce que les moddeurs sont bénévoles et ont une vie.",
"li-3": "Beat Games ne cherche pas volontairement à casser les mods. Ils souhaitent améliorer la base du jeu et parfois cela casse les mods, mais ce n'est pas dans leur objectif de tuer les mods.",
"p-2": "N'attaquez pas les développeurs pour des problèmes relatifs aux mods, et inversement - les moddeurs et les développeurs sont deux groupes distincts. Ne sois pas idiot, d'accord ?"
"p-2": "N'attaquez pas les développeurs pour des problèmes relatifs aux mods, et inversement - les moddeurs et les développeurs sont deux groupes distincts. Ne soyez pas idiots, d'accord ?"
}
},
"maps": {
@@ -694,4 +703,4 @@
"PM"
]
}
}
}
+426 -153
View File
File diff suppressed because it is too large Load Diff
+6
View File
@@ -226,6 +226,9 @@
"dependencies": {
"@node-steam/vdf": "^2.2.0",
"@tippyjs/react": "^4.2.6",
"@types/react-virtualized-auto-sizer": "^1.0.1",
"@types/react-window": "^1.8.5",
"@types/recursive-readdir": "^2.2.1",
"archiver": "^5.3.1",
"dateformat": "^5.0.3",
"dot-prop": "^7.2.0",
@@ -246,6 +249,9 @@
"react-dom": "^18.2.0",
"react-range": "^1.8.14",
"react-router-dom": "^6.3.0",
"react-virtualized-auto-sizer": "^1.0.7",
"react-window": "^1.8.8",
"recursive-readdir": "^2.2.3",
"regedit": "^5.1.1",
"rfdc": "^1.3.0",
"rxjs": "^7.5.6",
+1228 -10
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "bs-manager",
"version": "1.0.0",
"version": "1.0.4",
"description": "A foundation for scalable desktop apps",
"main": "./dist/main/main.js",
"author": {
+2
View File
@@ -3,6 +3,7 @@ import { UtilsService } from "../services/utils.service";
import { IpcRequest } from "shared/models/ipc";
import { SearchParams } from "shared/models/maps/beat-saver.model";
import { BeatSaverService } from "../services/thrid-party/beat-saver/beat-saver.service";
import log from "electron-log";
ipcMain.on("bsv-search-map", async (event, request: IpcRequest<SearchParams>) => {
const utlis = UtilsService.getInstance();
@@ -22,6 +23,7 @@ ipcMain.on("bsv-get-map-details-from-hashs", async (event, request: IpcRequest<s
bsvService.getMapDetailsFromHashs(request.args).then(maps => {
utlis.ipcSend(request.responceChannel, {success: true, data: maps});
}).catch(e => {
log.error(e);
utlis.ipcSend(request.responceChannel, {success: false, error: e});
})
});
+20 -41
View File
@@ -1,24 +1,21 @@
import { ipcMain } from "electron";
import { LocalMapsManagerService } from "../services/additional-content/local-maps-manager.service";
import { UtilsService } from "../services/utils.service";
import { BSVersion } from "shared/bs-version.interface";
import { IpcRequest } from "shared/models/ipc";
import { BsmLocalMap } from "shared/models/maps/bsm-local-map.interface";
import { BsvMapDetail } from "shared/models/maps";
import { IpcService } from "../services/ipc.service";
import { from } from "rxjs";
ipcMain.on('get-version-maps', (event, request: IpcRequest<BSVersion>) => {
const utilsService = UtilsService.getInstance();
const ipc = IpcService.getInstance();
ipc.on('load-version-maps', async (request: IpcRequest<BSVersion>, reply) => {
const localMaps = LocalMapsManagerService.getInstance();
localMaps.getMaps(request.args).then(maps => {
utilsService.ipcSend<BsmLocalMap[]>(request.responceChannel, {success: true, data: maps});
}).catch(() => {
utilsService.ipcSend(request.responceChannel, {success: false});
})
reply(localMaps.getMaps(request.args));
});
ipcMain.on("verion-have-maps-linked", async (event, request: IpcRequest<BSVersion>) => {
ipc.on("verion-have-maps-linked", async (request: IpcRequest<BSVersion>) => {
const utils = UtilsService.getInstance();
const maps = LocalMapsManagerService.getInstance();
@@ -26,7 +23,7 @@ ipcMain.on("verion-have-maps-linked", async (event, request: IpcRequest<BSVersio
});
ipcMain.on("link-version-maps", async (event, request: IpcRequest<{version: BSVersion, keepMaps: boolean}>) => {
ipc.on("link-version-maps", async (request: IpcRequest<{version: BSVersion, keepMaps: boolean}>) => {
const utils = UtilsService.getInstance();
const maps = LocalMapsManagerService.getInstance();
@@ -38,7 +35,7 @@ ipcMain.on("link-version-maps", async (event, request: IpcRequest<{version: BSVe
});
ipcMain.on("unlink-version-maps", async (event, request: IpcRequest<{version: BSVersion, keepMaps: boolean}>) => {
ipc.on("unlink-version-maps", async (request: IpcRequest<{version: BSVersion, keepMaps: boolean}>) => {
const utils = UtilsService.getInstance();
const maps = LocalMapsManagerService.getInstance();
@@ -50,40 +47,22 @@ ipcMain.on("unlink-version-maps", async (event, request: IpcRequest<{version: BS
});
ipcMain.on("delete-maps", async (event, request: IpcRequest<{version: BSVersion, maps: BsmLocalMap[]}>) => {
const utils = UtilsService.getInstance();
ipc.on("delete-maps", async (request: IpcRequest<BsmLocalMap[]>, reply) => {
const maps = LocalMapsManagerService.getInstance();
maps.deleteMaps(request.args.maps, request.args.version).then(() => {
utils.ipcSend<void>(request.responceChannel, {success: true});
}).catch(err => {
utils.ipcSend<void>(request.responceChannel, {success: false, error: err});
});
reply(maps.deleteMaps(request.args));
});
ipcMain.on("export-maps", async (event, request: IpcRequest<{version: BSVersion, maps: BsmLocalMap[], outPath: string}>) => {
const utils = UtilsService.getInstance();
ipc.on("export-maps", async (request: IpcRequest<{version: BSVersion, maps: BsmLocalMap[], outPath: string}>, reply) => {
const maps = LocalMapsManagerService.getInstance();
maps.exportMaps(request.args.version, request.args.maps, request.args.outPath).then(() => {
utils.ipcSend<void>(request.responceChannel, {success: true});
}).catch(err => {
utils.ipcSend<void>(request.responceChannel, {success: false, error: err});
});
reply(await maps.exportMaps(request.args.version, request.args.maps, request.args.outPath));
});
ipcMain.on("download-map", async (event, request: IpcRequest<{map: BsvMapDetail, version: BSVersion}>) => {
const utils = UtilsService.getInstance();
ipc.on("download-map", async (request: IpcRequest<{map: BsvMapDetail, version: BSVersion}>, reply) => {
const maps = LocalMapsManagerService.getInstance();
maps.downloadMap(request.args.map, request.args.version).then(() => {
utils.ipcSend(request.responceChannel, {success: true});
}).catch(err => {
utils.ipcSend(request.responceChannel, {success: false, error: err});
});
reply(from(maps.downloadMap(request.args.map, request.args.version)))
});
ipcMain.on("one-click-install-map", async (event, request: IpcRequest<BsvMapDetail>) => {
ipc.on("one-click-install-map", async (request: IpcRequest<BsvMapDetail>) => {
const utils = UtilsService.getInstance();
const maps = LocalMapsManagerService.getInstance();
@@ -94,7 +73,7 @@ ipcMain.on("one-click-install-map", async (event, request: IpcRequest<BsvMapDeta
});
});
ipcMain.on("register-maps-deep-link", async (event, request: IpcRequest<void>) => {
ipc.on("register-maps-deep-link", async (request: IpcRequest<void>) => {
const maps = LocalMapsManagerService.getInstance();
const utils = UtilsService.getInstance();
@@ -109,7 +88,7 @@ ipcMain.on("register-maps-deep-link", async (event, request: IpcRequest<void>) =
});
ipcMain.on("unregister-maps-deep-link", async (event, request: IpcRequest<void>) => {
ipc.on("unregister-maps-deep-link", async (request: IpcRequest<void>) => {
const maps = LocalMapsManagerService.getInstance();
const utils = UtilsService.getInstance();
@@ -124,7 +103,7 @@ ipcMain.on("unregister-maps-deep-link", async (event, request: IpcRequest<void>)
});
ipcMain.on("is-map-deep-links-enabled", async (event, request: IpcRequest<void>) => {
ipc.on("is-map-deep-links-enabled", async (request: IpcRequest<void>) => {
const maps = LocalMapsManagerService.getInstance();
const utils = UtilsService.getInstance();
+78
View File
@@ -0,0 +1,78 @@
import archiver from "archiver";
import { createWriteStream } from "fs";
import { Observable } from "rxjs";
import recursive from "recursive-readdir";
import { lstatSync } from "fs";
import * as _path from "path";
import { ArchiveProgress } from "shared/models/archive.interface";
export class Archive{
private archive: archiver.Archiver;
private readonly output: string;
private readonly directories: string[] = [];
private readonly files: string[] = [];
constructor(output: string, options?: archiver.ArchiverOptions){
this.output = output;
this.initArchive(options);
}
private initArchive(options?: archiver.ArchiverOptions): void{
const defaultOptions: archiver.ArchiverOptions = {
zlib: {level: 9}
};
this.archive = archiver("zip", {...defaultOptions, ...options});
}
private async loadTotalFiles(): Promise<number>{
let totalFiles = this.files.length;
for(const path of this.directories){
const files = await recursive(path);
totalFiles += files.length;
}
return totalFiles;
}
public addDirectory(path: string, destPath?: string|false): void{
this.directories.push(path);
destPath = destPath === false ? false : _path.basename(path);
this.archive.directory(path, destPath);
}
public addFile(path: string, destPath?: string): void{
this.files.push(path);
destPath = destPath ||= _path.basename(path);
this.archive.file(path, {name: destPath});
}
public finalize(): Observable<ArchiveProgress>{
const progress: ArchiveProgress = {
totalFiles: 0,
prossesedFiles: 0
};
return new Observable<ArchiveProgress>(observer => {
(async () => {
progress.totalFiles = await this.loadTotalFiles();
this.archive.on("entry", e => {
if(e.stats.isDirectory()){ return; }
progress.prossesedFiles++;
observer.next(progress);
});
this.archive.pipe(createWriteStream(this.output));
this.archive.on("error", err => observer.error(err));
this.archive.finalize().then(() => observer.complete());
})();
});
}
}
+7 -5
View File
@@ -1,21 +1,23 @@
import { contextBridge, ipcRenderer, IpcRendererEvent } from 'electron';
export type Channels = any;
import { IpcChannel } from 'shared/models/ipc/ipc-response.interface';
contextBridge.exposeInMainWorld('electron', {
ipcRenderer: {
sendMessage(channel: Channels, args: unknown[]) {
sendMessage(channel: IpcChannel, args: unknown[]) {
ipcRenderer.send(channel, args);
},
on(channel: Channels, func: (...args: unknown[]) => void) {
on(channel: IpcChannel, func: (...args: unknown[]) => void) {
const subscription = (_event: IpcRendererEvent, ...args: unknown[]) =>
func(...args);
ipcRenderer.on(channel, subscription);
return () => ipcRenderer.removeListener(channel, subscription);
},
once(channel: Channels, func: (...args: unknown[]) => void) {
once(channel: IpcChannel, func: (...args: unknown[]) => void) {
ipcRenderer.once(channel, (_event, ...args) => func(...args));
},
removeAllListeners(channel: IpcChannel) {
ipcRenderer.removeAllListeners(channel);
}
},
});
@@ -1,22 +1,23 @@
import path from "path";
import { BSVersion } from "shared/bs-version.interface";
import { BsvMapDetail, RawMapInfoData } from "shared/models/maps";
import { BsmLocalMap } from "shared/models/maps/bsm-local-map.interface";
import { BsmLocalMap, BsmLocalMapsProgress, DeleteMapsProgress } from "shared/models/maps/bsm-local-map.interface";
import { BSLocalVersionService } from "../bs-local-version.service";
import { InstallationLocationService } from "../installation-location.service";
import { UtilsService } from "../utils.service";
import crypto from "crypto";
import { lstatSync, symlinkSync, unlinkSync, readdirSync, createWriteStream } from "fs";
import { copySync } from "fs-extra";
import { lstatSync, symlinkSync, unlinkSync } from "fs";
import { copy, copySync } from "fs-extra";
import StreamZip from "node-stream-zip";
import { RequestService } from "../request.service";
import sanitize from "sanitize-filename";
import archiver from "archiver";
import { DeepLinkService } from "../deep-link.service";
import log from 'electron-log';
import { WindowManagerService } from "../window-manager.service";
import { ipcMain } from "electron";
import { IpcRequest } from 'shared/models/ipc';
import { Observable } from "rxjs";
import { Archive } from "../../models/archive.class";
export class LocalMapsManagerService {
@@ -50,18 +51,19 @@ export class LocalMapsManagerService {
this.deepLink = DeepLinkService.getInstance();
this.windows = WindowManagerService.getInstance();
this.deepLink.addLinkOpenedListener(this.DEEP_LINKS.BeatSaver, (link) => {
this.deepLink.addLinkOpenedListener(this.DEEP_LINKS.BeatSaver, link => {
log.info("DEEP-LINK RECEIVED FROM", this.DEEP_LINKS.BeatSaver, link);
this.openOneClickDownloadMapWindow(new URL(link).host);
});
this.deepLink.addLinkOpenedListener(this.DEEP_LINKS.ScoreSaber, (link) => {
this.deepLink.addLinkOpenedListener(this.DEEP_LINKS.ScoreSaber, link => {
log.info("DEEP-LINK RECEIVED FROM", this.DEEP_LINKS.ScoreSaber, link);
this.openOneClickDownloadMapWindow(new URL(link).host, true);
});
}
public async getMapsFolderPath(version?: BSVersion): Promise<string>{
if(version){ return path.join(await this.localVersion.getVersionPath(version), this.LEVELS_ROOT_FOLDER, this.CUSTOM_LEVELS_FOLDER); }
const sharedMapsPath = path.join(this.installLocation.sharedMapsPath, this.CUSTOM_LEVELS_FOLDER);
if(!(await this.utils.pathExist(sharedMapsPath))){
@@ -72,18 +74,16 @@ export class LocalMapsManagerService {
private async computeMapHash(mapPath: string, rawInfoString: string): Promise<string>{
const mapRawInfo = JSON.parse(rawInfoString);
let content = rawInfoString;
const shasum = crypto.createHash("sha1");
shasum.update(rawInfoString);
for(const set of mapRawInfo._difficultyBeatmapSets){
for(const diff of set._difficultyBeatmaps){
const diffFilePath = path.join(mapPath, diff._beatmapFilename);
if(!await this.utils.pathExist(diffFilePath)){ continue; }
const diffContent = (await this.utils.readFileAsync(diffFilePath)).toString();
content += diffContent;
const diffContent = await this.utils.readFileAsync(diffFilePath).catch(() => null);
diffContent && shasum.update(diffContent);
}
}
const shasum = crypto.createHash("sha1");
shasum.update(content);
return shasum.digest("hex");
}
@@ -92,7 +92,7 @@ export class LocalMapsManagerService {
if(!(await this.utils.pathExist(infoFilePath))){ return null; }
const rawInfoString = await (await (this.utils.readFileAsync(infoFilePath))).toString();
const rawInfoString = await this.utils.readFileAsync(infoFilePath);
const rawInfo: RawMapInfoData = JSON.parse(rawInfoString);
const coverUrl = new URL(`file:///${path.join(mapPath, rawInfo._coverImageFilename)}`).href;
@@ -100,7 +100,7 @@ export class LocalMapsManagerService {
const hash = await this.computeMapHash(mapPath, rawInfoString);
return {rawInfo, coverUrl, songUrl, hash};
return {rawInfo, coverUrl, songUrl, hash, path: mapPath};
}
private async downloadMapZip(zipUrl: string): Promise<{zip: StreamZip.StreamZipAsync, zipPath: string}>{
@@ -115,28 +115,6 @@ export class LocalMapsManagerService {
return {zip, zipPath};
}
private async getAbsoluteFolderOfMaps(maps: BsmLocalMap[], version: BSVersion): Promise<string[]>{
const mapsFolder = await this.getMapsFolderPath(version);
const res: string[] = [];
const mapHashs = maps.map(map => map.hash);
const mapsFolders = readdirSync(mapsFolder, {withFileTypes: true});
for(const content of mapsFolders){
if(!content.isDirectory()){ continue; }
const mapFolderPath = path.join(mapsFolder, content.name);
const { hash } = await this.loadMapInfoFromPath(mapFolderPath);
if(mapHashs.includes(hash)){
res.push(mapFolderPath);
}
}
return res;
}
private openOneClickDownloadMapWindow(mapId: string, isHash = false): void{
ipcMain.once("one-click-map-info", async (event, req: IpcRequest<void>) => {
@@ -147,14 +125,44 @@ export class LocalMapsManagerService {
}
public async getMaps(version?: BSVersion): Promise<BsmLocalMap[]>{
const levelsFolder = await this.getMapsFolderPath(version);
public getMaps(version?: BSVersion): Observable<BsmLocalMapsProgress>{
const levelsPath = (await this.utils.pathExist(levelsFolder)) ? this.utils.listDirsInDir(levelsFolder, true) : [];
const progression: BsmLocalMapsProgress = {
total: 0,
loaded: 0,
maps: []
};
const mapsInfo = await Promise.all(levelsPath.map(levelPath => this.loadMapInfoFromPath(levelPath)));
return new Observable<BsmLocalMapsProgress>(observer => {
(async () => {
const levelsFolder = await this.getMapsFolderPath(version);
return mapsInfo.filter(info => !!info);
const levelsPaths = (await this.utils.pathExist(levelsFolder)) ? this.utils.listDirsInDir(levelsFolder, true) : [];
progression.total = levelsPaths.length;
const promises = levelsPaths.map(async levelPath => {
const mapInfo = await this.loadMapInfoFromPath(levelPath);
if(!mapInfo){ return null; }
progression.loaded++;
observer.next(progression);
return mapInfo;
});
const mapsInfo = (await Promise.allSettled(promises)).reduce((acc, mapInfo) => {
if(mapInfo.status === "fulfilled" && mapInfo.value){
acc.push(mapInfo.value);
}
return acc;
} ,[] as BsmLocalMap[]);
progression.maps = mapsInfo;
observer.next(progression);
observer.complete();
})();
});
}
public async versionIsLinked(version: BSVersion): Promise<boolean>{
@@ -196,26 +204,36 @@ export class LocalMapsManagerService {
this.utils.createFolderIfNotExist(versionMapsPath);
if(keepMaps){
copySync(sharedMapsPath, versionMapsPath);
await copy(sharedMapsPath, versionMapsPath);
}
}
public async deleteMaps(maps: BsmLocalMap[], verion?: BSVersion){
public deleteMaps(maps: BsmLocalMap[]): Observable<DeleteMapsProgress>{
const mapsFolders = await this.getAbsoluteFolderOfMaps(maps, verion);
const mapsFolders = maps.map(map => map.path);
const mapsHashsToDelete = maps.map(map => map.hash);
for(const folder of mapsFolders){
const { hash } = await this.loadMapInfoFromPath(folder);
if(mapsHashsToDelete.includes(hash)){
await this.utils.deleteFolder(folder);
}
}
return new Observable<DeleteMapsProgress>(observer => {
(async () => {
const progress: DeleteMapsProgress = { total: maps.length, deleted: 0 };
try{
for(const folder of mapsFolders){
const detail = await this.loadMapInfoFromPath(folder);
if(!mapsHashsToDelete.includes(detail?.hash)){ continue; }
await this.utils.deleteFolder(folder);
progress.deleted++;
observer.next(progress);
}
}catch(e){
observer.error(e);
}
observer.complete();
})();
});
}
public async downloadMap(map: BsvMapDetail, version?: BSVersion): Promise<string>{
public async downloadMap(map: BsvMapDetail, version?: BSVersion): Promise<BsmLocalMap>{
if(!map.versions.at(0).hash){ throw "Cannot download map, no hash found"; }
@@ -238,34 +256,26 @@ export class LocalMapsManagerService {
unlinkSync(zipPath);
return mapPath;
const localMap = await this.loadMapInfoFromPath(mapPath);
localMap.bsaverInfo = map;
return localMap;
}
public async exportMaps(version: BSVersion, maps: BsmLocalMap[], outPath: string){
const output = createWriteStream(outPath);
const archive = archiver("zip", {zlib: {level: 9}});
archive.pipe(output);
archive.on("error", (e) => {throw e});
const archive = new Archive(outPath);
if(!maps || maps.length === 0){
const mapsFolder = await this.getMapsFolderPath(version);
archive.directory(mapsFolder, false);
archive.addDirectory(mapsFolder, false);
}
else{
const mapsFolders = await this.getAbsoluteFolderOfMaps(maps, version);
for(const folder of mapsFolders){
archive.directory(folder, path.basename(folder));
}
const mapsFolders = maps.map(map => map.path);
mapsFolders.forEach(maps => archive.addDirectory(maps));
}
await archive.finalize();
return archive.finalize()
}
@@ -283,7 +293,7 @@ export class LocalMapsManagerService {
this.utils.createFolderIfNotExist(versionMapsPath);
copySync(downloadedMap, path.join(versionMapsPath, path.basename(downloadedMap)), {overwrite: true});
copySync(downloadedMap.path, path.join(versionMapsPath, path.basename(downloadedMap.path)), {overwrite: true});
}
@@ -163,7 +163,7 @@ export class LocalPlaylistsManagerService {
...res.value,
current: null,
downloadedMaps: [...res.value.downloadedMaps, map],
mapsPath: [...res.value.mapsPath, mapPath],
mapsPath: [...res.value.mapsPath, mapPath.path],
progression
});
+26 -9
View File
@@ -1,3 +1,4 @@
/* eslint-disable prefer-promise-reject-errors */
import { BS_APP_ID, BS_DEPOT } from "../constants";
import path from "path";
import { BSVersion, PartialBSVersion } from 'shared/bs-version.interface';
@@ -10,6 +11,7 @@ import { BSLocalVersionService } from "./bs-local-version.service";
import isOnline from 'is-online';
import { WindowManagerService } from "./window-manager.service";
import { copy, copySync } from "fs-extra";
import { clean, satisfies } from "semver";
export class BSInstallerService{
@@ -28,7 +30,7 @@ export class BSInstallerService{
this.localVersionService = BSLocalVersionService.getInstance();
this.windows = WindowManagerService.getInstance();
this.windows.getWindows("index.html")?.on("close", () => {
this.windows.getWindow("index.html")?.on("close", () => {
this.killDownloadProcess();
});
}
@@ -38,8 +40,12 @@ export class BSInstallerService{
return BSInstallerService.instance;
}
private escapeSpaces(path: string): string{
return `\"${path}\"`
}
private getDepotDownloaderExePath(): string{
return path.join(this.utils.getAssetsScriptsPath(), 'depot-downloader', 'DepotDownloader.exe');
return this.escapeSpaces(path.join(this.utils.getAssetsScriptsPath(), 'depot-downloader', 'DepotDownloader.exe'));
}
private removeSpecialSchar(txt: string): string{ return txt.replaceAll(/\[|\]/g, ""); }
@@ -66,16 +72,19 @@ export class BSInstallerService{
});
}
public async isDotNet6Installed(): Promise<boolean>{
public async isDotNet6Installed(): Promise<boolean>{
try{
const process = spawnSync(this.getDepotDownloaderExePath());
const out = process.output.toString();
if(out.includes(".NET runtime can be found at")){ return false; }
const process = spawnSync(this.getDepotDownloaderExePath(), {shell: true});
if(process.stderr.toString()){
log.error("no dotnet", process.stderr.toString());
return false;
}
return true;
}
catch(e){
log.error("Error while checking .NET 6", e);
return false;
}
}
}
public async downloadBsVersion(downloadInfos: DownloadInfo): Promise<DownloadEvent>{
@@ -100,8 +109,7 @@ export class BSInstallerService{
`-depot ${BS_DEPOT}`,
`-manifest ${bsVersion.BSManifest}`,
`-username ${downloadInfos.username}`,
`-dir \"${this.localVersionService.getVersionFolder(downloadVersion)}\"`,
(downloadInfos.stay || !downloadInfos.password) && "-remember-password"
`-dir \"${this.localVersionService.getVersionFolder(downloadVersion)}\"`
],
{shell: true, cwd: this.installLocationService.versionsDirectory}
);
@@ -152,16 +160,25 @@ export class BSInstallerService{
this.downloadProcess.stdout.on('error', (err) => {
log.error("BS-DOWNLOAD ERROR", err.toString());
this.killDownloadProcess();
if(err.toString().includes(".NET") || err.toString().includes("dotnet") || err.toString().includes(".dll")){
reject("dotnet");
}
reject();
});
this.downloadProcess.stderr.on('data', (err) => {
log.error("BS-DOWNLOAD ERROR", err.toString());
this.killDownloadProcess();
if(err.toString().includes(".NET") || err.toString().includes("dotnet") || err.toString().includes(".dll")){
reject("dotnet");
}
reject();
});
this.downloadProcess.stderr.on('error', (err) => {
log.error("BS-DOWNLOAD ERROR", err.toString());
this.killDownloadProcess();
if(err.toString().includes(".NET") || err.toString().includes("dotnet") || err.toString().includes(".dll")){
reject("dotnet");
}
reject();
});
+13 -4
View File
@@ -44,12 +44,21 @@ export class BSLauncherService{
if(!this.utilsService.pathExist(exePath)){ return "EXE_NOT_FINDED"; }
const launchMods = [launchOptions.oculus && "-vrmode oculus", launchOptions.desktop && "fpfc", launchOptions.debug && "--verbose"];
const launchMods = [];
this.bsProcess = spawn(`\"${exePath}\"`, launchMods, {shell: true, cwd, env: {...process.env, "SteamAppId": BS_APP_ID}});
if(launchOptions.oculus){ launchMods.push("-vrmode oculus"); }
if(launchOptions.desktop){ launchMods.push("fpfc"); }
if(launchOptions.debug){ launchMods.push("--verbose"); }
this.bsProcess.on('message', msg => { /** EMIT HERE **/ });
this.bsProcess.on('error', err => { /** EMIT HERE **/ });
if(launchOptions.debug){
this.bsProcess = spawn(`\"${exePath}\"`, launchMods, {shell: true, cwd, env: {...process.env, "SteamAppId": BS_APP_ID}, detached: true, windowsVerbatimArguments: true });
}
else{
this.bsProcess = spawn(`\"${exePath}\"`, launchMods, {shell: true, cwd, env: {...process.env, "SteamAppId": BS_APP_ID} });
}
this.bsProcess.on('message', msg => console.log(msg));
this.bsProcess.on('error', err => console.log(err));
this.bsProcess.on('exit', code => this.utilsService.ipcSend("bs-launch.exit", {data: code, success: code === 0}));
return "LAUNCHED";
+1 -1
View File
@@ -35,7 +35,7 @@ export class BSVersionLibService{
private async getLocalVersions(): Promise<BSVersion[]>{
const localVersionsPath = path.join(this.utilsService.getAssestsJsonsPath(), this.VERSIONS_FILE);
const rawVersion = (await this.utilsService.readFileAsync(localVersionsPath)).toString();
const rawVersion = await this.utilsService.readFileAsync(localVersionsPath);
return JSON.parse(rawVersion);
}
+64
View File
@@ -0,0 +1,64 @@
import { IpcResponse, IpcRequest } from "shared/models/ipc";
import { ipcMain } from "electron";
import { Observable } from "rxjs";
import { IpcChannel, IpcCompleteChannel, IpcErrorChannel } from "shared/models/ipc/ipc-response.interface";
import { AppWindow } from "shared/models/window-manager/app-window.model";
import { WindowManagerService } from "./window-manager.service";
import { IpcReplier } from "shared/models/ipc/ipc-request.interface";
export class IpcService {
private static instance: IpcService;
public static getInstance(): IpcService {
if (!IpcService.instance) { IpcService.instance = new IpcService(); }
return IpcService.instance;
}
private readonly windows: WindowManagerService;
private constructor() {
this.windows = WindowManagerService.getInstance();
}
private getErrorChannel(channel: IpcChannel): IpcErrorChannel {
return `${channel}_error`;
}
private getCompleteChannel(channel: IpcChannel): IpcCompleteChannel {
return `${channel}_complete`;
}
private buildProxyListener<T>(listener: (req: IpcRequest<T>, replier: IpcReplier) => void) {
return (event: Electron.IpcMainEvent, req: IpcRequest<T>) => {
const window = this.windows.getAppWindowFromWebContents(event.sender);
const replier = (data: Observable<unknown>) => this.connectStream(req.responceChannel, window, data);
listener(req, replier);
}
}
public send<T>(channel: IpcChannel, window: AppWindow, response?: T|Error): void{
this.windows.getWindow(window).webContents.send(channel, response);
}
public connectStream(channel: IpcChannel, window: AppWindow, observable: Observable<unknown>): void{
observable.subscribe(data => {
this.send(channel, window, data);
}, error => {
this.send(this.getErrorChannel(channel), window, error);
}, () => {
this.send(this.getCompleteChannel(channel), window);
});
}
public on<T>(channel: IpcChannel, listener: (req: IpcRequest<T>, replier: IpcReplier) => void): void{
ipcMain.on(channel, this.buildProxyListener(listener));
}
public once<T>(channel: IpcChannel, listener: (req: IpcRequest<T>, replier: IpcReplier) => void): void{
ipcMain.once(channel, this.buildProxyListener(listener));
}
}
+1 -1
View File
@@ -43,7 +43,7 @@ export class SupportersService {
private async getLocalSupporters(): Promise<Supporter[]>{
const patreonsPath = path.join(this.utilsService.getAssestsJsonsPath(), this.PATREONS_FILE);
const rawPatreons = (await this.utilsService.readFileAsync(patreonsPath)).toString();
const rawPatreons = await this.utilsService.readFileAsync(patreonsPath);
return JSON.parse(rawPatreons);
}
@@ -32,8 +32,7 @@ export class BeatSaverService {
return res;
}, [] as BsvMapDetail[]);
for(const hashs of chunkHash){
await Promise.allSettled(chunkHash.map(async hashs => {
const res = await this.bsaverApi.getMapsDetailsByHashs(hashs);
if(res.status === 200){
@@ -42,7 +41,7 @@ export class BeatSaverService {
this.cachedMapsDetails.set(detail.versions.at(0).hash.toLowerCase(), detail);
});
}
}
}));
return mapDetails;
}
+9 -5
View File
@@ -9,6 +9,7 @@ import { IpcResponse } from "shared/models/ipc";
import log from "electron-log";
import { AppWindow } from "shared/models/window-manager/app-window.model";
// TODO : REFACTOR
export class UtilsService{
@@ -64,8 +65,8 @@ export class UtilsService{
}
public readFileAsync(path: string){
return new Promise<Buffer>((resolve, reject) => {
readFile(path, (err, data) => {
return new Promise<string>((resolve, reject) => {
readFile(path, {encoding: "utf-8", flag: "r"}, (err, data) => {
if(err){ reject(err); }
else{ resolve(data); }
});
@@ -73,9 +74,12 @@ export class UtilsService{
}
public listDirsInDir(dirPath: string, fullPath = false): string[]{
let files = readdirSync(dirPath, { withFileTypes:true});
files = files.filter(f => f.isDirectory())
return files.map(f => fullPath ? path.join(dirPath, f.name) : f.name);
let files = readdirSync(dirPath, { withFileTypes:true });
return files.reduce((acc, f) => {
if(!f.isDirectory()){ return acc; }
acc.push(fullPath ? path.join(dirPath, f.name) : f.name);
return acc;
}, []);
}
public async deleteFolder(folderPath: string): Promise<void>{
+5 -1
View File
@@ -75,8 +75,12 @@ export class WindowManagerService{
});
}
public getWindows(window: AppWindow): BrowserWindow{
public getWindow(window: AppWindow): BrowserWindow{
return this.windows.get(window);
}
public getAppWindowFromWebContents(sender: Electron.WebContents): AppWindow{
return Array.from(this.windows.entries()).find(([key, value]) => value.webContents.id === sender.id)[0];
}
}
@@ -51,7 +51,6 @@ export function FilterPanel({className, ref, playlist = false, filter, onChange,
firstRun.current = false;
return;
}
console.log(filter, firstFilter);
setHaveChanged(() => !equal(filter, firstFilter));
}, [filter])
@@ -214,7 +213,7 @@ export function FilterPanel({className, ref, playlist = false, filter, onChange,
</div>
{onApply && (
<div className="inline float-right relative w-fit h-fit mt-2">
<BsmButton className="inline float-right rounded-md font-bold px-1 py-0.5 text-sm" text="Appliquer" typeColor="primary" withBar={false} onClick={handleApply}/>
<BsmButton className="inline float-right rounded-md font-bold px-1 py-0.5 text-sm" text="misc.apply" typeColor="primary" withBar={false} onClick={handleApply}/>
<GlowEffect visible={haveChanged}/>
</div>
)}
@@ -3,15 +3,21 @@ import { BSVersion } from "shared/bs-version.interface"
import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState } from "react"
import { BsmLocalMap } from "shared/models/maps/bsm-local-map.interface"
import { Subscription } from "rxjs"
import { MapItem, ParsedMapDiff } from "./map-item.component"
import { BsvMapCharacteristic, MapFilter } from "shared/models/maps/beat-saver.model"
import { MapFilter } from "shared/models/maps/beat-saver.model"
import { useInView } from "framer-motion"
import { MapsDownloaderService } from "renderer/services/maps-downloader.service"
import { BsmImage } from "../shared/bsm-image.component"
import BeatConflict from "../../../../assets/images/apngs/beat-conflict.png"
import { BsmButton } from "../shared/bsm-button.component"
import { VariableSizeList } from "react-window"
import { MapsRow } from "./maps-row.component"
import { BehaviorSubject } from "rxjs"
import { debounceTime, last, map, mergeMap, throttleTime } from "rxjs/operators"
import { BeatSaverService } from "renderer/services/thrird-partys/beat-saver.service"
import { OsDiagnosticService } from "renderer/services/os-diagnostic.service"
import { useTranslation } from "renderer/hooks/use-translation.hook"
import BeatWaitingImg from "../../../../assets/images/apngs/beat-waiting.png"
import BeatConflict from "../../../../assets/images/apngs/beat-conflict.png"
import { BsmImage } from "../shared/bsm-image.component"
import { BsmButton } from "../shared/bsm-button.component"
import TextProgressBar from "../progress-bar/text-progress-bar.component"
type Props = {
version: BSVersion,
@@ -24,23 +30,36 @@ export const LocalMapsListPanel = forwardRef(({version, className, filter, searc
const mapsManager = MapsManagerService.getInstance();
const mapsDownloader = MapsDownloaderService.getInstance();
const bsaver = BeatSaverService.getInstance();
const os = OsDiagnosticService.getInstance();
const t = useTranslation();
const ref = useRef(null)
const isVisible = useInView(ref, {once: true});
const [maps, setMaps] = useState<BsmLocalMap[]>(null);
const [subs] = useState<Subscription[]>([]);
const [selectedMaps, setSelectedMaps] = useState([]);
const t = useTranslation();
const [selectedMaps$] = useState(new BehaviorSubject<BsmLocalMap[]>([]));
const [itemPerRow, setItemPerRow] = useState(2);
const [listHeight, setListHeight] = useState(0);
const [loadPercent$] = useState(new BehaviorSubject(0));
useImperativeHandle(forwardRef ,()=>({
deleteMaps(){
const mapsToDelete = selectedMaps.length === 0 ? maps : selectedMaps
mapsManager.deleteMaps(mapsToDelete, version).finally(loadMaps);
const mapsToDelete = selectedMaps$.value.length === 0 ? maps : selectedMaps$.value;
mapsManager.deleteMaps(mapsToDelete, version).then(res => {
if(!res){ return; }
removeMapsFromList(mapsToDelete);
selectedMaps$.next([]);
});
},
exportMaps(){
mapsManager.exportMaps(version, selectedMaps)
mapsManager.exportMaps(version, selectedMaps$.value);
},
getMaps(){
return maps;
}
}), [selectedMaps, maps, version]);
}), [selectedMaps$.value, maps, version]);
useEffect(() => {
@@ -48,58 +67,99 @@ export const LocalMapsListPanel = forwardRef(({version, className, filter, searc
loadMaps();
subs.push(mapsManager.versionLinked$.subscribe(loadMaps));
subs.push(mapsManager.versionUnlinked$.subscribe(loadMaps));
mapsDownloader.addOnMapDownloadedListener(loadMaps);
mapsDownloader.addOnMapDownloadedListener((map, targerVersion) => {
if(targerVersion !== version){ return; }
setMaps(maps => maps ? [map, ...maps] : [map]);
});
}
return () => {
setMaps(() => null);
loadPercent$.next(0);
subs.forEach(s => s.unsubscribe());
mapsDownloader.removeOnMapDownloadedListene(loadMaps);
mapsDownloader.removeOnMapDownloadedListener(loadMaps);
}
}, [isVisible, version]);
const loadMaps = () => {
subs.push(mapsManager.getMaps(version).subscribe(localMaps => setMaps(() => [...localMaps])));
}
useEffect(() => {
if(!isVisible){ return () => {}; }
const handleDelete = useCallback((map: BsmLocalMap) => {
mapsManager.deleteMaps([map], version).then(res => res && loadMaps())
}, [version]);
const updateItemPerRow = (listWidth: number) => {
const newPerRow = Math.min(Math.floor(listWidth / 400), 3);
if(newPerRow === itemPerRow){ return; }
setItemPerRow(newPerRow);
};
const extractMapDiffs = (map: BsmLocalMap): Map<BsvMapCharacteristic, ParsedMapDiff[]> => {
const res = new Map<BsvMapCharacteristic, ParsedMapDiff[]>();
if(map.bsaverInfo?.versions[0]?.diffs){
map.bsaverInfo.versions[0].diffs.forEach(diff => {
const arr = res.get(diff.characteristic) || [];
const diffName = map.rawInfo._difficultyBeatmapSets.find(set => set._beatmapCharacteristicName === diff.characteristic)._difficultyBeatmaps.find(rawDiff => rawDiff._difficulty === diff.difficulty)?._customData?._difficultyLabel || diff.difficulty
arr.push({name: diffName, type: diff.difficulty, stars: diff.stars});
res.set(diff.characteristic, arr);
});
return res;
}
const heightObserver$ = new BehaviorSubject(0);
map.rawInfo._difficultyBeatmapSets.forEach(set => {
set._difficultyBeatmaps.forEach(diff => {
const arr = res.get(set._beatmapCharacteristicName) || [];
arr.push({name: diff._customData?._difficultyLabel || diff._difficulty, type: diff._difficulty, stars: null});
res.set(set._beatmapCharacteristicName, arr);
});
const observer = new ResizeObserver(() => {
updateItemPerRow(ref.current?.clientWidth || 0);
heightObserver$.next(ref.current?.clientHeight || 0)
});
return res;
observer.observe(ref.current);
const sub = heightObserver$.pipe(debounceTime(100)).subscribe(setListHeight);
return () => {
observer.disconnect();
sub.unsubscribe();
}
}, [isVisible, itemPerRow])
const loadMaps = () => {
setMaps(() => null);
loadPercent$.next(0);
const loadMapsObs$ = mapsManager.getMaps(version);
loadMapsObs$.pipe(map(progess => {
return Math.floor(((progess.loaded / progess.total) * 100));
})).subscribe(percent => loadPercent$.next(percent));
subs.push(loadMapsObs$.pipe(
last(),
mergeMap(async progress => {
if(os.isOffline){ return progress.maps; }
const maps = progress.maps;
const details = await bsaver.getMapDetailsFromHashs(maps.map(map => map.hash));
return maps.map(map => {
map.bsaverInfo = details.find(d => d.versions.at(0).hash === map.hash);
return map;
})
})
).subscribe({
next: maps => setMaps(() => maps),
complete: () => loadPercent$.next(0)
}));
}
const removeMapsFromList = (mapsToRemove: BsmLocalMap[]) => {
const filtredMaps = maps.filter(map => !mapsToRemove.some(toDeleteMaps => map.hash === toDeleteMaps.hash));
setMaps(() => filtredMaps);
};
const handleDelete = useCallback((map: BsmLocalMap) => {
mapsManager.deleteMaps([map], version).then(res => res && removeMapsFromList([map]));
}, [version, maps]);
const onMapSelected = useCallback((map: BsmLocalMap) => {
const maps = [...selectedMaps];
if(maps.some(selectedMap => selectedMap.hash === map.hash)){
const i = maps.findIndex(selectedMap => selectedMap.hash === map.hash);
maps.splice(i, 1);
const mapsCopy = [...selectedMaps$.value];
if(mapsCopy.some(selectedMap => selectedMap.hash === map.hash)){
const i = mapsCopy.findIndex(selectedMap => selectedMap.hash === map.hash);
mapsCopy.splice(i, 1);
}
else{
maps.push(map);
mapsCopy.push(map);
}
setSelectedMaps(() => maps);
}, [selectedMaps]);
selectedMaps$.next(mapsCopy);
}, [selectedMaps$.value]);
const isMapFitFilter = (map: BsmLocalMap): boolean => {
@@ -216,53 +276,59 @@ export const LocalMapsListPanel = forwardRef(({version, className, filter, searc
}
const renderMaps = (): JSX.Element[] => {
return maps.reduce((acc, current) => {
if(isMapFitFilter(current)){
acc.push(renderMapItem(current));
const preppedMaps: BsmLocalMap[][] = (() => {
if(!maps){ return []; }
const res: BsmLocalMap[][] = [];
let mapsRow: BsmLocalMap[] = []
for(const map of maps){
if(!isMapFitFilter(map)){ continue; }
if(mapsRow.length === itemPerRow){
res.push(mapsRow);
mapsRow = [];
}
return acc
}, []);
mapsRow.push(map);
}
if(mapsRow.length){
res.push(mapsRow);
}
return res;
})();
if(!maps){
return (
<div ref={ref} className={className}>
<div className="h-full flex flex-col items-center justify-center flex-wrap gap-1 text-gray-800 dark:text-gray-200">
<BsmImage className="w-32 h-32 spin-loading" image={BeatWaitingImg}/>
<span className="font-bold">{t("modals.download-maps.loading-maps")}</span>
<TextProgressBar value$={loadPercent$}/>
</div>
</div>
);
}
const renderMapItem = (map: BsmLocalMap) => {
return <MapItem
key={map.hash}
hash={map.hash}
title={map.rawInfo._songName}
coverUrl={map.coverUrl}
songUrl={map.songUrl}
autor={map.rawInfo._levelAuthorName}
songAutor={map.rawInfo._songAuthorName}
bpm={map.rawInfo._beatsPerMinute}
duration={map.bsaverInfo?.metadata?.duration}
selected={selectedMaps.some(_map => _map.hash === map.hash)}
diffs={extractMapDiffs(map)} mapId={map.bsaverInfo?.id} ranked={map.bsaverInfo?.ranked} autorId={map.bsaverInfo?.uploader?.id} likes={map.bsaverInfo?.stats?.upvotes} createdAt={map.bsaverInfo?.createdAt}
onDelete={handleDelete}
onSelected={onMapSelected}
callBackParam={map}
/>;
if(!maps.length){
return (
<div ref={ref} className={className}>
<div className="h-full flex flex-col items-center justify-center flex-wrap gap-1 text-gray-800 dark:text-gray-200">
<BsmImage className="h-32" image={BeatConflict}/>
<span className="font-bold">{t("pages.version-viewer.maps.tabs.maps.empty-maps.text")}</span>
<BsmButton className="font-bold rounded-md p-2" text="pages.version-viewer.maps.tabs.maps.empty-maps.button" typeColor="primary" withBar={false} onClick={e => {e.preventDefault(); mapsDownloader.openDownloadMapModal(version)}}/>
</div>
</div>
);
}
return (
<div ref={ref} className={className}>
<ul className="p-3 w-full grow flex flex-wrap justify-center content-start gap-2 overflow-y-scroll scrollbar-thin scrollbar-thumb-rounded-full scrollbar-thumb-neutral-900">
{maps?.length ? renderMaps() : (
maps === null ? (
<div className="h-full flex flex-col items-center justify-center flex-wrap gap-1">
<img className="w-32 h-32 spin-loading" src={BeatWaitingImg} alt=" "/>
<span className="font-bold">{t("modals.download-maps.loading-maps")}</span>
</div>
) : (
<div className="h-full flex flex-col items-center justify-center flex-wrap gap-1">
<BsmImage className="h-32" image={BeatConflict}/>
<span className="font-bold">{t("pages.version-viewer.maps.tabs.maps.empty-maps.text")}</span>
<BsmButton className="font-bold rounded-md p-2" text="pages.version-viewer.maps.tabs.maps.empty-maps.button" typeColor="primary" withBar={false} onClick={e => {e.preventDefault(); mapsDownloader.openDownloadMapModal(version)}}/>
</div>
)
)}
</ul>
<VariableSizeList className="p-0 scrollbar-thin scrollbar-thumb-rounded-full scrollbar-thumb-neutral-900" width={"100%"} height={listHeight} itemSize={() => 108} itemCount={preppedMaps.length} itemData={preppedMaps} layout="vertical" style={{scrollbarGutter: "stable both-edges"}} itemKey={(i, data) => data[i].map(map => map.hash).join()}>
{(props) => <MapsRow maps={props.data[props.index]} style={props.style} selectedMaps$={selectedMaps$} onMapSelect={onMapSelected} onMapDelete={handleDelete}/>}
</VariableSizeList>
</div>
)
})
@@ -93,7 +93,12 @@ export const MapItem = memo(({hash, title, autor, songAutor, coverUrl, songUrl,
return diffLabel;
}
const openPreview = () => linkOpener.open(previewUrl, true);
const openPreview = () => {
if(audioPlayer.playing){
audioPlayer.pause();
}
linkOpener.open(previewUrl, true);
}
const copyBsr = () => navigator.clipboard.writeText(`!bsr ${mapId}`);
const toogleMusic = () => {
if(songPlaying){
@@ -148,7 +153,7 @@ export const MapItem = memo(({hash, title, autor, songAutor, coverUrl, songUrl,
}
return (
<motion.li className="relative h-[100px] min-w-[370px] shrink-0 grow basis-0 text-white group cursor-pointer" onHoverStart={() => setHovered(true)} onHoverEnd={() => setHovered(false)} style={{zIndex: hovered && 5, transform: "translateZ(0) scale(1.0, 1.0)", backfaceVisibility: "hidden"}}>
<motion.li className="relative h-[100px] w-[400px] min-w-[370px] shrink-0 grow basis-0 text-white group cursor-pointer" onHoverStart={() => setHovered(true)} onHoverEnd={() => setHovered(false)} style={{zIndex: hovered && 5, transform: "translateZ(0) scale(1.0, 1.0)", backfaceVisibility: "hidden"}}>
<GlowEffect visible={hovered || selected && !!onSelected}/>
<AnimatePresence>
{(diffsPanelHovered || bottomBarHovered) && (
@@ -225,19 +230,15 @@ export const MapItem = memo(({hash, title, autor, songAutor, coverUrl, songUrl,
<span className="absolute w-[10px] h-[10px] bottom-0 right-full bg-inherit" style={{clipPath: 'path("M11 11 L11 0 L10 0 A10 10 0 0 1 0 10 L 0 11 Z")'}}/>
<div className="flex flex-col justify-center items-center gap-1 w-full h-full overflow-hidden opacity-0 group-hover:opacity-100">
{onDelete && !downloading && <BsmButton className="w-6 h-6 p-[2px] rounded-md !bg-inherit hover:!bg-light-main-color-2 hover:dark:!bg-main-color-2" iconClassName="w-full h-full brightness-200" iconColor={color} icon="trash" withBar={false} onClick={e => {e.stopPropagation(); onDelete(callBackParam)}}/>}
{onDownload && !downloading && <BsmButton className="w-6 h-6 p-[2px] rounded-md !bg-inherit hover:!bg-light-main-color-2 hover:dark:!bg-main-color-2" iconClassName="w-full h-full brightness-200" iconColor={color} icon="download" withBar={false} onClick={e => {e.stopPropagation(); onDownload(callBackParam)}}/>}
{onCancelDownload && !downloading && <BsmButton className="w-6 h-6 p-1 rounded-md !bg-inherit hover:!bg-light-main-color-2 hover:dark:!bg-main-color-2" iconClassName="w-full h-full brightness-200" iconColor="red" icon="cross" withBar={false} onClick={e => {e.stopPropagation(); onCancelDownload(callBackParam)}}/>}
{downloading && <BsmBasicSpinner className="w-6 h-6 p-1 rounded-md !bg-inherit hover:!bg-light-main-color-2 hover:dark:!bg-main-color-2 flex items-center justify-center" spinnerClassName="brightness-200" style={{color}} thikness="3px"/>}
{previewUrl && <BsmButton className="w-6 h-6 p-[2px] rounded-md !bg-inherit hover:!bg-light-main-color-2 hover:dark:!bg-main-color-2" iconClassName="w-full h-full brightness-200" iconColor={color} icon="eye" withBar={false} onClick={e => {e.stopPropagation(); openPreview()}}/>}
{mapId && <BsmButton className="w-6 h-6 p-1 rounded-md !bg-inherit hover:!bg-light-main-color-2 hover:dark:!bg-main-color-2" iconClassName="w-full h-full brightness-200" iconColor={color} icon="twitch" withBar={false} onClick={e => {e.stopPropagation(); copyBsr()}}/>}
{onDelete && !downloading && <BsmButton className="w-6 h-6 p-[2px] rounded-md !bg-inherit hover:!bg-light-main-color-2 hover:dark:!bg-main-color-2" iconClassName="w-full h-full brightness-75 dark:brightness-200" iconColor={color} icon="trash" withBar={false} onClick={e => {e.stopPropagation(); onDelete(callBackParam)}}/>}
{onDownload && !downloading && <BsmButton className="w-6 h-6 p-[2px] rounded-md !bg-inherit hover:!bg-light-main-color-2 hover:dark:!bg-main-color-2" iconClassName="w-full h-full brightness-75 dark:brightness-200" iconColor={color} icon="download" withBar={false} onClick={e => {e.stopPropagation(); onDownload(callBackParam)}}/>}
{onCancelDownload && !downloading && <BsmButton className="w-6 h-6 p-1 rounded-md !bg-inherit hover:!bg-light-main-color-2 hover:dark:!bg-main-color-2" iconClassName="w-full h-full brightness-75 dark:brightness-200" iconColor="red" icon="cross" withBar={false} onClick={e => {e.stopPropagation(); onCancelDownload(callBackParam)}}/>}
{downloading && <BsmBasicSpinner className="w-6 h-6 p-1 rounded-md !bg-inherit hover:!bg-light-main-color-2 hover:dark:!bg-main-color-2 flex items-center justify-center" spinnerClassName="brightness-75 dark:brightness-200" style={{color}} thikness="3px"/>}
{previewUrl && <BsmButton className="w-6 h-6 p-[2px] rounded-md !bg-inherit hover:!bg-light-main-color-2 hover:dark:!bg-main-color-2" iconClassName="w-full h-full brightness-75 dark:brightness-200" iconColor={color} icon="eye" withBar={false} onClick={e => {e.stopPropagation(); openPreview()}}/>}
{mapId && <BsmButton className="w-6 h-6 p-1 rounded-md !bg-inherit hover:!bg-light-main-color-2 hover:dark:!bg-main-color-2" iconClassName="w-full h-full brightness-75 dark:brightness-200" iconColor={color} icon="twitch" withBar={false} onClick={e => {e.stopPropagation(); copyBsr()}}/>}
</div>
</div>
</div>
</motion.li>
)
}, areEqual)
function areEqual(prevProps: MapItemProps, nextProps: MapItemProps): boolean {
return equal(prevProps, nextProps);
}
}, equal);
@@ -59,7 +59,7 @@ export function MapsPlaylistsPanel({version}: Props) {
}
const handleMapsAddClick = () => {
mapsDownloader.openDownloadMapModal(version);
mapsDownloader.openDownloadMapModal(version, mapsRef.current.getMaps?.());
}
const renderTab = (props: DetailedHTMLProps<React.HTMLAttributes<HTMLLIElement>, HTMLLIElement>, text: string, index: number): JSX.Element => {
@@ -131,7 +131,7 @@ export function MapsPlaylistsPanel({version}: Props) {
<TabNavBar className="!rounded-none shadow-sm" tabIndex={tabIndex} tabsText={["misc.maps", "misc.playlists"]} onTabChange={setTabIndex} renderTab={renderTab}/>
<div className="w-full grow min-h-0 flex flex-row items-center transition-transform duration-300" style={{transform: `translate(${-(tabIndex * 100)}%, 0)`}}>
<LocalMapsListPanel ref={mapsRef} className="w-full h-full shrink-0 flex flex-col" version={version} filter={mapFilter} search={mapSearch}/>
<div className="w-full h-full shrink-0 flex flex-col justify-center items-center content-center gap-2 overflow-hidden">
<div className="w-full h-full shrink-0 flex flex-col justify-center items-center content-center gap-2 overflow-hidden text-gray-800 dark:text-gray-200">
<BsmImage className="rounded-md" image={wipGif}/>
<span>Coming soon</span>
</div>
@@ -0,0 +1,73 @@
import { CSSProperties, memo } from "react"
import { useObservable } from "renderer/hooks/use-observable.hook"
import { distinctUntilChanged, map } from "rxjs/operators"
import { BehaviorSubject } from "rxjs"
import { BsvMapCharacteristic } from "shared/models/maps/beat-saver.model"
import { BsmLocalMap } from "shared/models/maps/bsm-local-map.interface"
import { ParsedMapDiff, MapItem } from "./map-item.component"
import equal from "fast-deep-equal/es6"
type Props = {
maps: BsmLocalMap[],
style?: CSSProperties,
onMapDelete: (map: BsmLocalMap) => void,
onMapSelect: (map: BsmLocalMap) => void,
selectedMaps$: BehaviorSubject<BsmLocalMap[]>
}
export const MapsRow = memo(({maps, style, selectedMaps$, onMapSelect, onMapDelete}: Props) => {
const selectedMaps = useObservable<BsmLocalMap[]>(selectedMaps$.pipe(
map(selectedMaps => selectedMaps.filter(selected => maps.some(map => map.hash === selected.hash))),
distinctUntilChanged(equal)
), []);
const extractMapDiffs = (map: BsmLocalMap): Map<BsvMapCharacteristic, ParsedMapDiff[]> => {
const res = new Map<BsvMapCharacteristic, ParsedMapDiff[]>();
if(map.bsaverInfo?.versions[0]?.diffs){
map.bsaverInfo.versions[0].diffs.forEach(diff => {
const arr = res.get(diff.characteristic) || [];
const diffName = map.rawInfo._difficultyBeatmapSets.find(set => set._beatmapCharacteristicName === diff.characteristic)._difficultyBeatmaps.find(rawDiff => rawDiff._difficulty === diff.difficulty)?._customData?._difficultyLabel || diff.difficulty
arr.push({name: diffName, type: diff.difficulty, stars: diff.stars});
res.set(diff.characteristic, arr);
});
return res;
}
map.rawInfo._difficultyBeatmapSets.forEach(set => {
set._difficultyBeatmaps.forEach(diff => {
const arr = res.get(set._beatmapCharacteristicName) || [];
arr.push({name: diff._customData?._difficultyLabel || diff._difficulty, type: diff._difficulty, stars: null});
res.set(set._beatmapCharacteristicName, arr);
});
});
return res;
}
const renderMapItem = (map: BsmLocalMap) => {
return <MapItem
key={map.hash}
hash={map.hash}
title={map.rawInfo._songName}
coverUrl={map.coverUrl}
songUrl={map.songUrl}
autor={map.rawInfo._levelAuthorName}
songAutor={map.rawInfo._songAuthorName}
bpm={map.rawInfo._beatsPerMinute}
duration={map.bsaverInfo?.metadata?.duration}
selected={selectedMaps.some(selected => selected.hash === map.hash)}
diffs={extractMapDiffs(map)} mapId={map.bsaverInfo?.id} ranked={map.bsaverInfo?.ranked} autorId={map.bsaverInfo?.uploader?.id} likes={map.bsaverInfo?.stats?.upvotes} createdAt={map.bsaverInfo?.createdAt}
onDelete={onMapDelete}
onSelected={onMapSelect}
callBackParam={map}
/>;
}
return (
<ul className="h-fit w-full flex flex-nowrap basis-0 gap-x-[8px] py-1 px-3" style={style}>
{maps && maps.map(renderMapItem)}
</ul>
)
}, equal);
@@ -19,11 +19,11 @@ import equal from "fast-deep-equal/es6";
import { ProgressBarService } from "renderer/services/progress-bar.service";
import { useTranslation } from "renderer/hooks/use-translation.hook";
import { OsDiagnosticService } from "renderer/services/os-diagnostic.service";
import { BsmLocalMap } from "shared/models/maps/bsm-local-map.interface";
export const DownloadMapsModal: ModalComponent<void, BSVersion> = ({data}) => {
export const DownloadMapsModal: ModalComponent<void, {version: BSVersion, ownedMaps: BsmLocalMap[]}> = ({resolver, data: { ownedMaps, version }}) => {
const beatSaver = BeatSaverService.getInstance();
const mapsManager = MapsManagerService.getInstance();
const mapsDownloader = MapsDownloaderService.getInstance();
const progressBar = ProgressBarService.getInstance();
const os = OsDiagnosticService.getInstance();
@@ -36,7 +36,7 @@ export const DownloadMapsModal: ModalComponent<void, BSVersion> = ({data}) => {
const [query, setQuery] = useState("");
const [maps, setMaps] = useState<BsvMapDetail[]>([]);
const [sortOrder, setSortOrder] = useState<SearchOrder>(BSV_SORT_ORDER.at(0));
const [ownedMapHashs, setOwnedMapHashs] = useState<string[]>([]);
const [ownedMapHashs, setOwnedMapHashs] = useState<string[]>(ownedMaps?.map(map => map.hash) ?? []);
const [loading, setLoading] = useState(false);
const isOnline = useObservable(os.isOnline$);
const [searchParams, setSearchParams] = useState<SearchParams>({
@@ -58,13 +58,12 @@ export const DownloadMapsModal: ModalComponent<void, BSVersion> = ({data}) => {
useEffect(() => {
mapsManager.getMaps(data, false).toPromise().then(maps => setOwnedMapHashs(maps.map(map => map.hash)));
const onMapDownloaded = (map: BsvMapDetail, verion: BSVersion) => {
if(!equal(verion, data) || !map?.versions){ return; }
const downloadedHash = map.versions.at(0).hash;
const onMapDownloaded = (map: BsmLocalMap, targerVersion: BSVersion) => {
if(!equal(targerVersion, version)){ return; }
const downloadedHash = map.hash;
setOwnedMapHashs((prev) => [...prev, downloadedHash]);
}
mapsDownloader.addOnMapDownloadedListener(onMapDownloaded);
if(mapsDownloader.isDownloading){
@@ -72,7 +71,7 @@ export const DownloadMapsModal: ModalComponent<void, BSVersion> = ({data}) => {
}
return () => {
mapsDownloader.removeOnMapDownloadedListene(onMapDownloaded);
mapsDownloader.removeOnMapDownloadedListener(onMapDownloaded);
progressBar.setStyle(null);
}
}, [])
@@ -99,7 +98,7 @@ export const DownloadMapsModal: ModalComponent<void, BSVersion> = ({data}) => {
const isMapOwned = map.versions.some(version => ownedMapHashs.includes(version.hash));
const isDownloading = map.id === currentDownload?.map?.id;
const inQueue = mapsInQueue.some(toDownload => equal(toDownload.version, data) && toDownload.map.id === map.id);
const inQueue = mapsInQueue.some(toDownload => equal(toDownload.version, version) && toDownload.map.id === map.id);
return (
<MapItem
@@ -129,11 +128,11 @@ export const DownloadMapsModal: ModalComponent<void, BSVersion> = ({data}) => {
}
const handleDownloadMap = useCallback((map: BsvMapDetail) => {
mapsDownloader.addMapToDownload({map, version: data})
mapsDownloader.addMapToDownload({map, version})
}, []);
const handleCancelDownload = useCallback((map: BsvMapDetail) => {
mapsDownloader.removeMapToDownload({map, version: data});
mapsDownloader.removeMapToDownload({map, version});
}, []);
const handleSortChange = (newSort: string) => {
@@ -170,7 +169,7 @@ export const DownloadMapsModal: ModalComponent<void, BSVersion> = ({data}) => {
<BsmButton className="shrink-0 rounded-full py-1 px-3 !bg-light-main-color-1 dark:!bg-main-color-1 flex justify-center items-center capitalize" icon="search" text="modals.download-maps.search-btn" withBar={false} onClick={e => {e.preventDefault(); handleSearch()}}/>
<BsmSelect className="bg-light-main-color-1 dark:bg-main-color-1 rounded-full px-1 pb-0.5 text-center" options={sortOptions} onChange={handleSortChange}/>
</div>
<ul className="w-full grow flex content-start flex-wrap gap-2 px-2 overflow-y-scroll overflow-x-hidden scrollbar-thin scrollbar-thumb-rounded-full scrollbar-thumb-neutral-900 z-0" >
<ul className="w-full grow flex content-start flex-wrap gap-2 pt-1.5 px-2 overflow-y-scroll overflow-x-hidden scrollbar-thin scrollbar-thumb-rounded-full scrollbar-thumb-neutral-900 z-0" >
{maps.length === 0 ? (
<div className="w-full h-full flex flex-col items-center justify-center">
<img className={`w-32 h-32 ${loading && "spin-loading"}`} src={loading ? BeatWaitingImg : BeatConflictImg} alt=" "/>
@@ -2,14 +2,17 @@ import { useState } from "react";
import { BsmButton } from "renderer/components/shared/bsm-button.component";
import { BsmImage } from "renderer/components/shared/bsm-image.component";
import { useTranslation } from "renderer/hooks/use-translation.hook";
import { ModalComponent, ModalExitCode } from "renderer/services/modale.service";
import { ModalComponent, ModalExitCode, ModalService } from "renderer/services/modale.service";
import BeatImpatient from '../../../../../assets/images/apngs/beat-impatient.png'
import { WhyCredentialsModal } from "./why-credentials-modal.component";
export const LoginModal: ModalComponent<{username: string, password: string, stay: boolean}> = ({resolver}) => {
const modal = ModalService.getInsance();
const [username, setUsername] = useState('');
const [password, setPassword] = useState('');
const [stay, setStay] = useState(true);
const [stay, setStay] = useState(false);
const t = useTranslation();
const loggin = () => {
@@ -17,10 +20,15 @@ export const LoginModal: ModalComponent<{username: string, password: string, sta
resolver({exitCode: ModalExitCode.COMPLETED, data:{username, password, stay}});
}
const whyCredentials = () => {
modal.openModal(WhyCredentialsModal);
}
return (
<form onSubmit={(e) => {e.preventDefault(); loggin();}}>
<h1 className="text-3xl uppercase tracking-wide w-full text-center text-gray-800 dark:text-gray-200">{t("modals.steam-login.title")}</h1>
<BsmImage className="mx-auto h-20" image={BeatImpatient} />
<div className="mb-2">
<label className="block font-bold cursor-pointer tracking-wide text-gray-800 dark:text-gray-200" htmlFor="username">{t("modals.steam-login.inputs.username.label")}</label>
<input className="w-full bg-light-main-color-1 dark:bg-main-color-1 px-1 py-[2px] rounded-md outline-none" onChange={e => setUsername(e.target.value)} value={username} type="text" name="username" id="username" placeholder={t("modals.steam-login.inputs.username.placeholder")}/>
@@ -29,10 +37,9 @@ export const LoginModal: ModalComponent<{username: string, password: string, sta
<label className="block font-bold cursor-pointer tracking-wide text-gray-800 dark:text-gray-200" htmlFor="password">{t("modals.steam-login.inputs.password.label")}</label>
<input className="w-full bg-light-main-color-1 dark:bg-main-color-1 px-1 py-[2px] rounded-md outline-none" onChange={e => setPassword(e.target.value)} value={password} type="password" name="password" id="password" placeholder={t("modals.steam-login.inputs.password.placeholder")}/>
</div>
<div className="flex items-center content-center justify-start mb-3">
<input onChange={e => setStay(e.target.checked)} checked={stay} className="mr-1" type="checkbox" name="stay" id="stay" />
<label className="cursor-pointer text-gray-800 dark:text-gray-200" htmlFor="stay">{t("modals.steam-login.inputs.stay.label")}</label>
</div>
<span onClick={whyCredentials} className="underline my-4 block cursor-pointer">{t("modals.steam-login.why-credentials")}</span>
<div className="grid grid-flow-col grid-cols-2 gap-4">
<BsmButton typeColor="cancel" className="rounded-md text-center transition-all" onClick={() => {resolver({exitCode: ModalExitCode.CANCELED})}} withBar={false} text="misc.cancel"/>
<BsmButton typeColor="primary" className="rounded-md text-center transition-all" type="submit" withBar={false} text="modals.steam-login.buttons.submit"/>
@@ -0,0 +1,26 @@
import { BsmButton } from "renderer/components/shared/bsm-button.component";
import { useTranslation } from "renderer/hooks/use-translation.hook";
import { LinkOpenerService } from "renderer/services/link-opener.service";
import { ModalComponent, ModalExitCode } from "renderer/services/modale.service"
export const WhyCredentialsModal: ModalComponent<void> = ({resolver}) => {
const t = useTranslation();
const linkOpener = LinkOpenerService.getInstance();
const openTutorial = () => {
linkOpener.open("https://steamcommunity.com/sharedfiles/filedetails/?id=1805934840");
}
return (
<form className="w-min">
<h1 className="text-3xl mb-2 uppercase tracking-wide w-full text-center text-gray-800 dark:text-gray-200">{t("modals.steam-credentials.title")}</h1>
<p>{t("modals.steam-credentials.p-1")}</p>
<a onClick={e => {e.preventDefault; openTutorial()}} className="underline text-blue-600 hover:text-blue-900 dark:text-blue-400 dark:hover:text-blue-600 mb-2 block cursor-pointer">
https://steamcommunity.com/sharedfiles/filedetails/?id=1805934840
</a>
<p>{t("modals.steam-credentials.p-2")}</p>
</form>
)
}
@@ -38,7 +38,7 @@ export function Modal() {
return (
<AnimatePresence>
{ModalComponent && (
{ModalComponent && resolver && (
<div className="top-0 absolute w-screen h-screen flex content-center items-center justify-center z-[90]">
<motion.span key="modal-overlay" onClick={() => modalSevice.resolve({exitCode: ModalExitCode.NO_CHOICE})} className="absolute top-0 bottom-0 right-0 left-0 bg-black" initial={{opacity: 0}} animate={{opacity: ModalComponent && .60}} exit={{opacity: 0}} transition={{duration: .2}}/>
<motion.div key="modal" initial={{y: "100vh"}} animate={{y: 0}} exit={{y: "100vh"}}>
@@ -26,8 +26,8 @@ export function NavBar() {
<nav id='nav-bar' className='z-10 flex flex-col h-full max-h-full items-center p-1 bg-light-main-color-1 dark:bg-main-color-1'>
<BsManagerIcon className='relative aspect-square w-16 h-16 mb-3'/>
<ol id='versions' className='w-fit max-w-[120px] relative left-[2px] grow overflow-y-hidden scrollbar-track-transparent scrollbar-thin scrollbar-thumb-rounded-full scrollbar-thumb-neutral-900 hover:overflow-y-scroll'>
<MapsNavBarItem/>
<NavBarSpliter/>
<MapsNavBarItem/>
<NavBarSpliter/>
{installedVersions && installedVersions.map((version) => <BsVersionItem key={JSON.stringify(version)} version={version}/>)}
</ol>
<NavBarSpliter/>
@@ -0,0 +1,20 @@
import { CSSProperties } from "react";
import { useObservable } from "renderer/hooks/use-observable.hook";
import { Observable } from "rxjs"
type Props = {
value$: Observable<number|string>,
className?: string,
style?: CSSProperties
}
export default function TextProgressBar({value$, className, style}: Props) {
const value = useObservable(value$);
const prefix = typeof value === "number" ? "%" : "";
return (
<span className={className} style={style}>{`${value}${prefix}`}</span>
)
}
@@ -1,5 +1,5 @@
import { BsmIcon, BsmIconType } from "../svgs/bsm-icon.component"
import { useRef, CSSProperties } from "react";
import { useRef, CSSProperties, MouseEvent } from "react";
import { BsmImage } from "./bsm-image.component";
import { useTranslation } from "renderer/hooks/use-translation.hook";
import { useClickOutside } from "renderer/hooks/use-click-outside.hook";
@@ -45,15 +45,17 @@ export function BsmButton({className, style, imgClassName, iconClassName, icon,
const renderTypeColor = (() => {
if(typeColor === "primary"){ return ""; }
if(!typeColor){ return `bg-light-main-color-2 dark:bg-main-color-2 ${!withBar && "hover:brightness-125"}`; }
if(!typeColor){ return `bg-light-main-color-2 dark:bg-main-color-2 ${(!withBar && !disabled) && "hover:brightness-125"}`; }
if(typeColor === "cancel"){ return "bg-gray-500"; }
if(typeColor === "error"){ return "bg-red-500"; }
if(typeColor === "success"){ return "bg-green-500"; }
return "";
})();
const handleClick = (e: MouseEvent) => !disabled && onClick?.(e);
return (
<div ref={ref} onClick={onClick} title={t(title)} className={`${className} overflow-hidden cursor-pointer group ${(!withBar && !disabled && (!!typeColor || !!color)) && "hover:brightness-[1.15]"} ${disabled && "brightness-75 cursor-not-allowed"} ${renderTypeColor}`} style={{...style, backgroundColor: primaryColor || color}}>
<div ref={ref} onClick={handleClick} title={t(title)} className={`${className} overflow-hidden cursor-pointer group ${(!withBar && !disabled && (!!typeColor || !!color)) && "hover:brightness-[1.15]"} ${disabled && "brightness-75 cursor-not-allowed"} ${renderTypeColor}`} style={{...style, backgroundColor: primaryColor || color}}>
{ image && <BsmImage image={image} className={imgClassName}/> }
{ icon && <BsmIcon icon={icon} className={iconClassName ?? "h-full w-full text-gray-800 dark:text-white"} style={{color: iconColor}}/> }
{text && (type === "submit" ? <button type="submit" className={textClassName || "h-full w-full"} style={{...(!!textColor && {color: textColor})}}>{t(text)}</button> : <span className={textClassName} style={{...(!!textColor && {color: `${textColor}`})}}>{t(text)}</span>)}
@@ -37,6 +37,6 @@ export const BsmImage = forwardRef(({className, image, errorImage, placeholder,
return (
// @ts-ignore
<img ref={ref} title={title} className={className} src={image} loading={loading} onLoad={handleLoaded} onError={handleError} style={styles} onClick={(e) => onClick?.(e)} alt=" "/>
<img ref={ref} title={title} className={className} src={image} loading={loading} onLoad={handleLoaded} onError={handleError} style={styles} onClick={(e) => onClick?.(e)} alt=" " decoding="async"/>
)
})
@@ -11,9 +11,10 @@ type Props = {
max: number,
step?: number,
renderLabel?: (value: number) => JSX.Element,
colors?: string[]
}
export function BsmRange({colorType = "first-color", values, onChange, onFinalChange, min, max, renderLabel, step = 1} : Props) {
export function BsmRange({colorType = "first-color", values, onChange, onFinalChange, min, max, renderLabel, step = 1, colors} : Props) {
const color = useThemeColor(colorType);
const labelTextColor = getCorrectTextColor(color);
@@ -35,10 +36,10 @@ export function BsmRange({colorType = "first-color", values, onChange, onFinalCh
style={{
...props.style,
background: getTrackBackground({
values: values,
colors: ["#ccc", color, "#ccc"],
min: min,
max: max
values,
colors: colors ?? ["#ccc", color, "#ccc"],
min,
max
}),
}}
>
@@ -48,11 +48,14 @@ import { TwitterIcon } from "./icons/twitter-icon.component";
import { Mee6Icon } from "./icons/mee6-icon.component";
import { InfoIcon } from "./icons/info-icon.component";
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";
export type BsmIconType = BsvMapCharacteristic | (
"settings"|"trash"|"favorite"|"folder"|"bsNote"|"check"|"three-dots"|"twitch"|"eye"|"play"|"checkCircleIcon"|"discord"|"info"|
"terminal"|"desktop"|"oculus"|"add"|"cross"|"task"|"github"|"close"|"thumbUpFill"|"timerFill"|"pause"|"twitter"|"sync"|
"copy"|"steam"|"edit"|"export"|"patreon"|"search"|"bsMapDifficulty"|"link"|"unlink"|"download"|"filter"|"mee6"|
"copy"|"steam"|"edit"|"export"|"patreon"|"search"|"bsMapDifficulty"|"link"|"unlink"|"download"|"filter"|"mee6"|"volume-up"|"volume-off"|"volume-down"|
"fr-FR-flag"|"es-ES-flag"|"en-US-flag"|"en-EN-flag"
);
@@ -107,6 +110,9 @@ export const BsmIcon = memo(({className, icon, style}: {className?: string, icon
if(icon === "mee6"){ return <Mee6Icon className={className} style={style}/> }
if(icon === "info"){ return <InfoIcon className={className} style={style}/> }
if(icon === "sync"){ return <SyncIcon className={className} style={style}/> }
if(icon === "volume-up"){ return <VolumeUpIcon className={className} style={style}/> }
if(icon === "volume-down"){ return <VolumeDownIcon className={className} style={style}/> }
if(icon === "volume-off"){ return <VolumeOffIcon className={className} style={style}/> }
return <TrashIcon className={className} style={style}/>
}
@@ -4,7 +4,7 @@ export function TwitterIcon(props: {className?: string, style?: CSSProperties})
return (
<svg className={props.className} style={props.style} viewBox="0 0 24 24" fill="currentColor">
<g>
<path d="M23.643 4.937c-.835.37-1.732.62-2.675.733.962-.576 1.7-1.49 2.048-2.578-.9.534-1.897.922-2.958 1.13-.85-.904-2.06-1.47-3.4-1.47-2.572 0-4.658 2.086-4.658 4.66 0 .364.042.718.12 1.06-3.873-.195-7.304-2.05-9.602-4.868-.4.69-.63 1.49-.63 2.342 0 1.616.823 3.043 2.072 3.878-.764-.025-1.482-.234-2.11-.583v.06c0 2.257 1.605 4.14 3.737 4.568-.392.106-.803.162-1.227.162-.3 0-.593-.028-.877-.082.593 1.85 2.313 3.198 4.352 3.234-1.595 1.25-3.604 1.995-5.786 1.995-.376 0-.747-.022-1.112-.065 2.062 1.323 4.51 2.093 7.14 2.093 8.57 0 13.255-7.098 13.255-13.254 0-.2-.005-.402-.014-.602.91-.658 1.7-1.477 2.323-2.41z"></path>
<path d="M23.643 4.937c-.835.37-1.732.62-2.675.733.962-.576 1.7-1.49 2.048-2.578-.9.534-1.897.922-2.958 1.13-.85-.904-2.06-1.47-3.4-1.47-2.572 0-4.658 2.086-4.658 4.66 0 .364.042.718.12 1.06-3.873-.195-7.304-2.05-9.602-4.868-.4.69-.63 1.49-.63 2.342 0 1.616.823 3.043 2.072 3.878-.764-.025-1.482-.234-2.11-.583v.06c0 2.257 1.605 4.14 3.737 4.568-.392.106-.803.162-1.227.162-.3 0-.593-.028-.877-.082.593 1.85 2.313 3.198 4.352 3.234-1.595 1.25-3.604 1.995-5.786 1.995-.376 0-.747-.022-1.112-.065 2.062 1.323 4.51 2.093 7.14 2.093 8.57 0 13.255-7.098 13.255-13.254 0-.2-.005-.402-.014-.602.91-.658 1.7-1.477 2.323-2.41z"/>
</g>
</svg>
)
@@ -0,0 +1,9 @@
import { CSSProperties } from "react";
export function VolumeDownIcon(props: {className?: string, style?: CSSProperties}) {
return (
<svg className={props.className} style={props.style} xmlns="http://www.w3.org/2000/svg" viewBox="0 96 960 960" fill="currentColor">
<path d="M251.283 675.999q-13.564 0-22.423-8.859-8.859-8.859-8.859-22.423V507.283q0-13.564 8.859-22.423 8.859-8.859 22.423-8.859h117.179L486.794 357.67q14.769-14.769 33.987-6.91 19.218 7.858 19.218 28.781v392.661q0 21.18-19.218 29.038-19.218 7.859-33.987-6.91L368.462 675.999H251.283Zm374.358 49.949V424.463q43.05 19.102 68.704 60.551 25.654 41.448 25.654 90.986 0 50.205-25.654 90.525-25.654 40.32-68.704 59.423ZM489.744 429.436l-99.129 96.82H270.256v99.488h120.359l99.129 97.23V429.436ZM378.923 576Z"/>
</svg>
)
}
@@ -0,0 +1,9 @@
import { CSSProperties } from "react";
export function VolumeOffIcon(props: {className?: string, style?: CSSProperties}) {
return (
<svg className={props.className} style={props.style} xmlns="http://www.w3.org/2000/svg" viewBox="0 96 960 960" fill="currentColor">
<path d="M770.974 963.435 663.179 855.64q-15.436 9.948-31.423 18.512-15.987 8.564-33.244 15-12.845 4.846-23.909-3.397-11.064-8.243-11.064-22.756 0-6.82 4.013-12.064 4.012-5.243 10.243-7.397 12.872-4.487 25.436-10.41t24-13.692L468.153 659.948v112.254q0 21.18-19.218 29.038-19.217 7.859-33.986-6.91L296.617 675.999H179.438q-13.564 0-22.423-8.859-8.859-8.859-8.859-22.423V507.283q0-13.564 8.859-22.423 8.859-8.859 22.423-8.859H283.54L94.155 286.36q-7.23-7.231-7.218-17.705.013-10.474 7.628-18.089 7.616-7.359 17.692-7.359 10.077 0 17.692 7.359l677.485 677.075q7.231 7.231 7.295 17.705.064 10.474-7.295 18.089-7.615 7.615-18.23 7.615t-18.23-7.615ZM598.512 260.591q97.769 38.231 157.551 123.423Q815.845 469.206 815.845 575q0 51.795-15.449 100.09t-44.398 90.217l-35.819-35.819q22.59-34.026 34-73.193Q765.59 617.129 765.59 575q0-91.743-51.308-165.628-51.308-73.885-136.487-103.321-6.82-2.153-10.538-7.692-3.718-5.538-3.718-12.358 0-14.051 11.269-22.025 11.269-7.974 23.704-3.385ZM376.257 568.718Zm257.28 74.129-69.998-69.999V427.847q40.461 22 62.538 61.961Q648.153 529.77 648.153 576q0 17.693-3.654 34.5-3.654 16.808-10.962 32.347ZM468.153 477.463l-86.306-86.692 33.102-33.101q14.769-14.769 33.986-6.782 19.218 7.987 19.218 28.653v97.922Zm-50.255 247.819V610.359l-84.103-84.103H198.411v99.488H318.36l99.538 99.538Z"/>
</svg>
)
}
@@ -0,0 +1,9 @@
import { CSSProperties } from "react";
export function VolumeUpIcon(props: {className?: string, style?: CSSProperties}) {
return (
<svg className={props.className} style={props.style} xmlns="http://www.w3.org/2000/svg" viewBox="0 96 960 960" fill="currentColor">
<path d="M596.512 889.152q-12.846 4.846-23.91-3.416-11.063-8.263-11.063-22.794 0-6.763 4.012-12.007 4.013-5.243 10.244-7.397 84.769-32 136.282-104.936Q763.589 665.667 763.589 575t-51.512-163.808q-51.513-73.141-136.282-104.73-6.821-2.154-10.539-7.965-3.717-5.812-3.717-12.587 0-13.96 11.268-21.934 11.269-7.974 23.705-3.385 97.64 38.231 157.486 123.339 59.846 85.107 59.846 191.07t-59.846 191.07q-59.846 85.108-157.486 123.082ZM177.438 675.999q-13.468 0-22.375-8.907t-8.907-22.375V507.283q0-13.468 8.907-22.375t22.375-8.907h117.178L412.948 357.67q14.769-14.769 33.987-6.722 19.218 8.047 19.218 28.593v392.661q0 20.803-19.218 28.85t-33.987-6.722L294.616 675.999H177.438Zm374.357 49.949V424.463q43.051 19.102 68.704 60.551 25.654 41.448 25.654 90.986 0 50.205-25.654 90.525-25.653 40.32-68.704 59.423ZM415.898 429.436l-99.128 96.82H196.411v99.488H316.77l99.128 97.23V429.436ZM318.872 576Z"/>
</svg>
)
}
@@ -1,37 +1,54 @@
import { useState } from 'react';
import { useObservable } from 'renderer/hooks/use-observable.hook';
import { useThemeColor } from 'renderer/hooks/use-theme-color.hook';
import { AudioPlayerService } from 'renderer/services/audio-player.service';
import { IpcService } from 'renderer/services/ipc.service';
import { WindowManagerService } from 'renderer/services/window-manager.service';
import { AppWindow } from 'shared/models/window-manager/app-window.model';
import { BsmButton } from '../shared/bsm-button.component';
import { BsmRange } from '../shared/bsm-range.component';
import { BsmIconType } from '../svgs/bsm-icon.component';
import './title-bar.component.css'
export default function TitleBar({template = "index.html"} : {template: AppWindow}) {
const ipcService = IpcService.getInstance();
const windows = WindowManagerService.getInstance();
const ipcService = IpcService.getInstance();
const windows = WindowManagerService.getInstance();
const audio = AudioPlayerService.getInstance();
const [maximized, setMaximized] = useState(false);
const volume = useObservable(audio.volume$, audio.volume);
const playing = useObservable(audio.playing$);
const color = useThemeColor("first-color");
const closeWindow = () => {
return windows.close(template);
const [maximized, setMaximized] = useState(false);
const closeWindow = () => {
return windows.close(template);
}
const maximizeWindow = () => {
ipcService.sendLazy('window.maximize');
}
const maximizeWindow = () => {
ipcService.sendLazy('window.maximize');
}
const minimizeWindow = () => {
ipcService.sendLazy('window.minimize');
}
const minimizeWindow = () => {
ipcService.sendLazy('window.minimize');
}
const resetWindow = () => {
ipcService.sendLazy('window.reset');
}
const resetWindow = () => {
ipcService.sendLazy('window.reset');
}
const toogleMaximize = () => {
if(maximized){ resetWindow(); }
else{ maximizeWindow(); }
setMaximized(!maximized);
}
const toogleMaximize = () => {
if(maximized){ resetWindow(); }
else{ maximizeWindow(); }
setMaximized(!maximized);
}
const volumeIcon: BsmIconType = (() => {
if(volume.muted || !volume.volume){ return "volume-off"; }
if(volume.volume < .5){ return "volume-down"; }
return "volume-up";
})()
if(template === "index.html"){
@@ -42,7 +59,13 @@ export default function TitleBar({template = "index.html"} : {template: AppWindo
<span className='text-gray-800 dark:text-gray-100 font-bold text-xs italic'>BSManager</span>
</div>
</div>
<div id="window-controls" className="h-full flex shrink-0">
<div id="window-controls" className="h-full flex shrink-0 items-center">
<div className='h-full text-gray-800 dark:text-gray-200 pr-1 cursor-pointer flex flex-row justify-end items-center gap-2 group pl-5'>
<div className='shrink-0 w-0 overflow-hidden transition-all group-hover:w-16 group-hover:overflow-visible group-active:w-16 group-active:overflow-visible text-main-color-3'>
<BsmRange min={0} max={1} step={.01} values={[volume.muted ? 0 : volume.volume]} colors={[color, "currentColor"]} onChange={val => audio.setVolume(val[0])} onFinalChange={val => audio.setFinalVolume(val[0])}/>
</div>
<BsmButton className='shrink-0 h-[23px] w-[23px] aspect-square !bg-transparent flex items-start' iconClassName={volumeIcon === "volume-down" && "-translate-x-[1.8px]"} icon={volumeIcon} withBar={false} onClick={() => audio.toggleMute()}/>
</div>
<div onClick={minimizeWindow} className="text-gray-800 dark:text-gray-200 hover:bg-gray-300 dark:hover:bg-[#4F545C] cursor-pointer w-11 h-full shrink-0 flex justify-center items-center" id="min-button" >
<svg aria-hidden="false" width="12" height="12" viewBox="0 0 12 12"><rect fill="currentColor" width="10" height="1" x="1" y="6"> </rect></svg>
</div>
@@ -20,16 +20,14 @@ export function LaunchSlide({version}: Props) {
const launchState = useObservable(bsLauncherService.launchState$);
const setMode = (mode: LaunchMods, value: boolean) => {
if(mode === LaunchMods.DEBUG_MOD){ setDebugMode(value); }
if(mode === LaunchMods.DEBUG_MOD){
setDebugMode(value);
}
else if(mode === LaunchMods.OCULUS_MOD){
setOculusMode(value);
setDesktopMode(false);
configService.set(LaunchMods.DESKTOP_MOD, false);
setOculusMode(value);
}
else if(mode === LaunchMods.DESKTOP_MOD){
setDesktopMode(value);
setOculusMode(false);
configService.set(LaunchMods.OCULUS_MOD, false);
setDesktopMode(value);
}
configService.set(mode, value);
}
@@ -69,16 +69,14 @@ export function ModsGrid({modsMap, installed, modsSelected, onModChange, moreInf
]}/>
</span>
{
Array.from(modsMap.keys()).map(key => modsMap.get(key).some(mod => mod.name.toLowerCase().includes(filter)) && (
{Array.from(modsMap.keys()).map(key => modsMap.get(key).some(mod => mod.name.toLowerCase().includes(filter)) && (
<ul key={key} className="contents">
<h2 className="col-span-full py-1 font-bold pl-3">{key}</h2>
{modsMap.get(key).map(mod => mod.name.toLowerCase().includes(filter) && (
<ModItem key={mod.name} className="contents bg-light-main-color-3 dark:bg-main-color-1 text-main-color-1 dark:text-light-main-color-1 hover:cursor-pointer" mod={mod} installedVersion={installedModVersion(key, mod)} isDependency={isDependency(mod)} isSelected={isSelected(mod)} onChange={(val) => onModChange(val, mod)} onWantInfo={onWantInfos} wantInfo={mod.name === moreInfoMod?.name}/>
))}
</ul>
))
}
))}
</div>
)
}
@@ -137,7 +137,7 @@ export function ModsSlide({version, onDisclamerDecline}: {version: BSVersion, on
<div className='relative flex flex-col grow-0 bg-light-main-color-2 dark:bg-main-color-2 h-full w-full rounded-md shadow-black shadow-center overflow-hidden'>
{isOnline && modsAvailable ? (
<>
<div className="overflow-scroll w-full min-h-0 scrollbar-thin scrollbar-thumb-neutral-900 scrollbar-thumb-rounded-full">
<div className="grow overflow-scroll w-full min-h-0 scrollbar-thin scrollbar-thumb-neutral-900 scrollbar-thumb-rounded-full">
<ModsGrid modsMap={modsAvailable} installed={modsInstalled} modsSelected={modsSelected} onModChange={handleModChange} moreInfoMod={moreInfoMod} onWantInfos={handleMoreInfo}/>
</div>
<div className="h-10 shrink-0 flex items-center justify-between px-3">
@@ -148,7 +148,7 @@ export function ModsSlide({version, onDisclamerDecline}: {version: BSVersion, on
</div>
</>
) : (
<div className="w-full h-full flex flex-col items-center justify-center">
<div className="w-full h-full flex flex-col items-center justify-center text-gray-800 dark:text-gray-200">
<img className={`w-32 h-32 ${isOnline && "spin-loading"}`} src={isOnline ? BeatWaitingImg : BeatConflictImg} alt=" "/>
<span className="text-xl mt-3 h-0 italic">{t(isOnline ? "pages.version-viewer.mods.loading-mods" : "pages.version-viewer.mods.no-internet")}</span>
</div>
@@ -4,9 +4,9 @@ export const defaultConfiguration: {[key in DefaultConfigKey]: any} = {
"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"],
"default_mods": ["SongCore", "ScoreSaber", "BeatSaverDownloader", "BeatSaverVoting", "PlaylistManager", "ModelDownloader"]
"default_mods": ["SongCore", "WhyIsThereNoLeaderboard", "BeatSaverDownloader", "BeatSaverVoting", "PlaylistManager"]
}
export type DefaultConfigKey = "first-color" | "second-color" | "theme" | "language" | "supported_languages" | "default_mods";
export type ThemeConfig = "dark" | "light" | "os"
export type ThemeConfig = "dark" | "light" | "os"
+5 -1
View File
@@ -1,11 +1,15 @@
import { MapsPlaylistsPanel } from "renderer/components/maps-mangement-components/maps-playlists-panel.component";
import { Slideshow } from "renderer/components/slideshow/slideshow.component";
import { useTranslation } from "renderer/hooks/use-translation.hook";
export function MapsPage() {
const t = useTranslation();
return (
<div className="w-full h-full flex items-center flex-col pt-2">
<Slideshow className="absolute w-full h-full top-0"/>
<h1 className="text-gray-100 text-2xl z-[1]">Maps partagées</h1>
<h1 className="text-gray-100 text-2xl z-[1]">{t("pages.shared-maps.title")}</h1>
<div className="w-full min-h-0 grow p-10 flex flex-col items-center justify-start text-white relative">
<MapsPlaylistsPanel/>
</div>
@@ -293,7 +293,7 @@ export function SettingsPage() {
<SettingContainer title="pages.settings.patreon.title" description="pages.settings.patreon.description">
<div className="flex gap-2">
<BsmButton className="flex w-fit rounded-md h-8 px-2 font-bold py-1 whitespace-nowrap !bg-red-500 !text-white" text="pages.settings.patreon.buttons.support" withBar={false} onClick={openSupportPage}/>
<BsmButton disabled color="#ef4444" className="flex w-fit rounded-md h-8 px-2 font-bold py-1 whitespace-nowrap !text-white" text="pages.settings.patreon.buttons.support" withBar={false} onClick={openSupportPage}/>
<BsmButton className="flex w-fit rounded-md h-8 px-2 font-bold py-1 !text-white" withBar={false} text="pages.settings.patreon.buttons.supporters" color="#6c5ce7" onClick={toogleShowSupporters}/>
</div>
<SettingContainer className="mt-3" description="pages.settings.discord.description">
@@ -29,7 +29,6 @@ export function VersionViewer() {
const [currentTabIndex, setCurrentTabIndex] = useState(0);
const navigateToVersion = (version?: BSVersion) => {
console.log(version);
if(!version){
return navigate("/available-versions");
}
+5 -4
View File
@@ -1,15 +1,16 @@
import { Channels, ReplyChannels } from 'main/preload';
import { IpcChannel } from "shared/models/ipc/ipc-response.interface";
declare global {
interface Window {
electron: {
ipcRenderer: {
sendMessage(channel: Channels, args: any): void;
sendMessage(channel: IpcChannel, args: any): void;
on(
channel: ReplyChannels,
channel: IpcChannel,
func: (...args: any) => void
): (() => void) | undefined;
once(channel: ReplyChannels, func: (...args: any) => void): void;
once(channel: IpcChannel, func: (...args: any) => void): void;
removeAllListeners(channel: IpcChannel): void;
};
};
}
+57 -2
View File
@@ -1,5 +1,5 @@
import { Observable } from "rxjs";
import { BehaviorSubject } from "rxjs";
import { Observable, BehaviorSubject } from "rxjs";
import { ConfigurationService } from "./configuration.service";
export class AudioPlayerService{
@@ -10,18 +10,38 @@ export class AudioPlayerService{
return AudioPlayerService.instance;
}
private readonly config: ConfigurationService;
private readonly player: HTMLAudioElement;
private readonly _src$: BehaviorSubject<string> = new BehaviorSubject("");
private readonly _playing$: BehaviorSubject<boolean> = new BehaviorSubject(false);
private readonly _bpm$: BehaviorSubject<number> = new BehaviorSubject(0);
private readonly _volume$: BehaviorSubject<PlayerVolume>;
private lastVolume: number;
private constructor(){
this.config = ConfigurationService.getInstance();
this._volume$ = new BehaviorSubject(
this.config.get<PlayerVolume>("audio-level") || { volume: 0.5, muted: false }
);
this.lastVolume = this._volume$.value.volume;
this.player = new Audio();
this.player.onplay = () => this._playing$.next(true);
this.player.onpause = () => this._playing$.next(false);
this.player.onended = () => this._playing$.next(false);
this._volume$.subscribe(volume => {
this.player.volume = volume.volume;
this.player.muted = volume.muted;
this.config.set("audio-level", volume);
});
}
public play(src: string, bpm = 0): Promise<void>{
@@ -41,6 +61,31 @@ export class AudioPlayerService{
return this.player.play();
}
public setVolume(volume: number): void{
const playerVolume: PlayerVolume = {muted: volume <= 0, volume};
this._volume$.next(playerVolume);
}
public setFinalVolume(volume: number): void{
if(volume > 0){ this.lastVolume = volume; }
const playerVolume: PlayerVolume = {muted: volume <= 0, volume: this.lastVolume};
this._volume$.next(playerVolume);
}
public mute(): void{
const playerVolume = {...this._volume$.value, muted: true};
this._volume$.next(playerVolume);
}
public unmute(): void{
const playerVolume = {...this._volume$.value, muted: false};
this._volume$.next(playerVolume);
}
public toggleMute(): void{
this.muted ? this.unmute() : this.mute();
}
public get src$(): Observable<string>{
return this._src$.asObservable();
}
@@ -50,9 +95,19 @@ export class AudioPlayerService{
public get bpm$(): Observable<number>{
return this._bpm$.asObservable();
}
public get volume$(): Observable<PlayerVolume>{
return this._volume$.asObservable();
}
public get src(): string{ return this._src$.value; }
public get playing(): boolean{ return this._playing$.value; }
public get bpm(): number{ return this._bpm$.value; }
public get volume(): PlayerVolume{ return this._volume$.value; }
public get muted(): boolean{ return this.player.muted; }
}
interface PlayerVolume{
volume: number;
muted: boolean;
}
+17 -6
View File
@@ -96,11 +96,7 @@ export class BsDownloaderService{
return this.ipcService.send<boolean>("is-dotnet-6-installed").then(res => res.success && res.data)
}
public async download(bsVersion: BSVersion, isVerification?: boolean, isFirstCall = true): Promise<IpcResponse<DownloadEvent>>{
if(isFirstCall && !this.progressBarService.require()){ return {success: false}; }
if(isFirstCall && !(await this.isDotNet6Installed())){
private async showDotNetNotInstalledError(): Promise<void>{
const choice = await this.notificationService.notifyError({
duration: 11_000,
title: "notifications.bs-download.errors.titles.dotnet-required",
@@ -111,7 +107,16 @@ export class BsDownloaderService{
if(choice === "0"){
this.linkOpener.open("https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-6.0.12-windows-x64-installer");
}
}
public async download(bsVersion: BSVersion, isVerification?: boolean, isFirstCall = true): Promise<IpcResponse<DownloadEvent>>{
// TODO : to remake cause we don't need recursion anymore
if(isFirstCall && !this.progressBarService.require()){ return {success: false}; }
if(isFirstCall && !(await this.isDotNet6Installed())){
await this.showDotNetNotInstalledError();
return {success: false};
}
@@ -142,7 +147,13 @@ export class BsDownloaderService{
this.progressBarService.hide(true);
this.resetDownload();
if(res.success && isFirstCall){ this.notificationService.notifySuccess({title: `notifications.bs-download.success.titles.${isVerification ? "verification-finished" : "download-success"}`, duration: 3000}); }
else if(res.data && isFirstCall){ this.notificationService.notifyError({title: `notifications.types.error`, desc: `notifications.bs-download.errors.msg.${res.data}`, duration: 3000}); }
else if(res.data === "dotnet" && isFirstCall){
await this.showDotNetNotInstalledError();
return res;
}
else if(res.data && isFirstCall){
this.notificationService.notifyError({title: `notifications.types.error`, desc: `notifications.bs-download.errors.msg.${res.data}`, duration: 3000});
}
return res;
}
+28
View File
@@ -1,5 +1,7 @@
import { defaultIfEmpty } from "rxjs/operators";
import { Observable } from "rxjs";
import { IpcRequest, IpcResponse } from "shared/models/ipc";
import { identity } from "rxjs";
export class IpcService {
@@ -47,4 +49,30 @@ export class IpcService {
return obs;
}
// TODO : Convert all IPCs calls to V2
public sendV2<T, U = unknown>(channel: string, request?: IpcRequest<U>, defaultValue?: T): Observable<T>{
if(!request){ request = {args: null, responceChannel: null}; }
if(!request.responceChannel){ request.responceChannel = `${channel}_responce_${new Date().getTime()}`; }
const completeChannel = `${request.responceChannel}_complete`;
const errorChannel = `${request.responceChannel}_error`;
const obs = new Observable<T>(observer => {
window.electron.ipcRenderer.on(request.responceChannel, (res: T) => observer.next(res));
window.electron.ipcRenderer.on(errorChannel, (err: Error) => observer.error(err));
window.electron.ipcRenderer.on(completeChannel, () => observer.complete());
}).pipe(defaultValue ? defaultIfEmpty(defaultValue) : identity);
window.electron.ipcRenderer.once(completeChannel, () => {
window.electron.ipcRenderer.removeAllListeners(request.responceChannel);
window.electron.ipcRenderer.removeAllListeners(errorChannel);
window.electron.ipcRenderer.removeAllListeners(completeChannel);
});
window.electron.ipcRenderer.sendMessage(channel, request);
return obs;
}
}
@@ -10,6 +10,7 @@ import { IpcService } from "./ipc.service";
import { OsDiagnosticService } from "./os-diagnostic.service";
import equal from "fast-deep-equal/es6";
import { CSSProperties } from "react";
import { BsmLocalMap } from "shared/models/maps/bsm-local-map.interface";
export class MapsDownloaderService {
@@ -28,7 +29,7 @@ export class MapsDownloaderService {
private readonly mapsQueue$: BehaviorSubject<MapDownload[]> = new BehaviorSubject([]);
private readonly currentDownload$: BehaviorSubject<MapDownload> = new BehaviorSubject(null);
private queueMaxLenght = 0;
private downloadedListerners: ((map: BsvMapDetail, version: BSVersion) => void)[] = [];
private downloadedListerners: ((map: BsmLocalMap, version: BSVersion) => void)[] = [];
public readonly progressBarStyle: CSSProperties = {zIndex: 100000, position: "fixed", bottom: "10px", right: 0};
private constructor(){
@@ -50,10 +51,10 @@ export class MapsDownloaderService {
while(this.mapsQueue$.value.at(0)){
const toDownload = this.mapsQueue$.value.at(0);
this.currentDownload$.next(toDownload);
const downloaded = await this.downloadMap(toDownload.map, toDownload.version);
const downloaded = await this.downloadMap(toDownload.map, toDownload.version).toPromise();
if(downloaded){
this.downloadedListerners.forEach(func => func(toDownload.map, toDownload.version));
this.downloadedListerners.forEach(func => func(downloaded, toDownload.version));
}
const newArr = [...this.mapsQueue$.value];
@@ -67,14 +68,13 @@ export class MapsDownloaderService {
this.progressBar.hide(true);
}
private async downloadMap(map: BsvMapDetail, version: BSVersion): Promise<boolean>{
if(this.os.isOffline){ return false }
const res = await this.ipc.send<void, {map: BsvMapDetail, version: BSVersion}>("download-map", {args: {map, version}});
return res.success;
private downloadMap(map: BsvMapDetail, version: BSVersion): Observable<BsmLocalMap>{
if(this.os.isOffline){ return null }
return this.ipc.sendV2<BsmLocalMap, {map: BsvMapDetail, version: BSVersion}>("download-map", {args: {map, version}});
}
public async openDownloadMapModal(version?: BSVersion): Promise<ModalResponse<void>>{
const res = await this.modals.openModal(DownloadMapsModal, version);
public async openDownloadMapModal(version?: BSVersion, ownedMaps: BsmLocalMap[] = []): Promise<ModalResponse<void>>{
const res = await this.modals.openModal(DownloadMapsModal, {version, ownedMaps});
this.progressBar.setStyle(null);
return res;
}
@@ -109,11 +109,11 @@ export class MapsDownloaderService {
return this.mapsQueue$.asObservable();
}
public addOnMapDownloadedListener(func: (map: BsvMapDetail, version: BSVersion) => void){
public addOnMapDownloadedListener(func: (map: BsmLocalMap, version: BSVersion) => void){
this.downloadedListerners.push(func);
}
public removeOnMapDownloadedListene(func: (map: BsvMapDetail, version: BSVersion) => void){
public removeOnMapDownloadedListener(func: (map: BsmLocalMap, version: BSVersion) => void){
const funcIndex = this.downloadedListerners.indexOf(func);
if(funcIndex < 0){ return; }
this.downloadedListerners.splice(funcIndex, 1);
+26 -42
View File
@@ -2,8 +2,7 @@ import { LinkMapsModal } from "renderer/components/modal/modal-types/link-maps-m
import { UnlinkMapsModal } from "renderer/components/modal/modal-types/unlink-maps-modal.component";
import { Subject, Observable } from "rxjs";
import { BSVersion } from "shared/bs-version.interface";
import { BsmLocalMap } from "shared/models/maps/bsm-local-map.interface";
import { BeatSaverService } from "./thrird-partys/beat-saver.service";
import { BsmLocalMapsProgress, BsmLocalMap, DeleteMapsProgress } from "shared/models/maps/bsm-local-map.interface";
import { IpcService } from "./ipc.service";
import { ModalExitCode, ModalService } from "./modale.service";
import { DeleteMapsModal } from "renderer/components/modal/modal-types/delete-maps-modal.component";
@@ -11,6 +10,10 @@ import { ProgressBarService } from "./progress-bar.service";
import { OpenSaveDialogOption } from "shared/models/ipc";
import { NotificationService } from "./notification.service";
import { ConfigurationService } from "./configuration.service";
import { ArchiveProgress } from "shared/models/archive.interface";
import { map, last, catchError } from "rxjs/operators";
import { of } from "rxjs";
import { ProgressionInterface } from "shared/models/progress-bar";
export class MapsManagerService {
@@ -24,7 +27,6 @@ export class MapsManagerService {
public static readonly REMEMBER_CHOICE_DELETE_MAP_KEY = "not-confirm-delete-map"
private readonly ipcService: IpcService;
private readonly bsaver: BeatSaverService;
private readonly modal: ModalService;
private readonly progressBar: ProgressBarService;
private readonly notifications: NotificationService;
@@ -35,32 +37,14 @@ export class MapsManagerService {
private constructor(){
this.ipcService = IpcService.getInstance();
this.bsaver = BeatSaverService.getInstance();
this.modal = ModalService.getInsance();
this.progressBar = ProgressBarService.getInstance();
this.notifications = NotificationService.getInstance();
this.config = ConfigurationService.getInstance();
}
public getMaps(version?: BSVersion, withDetails = true): Observable<BsmLocalMap[]>{
return new Observable(obs => {
this.ipcService.send<BsmLocalMap[], BSVersion>("get-version-maps", {args: version}).then(res => {
if(!res.success){ return obs.complete();}
obs.next(res.data);
if(!withDetails){ return obs.complete(); }
this.bsaver.getMapDetailsFromHashs(res.data.map(localMap => localMap.hash)).then(mapsDetails => {
mapsDetails.forEach(details => {
const corespondingMap = res.data.find(localMap => localMap.hash === details.versions.find(details => details?.hash === localMap.hash)?.hash);
if(!corespondingMap){ return; }
res.data.find(localMap => localMap.hash === details.versions.find(details => details?.hash === localMap.hash)?.hash).bsaverInfo = details
});
obs.next(res.data);
})
});
});
public getMaps(version?: BSVersion): Observable<BsmLocalMapsProgress>{
return this.ipcService.sendV2<BsmLocalMapsProgress>("load-version-maps", {args: version}, {loaded: 0, total: 0, maps: []});
}
public versionHaveMapsLinked(version: BSVersion): Promise<boolean>{
@@ -129,17 +113,13 @@ export class MapsManagerService {
const showProgressBar = this.progressBar.require();
if(showProgressBar){
this.progressBar.showFake(.008);
}
const progress$ = this.ipcService.sendV2<DeleteMapsProgress>("delete-maps", {args: maps}).pipe(map(progress => (progress.deleted / progress.total) * 100));
const res = await this.ipcService.send<void, {version: BSVersion, maps: BsmLocalMap[]}>("delete-maps", {args: {version, maps}});
showProgressBar && this.progressBar.show(progress$, true);
if(showProgressBar){
this.progressBar.hide(true);
}
progress$.toPromise().finally(() => this.progressBar.hide(true));
return res.success;
return progress$.pipe(last(), map(() => true), catchError(() => of(false))).toPromise().catch(() => false);
}
public async exportMaps(version: BSVersion, maps?: BsmLocalMap[]): Promise<void>{
@@ -152,18 +132,22 @@ export class MapsManagerService {
if(!resFile.success){ return; }
this.progressBar.showFake(.008);
const resExport = await this.ipcService.send<string, {version: BSVersion, maps: BsmLocalMap[], outPath: string}>("export-maps", {args: {version, maps, outPath: resFile.data}});
if(!resExport.success && resExport.error.title){
const {title, msg} = resExport.error;
this.notifications.notifyError({title, desc: msg});
}
else {
const exportProgress$: Observable<ProgressionInterface> = await this.ipcService.sendV2<ArchiveProgress, {version: BSVersion, maps: BsmLocalMap[], outPath: string}>("export-maps", {args: {version, maps, outPath: resFile.data}}).pipe(
map(p => {
return { progression: (p.prossesedFiles / p.totalFiles) * 100, label: `${p.prossesedFiles} / ${p.totalFiles}` } as ProgressionInterface
})
);
this.progressBar.show(exportProgress$, true);
await exportProgress$.toPromise().catch(e => {
this.notifications.notifyError({title: "notifications.types.error", desc: e.message});
}).then(() => {
this.notifications.notifySuccess({title: "Export terminé 🎉", duration: 3000});
}
this.progressBar.complete();
this.progressBar.hide(true);
this.progressBar.complete();
this.progressBar.hide(true);
});
}
public async isDeepLinksEnabled(): Promise<boolean>{
+4
View File
@@ -0,0 +1,4 @@
export interface ArchiveProgress{
totalFiles: number;
prossesedFiles: number;
}
@@ -1,4 +1,9 @@
import { Observable } from "rxjs";
import { IpcResponse } from "./ipc-response.interface";
export interface IpcRequest<T>{
args?: T,
responceChannel?: string
}
responceChannel?: string,
}
export type IpcReplier= <T>(data: Observable<T>) => void;
@@ -4,4 +4,8 @@ export interface IpcResponse<T>{
data?: T,
error?: BsmException,
success: boolean,
}
}
export type IpcChannel = string;
export type IpcErrorChannel = IpcChannel & `${string}_error`;
export type IpcCompleteChannel = IpcChannel & `${string}_complete`;
@@ -7,4 +7,16 @@ export interface BsmLocalMap {
songUrl: string,
rawInfo: RawMapInfoData,
bsaverInfo?: BsvMapDetail
path: string
}
export interface BsmLocalMapsProgress {
total: number,
loaded: number,
maps: BsmLocalMap[],
}
export interface DeleteMapsProgress {
total: number,
deleted: number
}