Merge branch 'master' into chore/add-beatsaber-desktop-version-info

Zagrios · Feb 25, 2025 · ea7527d · ea7527d
2 parents 14f079b + 3f10d59
commit ea7527d
Show file tree

Hide file tree

Showing 21 changed files with 157 additions and 72 deletions.
diff --git a/assets/jsons/patreons.json b/assets/jsons/patreons.json
@@ -142,5 +142,11 @@
     {
 		"username": "Arts Rimuro Suraimu",
 		"type": "gold"
+	},
+    {
+		"username": "Ricardo Boss"
+	},
+    {
+		"username": "Jesper Norsted"
 	}
 ]
diff --git a/assets/jsons/translations/de.json b/assets/jsons/translations/de.json
@@ -144,6 +144,7 @@
                 "mods-grid": {
                     "header-bar": {
                         "name": "Name",
+                        "size": "Größe",
                         "installed": "Installiert",
                         "latest": "Neueste",
                         "description": "Beschreibung",
@@ -152,6 +153,10 @@
                             "uninstall-all": "Alle deinstallieren",
                             "unselect-all": "Alle abwählen"
                         }
+                    },
+                    "mod-item": {
+                        "this-is-a-large-mod": "Das ist ein großer Mod!",
+                        "this-is-a-very-large-mod": "Das ist ein sehr großer Mod!"
                     }
                 },
                 "notifications": {

diff --git a/assets/jsons/translations/en.json b/assets/jsons/translations/en.json
@@ -144,6 +144,7 @@
                 "mods-grid": {
                     "header-bar": {
                         "name": "Name",
+                        "size": "Size",
                         "installed": "Installed",
                         "latest": "Latest",
                         "description": "Description",
@@ -152,6 +153,10 @@
                             "uninstall-all": "Uninstall all",
                             "unselect-all": "Unselect all"
                         }
+                    },
+                    "mod-item":{
+                        "this-is-a-large-mod": "This is a large mod!",
+                        "this-is-a-very-large-mod": "This is a very large mod!"
                     }
                 },
                 "notifications": {

diff --git a/assets/jsons/translations/es.json b/assets/jsons/translations/es.json
@@ -144,6 +144,7 @@
                 "mods-grid": {
                     "header-bar": {
                         "name": "Nombre",
+                        "size": "Tamaño",
                         "installed": "Instalado",
                         "latest": "Último",
                         "description": "Descripción",
@@ -152,6 +153,10 @@
                             "uninstall-all": "Desinstalar todos",
                             "unselect-all": "Deseleccionar todo"
                         }
+                    },
+                    "mod-item": {
+                        "this-is-a-large-mod": "¡Este es un mod grande!",
+                        "this-is-a-very-large-mod": "¡Este es un mod muy grande!"
                     }
                 },
                 "notifications": {

diff --git a/assets/jsons/translations/fr.json b/assets/jsons/translations/fr.json
@@ -144,6 +144,7 @@
                 "mods-grid": {
                     "header-bar": {
                         "name": "Nom",
+                        "size": "Taille",
                         "installed": "Installé",
                         "latest": "Récent",
                         "description": "Description",
@@ -152,6 +153,10 @@
                             "uninstall-all": "Tout désinstaller",
                             "unselect-all": "Tout désélectionner"
                         }
+                    },
+                    "mod-item": {
+                        "this-is-a-large-mod": "C'est un mod volumineux !",
+                        "this-is-a-very-large-mod": "C'est un mod très volumineux !"
                     }
                 },
                 "notifications": {

diff --git a/assets/jsons/translations/it.json b/assets/jsons/translations/it.json
@@ -144,6 +144,7 @@
                 "mods-grid": {
                     "header-bar": {
                         "name": "Nome",
+                        "size": "Dimensione",
                         "installed": "Installata",
                         "latest": "Ultima Versione",
                         "description": "Descrizione",
@@ -152,6 +153,10 @@
                             "uninstall-all": "Disinstalla tutto",
                             "unselect-all": "Deseleziona tutto"
                         }
+                    },
+                    "mod-item": {
+                        "this-is-a-large-mod": "Questo è un mod grande!",
+                        "this-is-a-very-large-mod": "Questo è un mod molto grande!"
                     }
                 },
                 "notifications": {

diff --git a/assets/jsons/translations/ja.json b/assets/jsons/translations/ja.json
@@ -144,6 +144,7 @@
                 "mods-grid": {
                     "header-bar": {
                         "name": "名前",
+                        "size": "サイズ",
                         "installed": "インストール済み",
                         "latest": "最新",
                         "description": "說明",
@@ -152,6 +153,10 @@
                             "uninstall-all": "全てアンインストールする",
                             "unselect-all": "すべて選択解除"
                         }
+                    },
+                    "mod-item": {
+                        "this-is-a-large-mod": "これは大きなModです！",
+                        "this-is-a-very-large-mod": "これは非常に大きなModです！"
                     }
                 },
                 "notifications": {

diff --git a/assets/jsons/translations/ko.json b/assets/jsons/translations/ko.json
@@ -144,6 +144,7 @@
                 "mods-grid": {
                     "header-bar": {
                         "name": "이름",
+                        "size": "크기",
                         "installed": "설치됨",
                         "latest": "최신",
                         "description": "설명",
@@ -152,6 +153,10 @@
                             "uninstall-all": "모두 제거",
                             "unselect-all": "모두 선택 해제"
                         }
+                    },
+                    "mod-item": {
+                        "this-is-a-large-mod": "이것은 큰 모드입니다!",
+                        "this-is-a-very-large-mod": "이것은 매우 큰 모드입니다!"
                     }
                 },
                 "notifications": {

diff --git a/assets/jsons/translations/pt-br.json b/assets/jsons/translations/pt-br.json
@@ -144,6 +144,7 @@
                 "mods-grid": {
                     "header-bar": {
                         "name": "Nome",
+                        "size": "tamanho",
                         "installed": "Instalado",
                         "latest": "Mais recente",
                         "description": "Descrição",
@@ -152,6 +153,10 @@
                             "uninstall-all": "Desinstalar todos",
                             "unselect-all": "Desmarcar todos"
                         }
+                    },
+                    "mod-item": {
+                        "this-is-a-large-mod": "Este é um mod grande!",
+                        "this-is-a-very-large-mod": "Este é um mod muito grande!"
                     }
                 },
                 "notifications": {

diff --git a/assets/jsons/translations/ru.json b/assets/jsons/translations/ru.json
@@ -144,6 +144,7 @@
                 "mods-grid": {
                     "header-bar": {
                         "name": "Имя",
+                        "size": "Размер",
                         "installed": "Установлено",
                         "latest": "Latest",
                         "description": "Описание",
@@ -152,6 +153,10 @@
                             "uninstall-all": "Удалить всё",
                             "unselect-all": "Снять все выделения"
                         }
+                    },
+                    "mod-item": {
+                        "this-is-a-large-mod": "Это большой мод!",
+                        "this-is-a-very-large-mod": "Это очень большой мод!"
                     }
                 },
                 "notifications": {

diff --git a/assets/jsons/translations/tl.json b/assets/jsons/translations/tl.json
@@ -144,6 +144,7 @@
                 "mods-grid": {
                     "header-bar": {
                         "name": "Pangalan",
+                        "size": "laki",
                         "installed": "Naka-install",
                         "latest": "Pinakabago",
                         "description": "Deskripsyon",
@@ -152,6 +153,10 @@
                             "uninstall-all": "I-uninstall ang lahat",
                             "unselect-all": "I-unselect and lahat"
                         }
+                    },
+                    "mod-item": {
+                        "this-is-a-large-mod": "Ito ay isang malaking mod!",
+                        "this-is-a-very-large-mod": "Ito ay isang napakalaking mod!"
                     }
                 },
                 "notifications": {

diff --git a/assets/jsons/translations/uk.json b/assets/jsons/translations/uk.json
@@ -144,6 +144,7 @@
                 "mods-grid": {
                     "header-bar": {
                         "name": "Назва",
+                        "size": "розмір",
                         "installed": "Встановлено",
                         "latest": "Остання",
                         "description": "Опис",
@@ -152,6 +153,10 @@
                             "uninstall-all": "Видалити всі",
                             "unselect-all": "Зняти виділення з всіх"
                         }
+                    },
+                    "mod-item": {
+                        "this-is-a-large-mod": "Це великий мод!",
+                        "this-is-a-very-large-mod": "Це дуже великий мод!"
                     }
                 },
                 "notifications": {

diff --git a/assets/jsons/translations/zh-tw.json b/assets/jsons/translations/zh-tw.json
@@ -144,6 +144,7 @@
                 "mods-grid": {
                     "header-bar": {
                         "name": "名稱",
+                        "size": "大小",
                         "installed": "已安裝",
                         "latest": "最新",
                         "description": "描述",
@@ -152,6 +153,10 @@
                             "uninstall-all": "全部移除",
                             "unselect-all": "取消全選"
                         }
+                    },
+                    "mod-item": {
+                        "this-is-a-large-mod": "這是一個大型Mod！",
+                        "this-is-a-very-large-mod": "這是一個非常大型的Mod！"
                     }
                 },
                 "notifications": {

diff --git a/assets/jsons/translations/zh.json b/assets/jsons/translations/zh.json
@@ -144,6 +144,7 @@
                 "mods-grid": {
                     "header-bar": {
                         "name": "名称",
+                        "size": "大小",
                         "installed": "已安装",
                         "latest": "最新",
                         "description": "描述",
@@ -152,6 +153,10 @@
                             "uninstall-all": "全部卸载",
                             "unselect-all": "取消全选"
                         }
+                    },
+                    "mod-item": {
+                        "this-is-a-large-mod": "这是一个大型Mod！",
+                        "this-is-a-very-large-mod": "这是一个非常大型的Mod！"
                     }
                 },
                 "notifications": {

diff --git a/src/main/decorators/log.decorator.ts b/src/main/decorators/log.decorator.ts
diff --git a/src/main/helpers/fs.helpers.ts b/src/main/helpers/fs.helpers.ts
@@ -3,7 +3,6 @@ import { access, mkdir, readdir, lstat, readlink } from "fs/promises";
 import path from "path";
 import { Observable, concatMap, from } from "rxjs";
 import log from "electron-log";
-import { BsmException } from "shared/models/bsm-exception.model";
 import crypto from "crypto";
 import { execSync } from "child_process";
 import { tryit } from "../../shared/helpers/error.helpers";
@@ -181,7 +180,7 @@ export function isSubdirectory(parent: string, child: string): boolean {
 
 export async function copyDirectoryWithJunctions(src: string, dest: string, options?: CopyOptions): Promise<void> {
     if (isSubdirectory(src, dest)) {
-        throw { message: `Cannot copy directory '${src}' into itself '${dest}'.`, code: "COPY_TO_SUBPATH" } as BsmException;
+        throw new CustomError(`Cannot copy directory '${src}' into itself '${dest}'.`, "COPY_TO_SUBPATH");
     }
 
     await ensureDir(dest);

diff --git a/src/main/services/additional-content/maps/song-cache.service.ts b/src/main/services/additional-content/maps/song-cache.service.ts
@@ -19,7 +19,6 @@ export class SongCacheService {
     private readonly mapsInfoCache: JsonCache<CachedMapInfoWithHash>;
 
     private constructor(){
-        console.log(this.MAPS_INFO_CACHE_PATH);
         this.mapsInfoCache = new JsonCache(this.MAPS_INFO_CACHE_PATH);
     }