From 65561abdab8b82ba600f3f97692a87a3eb1867da Mon Sep 17 00:00:00 2001 From: DecDuck Date: Sat, 10 May 2025 15:25:40 +1000 Subject: [PATCH] fix: update object id paths for new server --- components/LibrarySearch.vue | 2 +- package.json | 4 +- pages/library/[id]/index.vue | 4 +- pages/queue.vue | 2 +- src-tauri/src/games/library.rs | 10 +-- src-tauri/src/lib.rs | 2 +- src-tauri/src/process/process_manager.rs | 4 +- types.ts | 10 +-- yarn.lock | 86 ++++++++++++++++++++++-- 9 files changed, 101 insertions(+), 23 deletions(-) diff --git a/components/LibrarySearch.vue b/components/LibrarySearch.vue index 14399bf..3ce3538 100644 --- a/components/LibrarySearch.vue +++ b/components/LibrarySearch.vue @@ -107,7 +107,7 @@ async function calculateGames() { } for (const game of rawGames.value) { if (icons[game.id]) continue; - icons[game.id] = await useObject(game.mIconId); + icons[game.id] = await useObject(game.mIconObjectId); } } diff --git a/package.json b/package.json index b0149ae..52e5b21 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,9 @@ "autoprefixer": "^10.4.20", "postcss": "^8.4.47", "sass-embedded": "^1.79.4", - "tailwindcss": "^3.4.13" + "tailwindcss": "^3.4.13", + "typescript": "^5.8.3", + "vue-tsc": "^2.2.10" }, "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/pages/library/[id]/index.vue b/pages/library/[id]/index.vue index afab963..95f1304 100644 --- a/pages/library/[id]/index.vue +++ b/pages/library/[id]/index.vue @@ -477,11 +477,11 @@ const remoteUrl: string = await invoke("gen_drop_url", { path: `/store/${game.value.id}`, }); -const bannerUrl = await useObject(game.value.mBannerId); +const bannerUrl = await useObject(game.value.mBannerObjectId); // Get all available images const mediaUrls = await Promise.all( - game.value.mImageCarousel.map((id) => useObject(id)) + game.value.mImageCarouselObjectIds.map((id) => useObject(id)) ); const htmlDescription = micromark(game.value.mDescription); diff --git a/pages/queue.vue b/pages/queue.vue index 8d46bea..cee74b6 100644 --- a/pages/queue.vue +++ b/pages/queue.vue @@ -158,7 +158,7 @@ function loadGamesForQueue(v: typeof queue.value) { if (games.value[id]) return; (async () => { const gameData = await useGame(id); - const cover = await useObject(gameData.game.mCoverId); + const cover = await useObject(gameData.game.mCoverObjectId); games.value[id] = { ...gameData, cover }; })(); } diff --git a/src-tauri/src/games/library.rs b/src-tauri/src/games/library.rs index 270e6a5..cb66d41 100644 --- a/src-tauri/src/games/library.rs +++ b/src-tauri/src/games/library.rs @@ -35,11 +35,11 @@ pub struct Game { m_description: String, // mDevelopers // mPublishers - m_icon_id: String, - m_banner_id: String, - m_cover_id: String, - m_image_library: Vec, - m_image_carousel: Vec, + m_icon_object_id: String, + m_banner_object_id: String, + m_cover_object_id: String, + m_image_library_object_ids: Vec, + m_image_carousel_object_ids: Vec, } #[derive(serde::Serialize, Clone)] pub struct GameUpdateEvent { diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 3d7e6a5..ae693e4 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -86,7 +86,7 @@ pub struct User { username: String, admin: bool, display_name: String, - profile_picture: String, + profile_picture_object_id: String, } diff --git a/src-tauri/src/process/process_manager.rs b/src-tauri/src/process/process_manager.rs index 2bcfd01..cdfa013 100644 --- a/src-tauri/src/process/process_manager.rs +++ b/src-tauri/src/process/process_manager.rs @@ -267,9 +267,9 @@ impl ProcessManager<'_> { .to_string(); #[cfg(target_os = "windows")] - let mut command = Command::new("cmd"); + let mut command = Command::new("start"); #[cfg(target_os = "windows")] - command.args(["/C", &launch_string]); + command.raw_arg(["/b", "\"\"", &launch_string]); info!("launching (in {}): {}", install_dir, launch_string,); diff --git a/types.ts b/types.ts index 670d17e..0635bd4 100644 --- a/types.ts +++ b/types.ts @@ -30,11 +30,11 @@ export type Game = { mName: string; mShortDescription: string; mDescription: string; - mIconId: string; - mBannerId: string; - mCoverId: string; - mImageLibrary: string[]; - mImageCarousel: string[]; + mIconObjectId: string; + mBannerObjectId: string; + mCoverObjectId: string; + mImageLibraryObjectIds: string[]; + mImageCarouselObjectIds: string[]; }; export type GameVersion = { diff --git a/yarn.lock b/yarn.lock index 84af268..b1299dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1774,6 +1774,27 @@ resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz#9e8a512eb174bfc2a333ba959bbf9de428d89ad8" integrity sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA== +"@volar/language-core@2.4.13", "@volar/language-core@~2.4.11": + version "2.4.13" + resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-2.4.13.tgz#3e03c1d46e6de82364e47cfd9a5eafd9d68706a6" + integrity sha512-MnQJ7eKchJx5Oz+YdbqyFUk8BN6jasdJv31n/7r6/WwlOOv7qzvot6B66887l2ST3bUW4Mewml54euzpJWA6bg== + dependencies: + "@volar/source-map" "2.4.13" + +"@volar/source-map@2.4.13": + version "2.4.13" + resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-2.4.13.tgz#7227bd39f6be48485a52bff24e9cf2c5db66e86d" + integrity sha512-l/EBcc2FkvHgz2ZxV+OZK3kMSroMr7nN3sZLF2/f6kWW66q8+tEL4giiYyFjt0BcubqJhBt6soYIrAPhg/Yr+Q== + +"@volar/typescript@~2.4.11": + version "2.4.13" + resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-2.4.13.tgz#1f5b6f1aa1e68a800298ba217c297cbc5318f8ae" + integrity sha512-Ukz4xv84swJPupZeoFsQoeJEOm7U9pqsEnaGGgt5ni3SCTa22m8oJP5Nng3Wed7Uw5RBELdLxxORX8YhJPyOgQ== + dependencies: + "@volar/language-core" "2.4.13" + path-browserify "^1.0.1" + vscode-uri "^3.0.8" + "@vue-macros/common@^1.16.1": version "1.16.1" resolved "https://registry.yarnpkg.com/@vue-macros/common/-/common-1.16.1.tgz#dac7ebc57ded4d6fb19d7f9a83d2973971d9fa65" @@ -1847,7 +1868,7 @@ "@vue/compiler-core" "3.5.11" "@vue/shared" "3.5.11" -"@vue/compiler-dom@3.5.13": +"@vue/compiler-dom@3.5.13", "@vue/compiler-dom@^3.5.0": version "3.5.13" resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz#bb1b8758dbc542b3658dda973b98a1c9311a8a58" integrity sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA== @@ -1901,6 +1922,14 @@ "@vue/compiler-dom" "3.5.13" "@vue/shared" "3.5.13" +"@vue/compiler-vue2@^2.7.16": + version "2.7.16" + resolved "https://registry.yarnpkg.com/@vue/compiler-vue2/-/compiler-vue2-2.7.16.tgz#2ba837cbd3f1b33c2bc865fbe1a3b53fb611e249" + integrity sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A== + dependencies: + de-indent "^1.0.2" + he "^1.2.0" + "@vue/devtools-api@^6.6.4": version "6.6.4" resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.6.4.tgz#cbe97fe0162b365edc1dba80e173f90492535343" @@ -1938,6 +1967,20 @@ dependencies: rfdc "^1.4.1" +"@vue/language-core@2.2.10": + version "2.2.10" + resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-2.2.10.tgz#5ae1e71a4e16dd59d1e4bac167f4b9c8c04d9f17" + integrity sha512-+yNoYx6XIKuAO8Mqh1vGytu8jkFEOH5C8iOv3i8Z/65A7x9iAOXA97Q+PqZ3nlm2lxf5rOJuIGI/wDtx/riNYw== + dependencies: + "@volar/language-core" "~2.4.11" + "@vue/compiler-dom" "^3.5.0" + "@vue/compiler-vue2" "^2.7.16" + "@vue/shared" "^3.5.0" + alien-signals "^1.0.3" + minimatch "^9.0.3" + muggle-string "^0.4.1" + path-browserify "^1.0.1" + "@vue/reactivity@3.5.11": version "3.5.11" resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.5.11.tgz#d27df4fba10c2de1c7234701f18247a775b7a391" @@ -2009,7 +2052,7 @@ resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.11.tgz#464b840afc89be9373addff9eeb9dfc98bf3fe2e" integrity sha512-W8GgysJVnFo81FthhzurdRAWP/byq3q2qIw70e0JWblzVhjgOMiC2GyovXrZTFQJnFVryYaKGP3Tc9vYzYm6PQ== -"@vue/shared@3.5.13", "@vue/shared@^3.5.13": +"@vue/shared@3.5.13", "@vue/shared@^3.5.0", "@vue/shared@^3.5.13": version "3.5.13" resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.13.tgz#87b309a6379c22b926e696893237826f64339b6f" integrity sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ== @@ -2109,6 +2152,11 @@ agent-base@^7.1.2: resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.3.tgz#29435eb821bc4194633a5b89e5bc4703bafc25a1" integrity sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw== +alien-signals@^1.0.3: + version "1.0.13" + resolved "https://registry.yarnpkg.com/alien-signals/-/alien-signals-1.0.13.tgz#8d6db73462f742ee6b89671fbd8c37d0b1727a7e" + integrity sha512-OGj9yyTnJEttvzhTUWuscOvtqxq5vrhF7vL9oS0xJ2mK0ItPYP1/y+vCFebfxoEyAz0++1AIwJ5CMr+Fk3nDmg== + ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" @@ -3044,6 +3092,11 @@ db0@^0.3.2: resolved "https://registry.yarnpkg.com/db0/-/db0-0.3.2.tgz#f2f19a547ac5519714a510edf0f93daf61ff7e47" integrity sha512-xzWNQ6jk/+NtdfLyXEipbX55dmDSeteLFt/ayF+wZUU5bzKgmrDOxmInUTbyVRp46YwnJdkDA1KhB7WIXFofJw== +de-indent@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" + integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg== + debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4, debug@^4.3.5: version "4.3.7" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" @@ -4085,6 +4138,11 @@ hasown@^2.0.2: dependencies: function-bind "^1.1.2" +he@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== + hookable@^5.5.3: version "5.5.3" resolved "https://registry.yarnpkg.com/hookable/-/hookable-5.5.3.tgz#6cfc358984a1ef991e2518cb9ed4a778bbd3215d" @@ -5181,7 +5239,7 @@ minimatch@^5.0.1, minimatch@^5.1.0: dependencies: brace-expansion "^2.0.1" -minimatch@^9.0.0, minimatch@^9.0.4: +minimatch@^9.0.0, minimatch@^9.0.3, minimatch@^9.0.4: version "9.0.5" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5" integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow== @@ -5295,6 +5353,11 @@ ms@^2.1.1, ms@^2.1.3: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== +muggle-string@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.4.1.tgz#3b366bd43b32f809dc20659534dd30e7c8a0d328" + integrity sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ== + mz@^2.7.0: version "2.7.0" resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" @@ -5875,6 +5938,11 @@ parseurl@^1.3.2, parseurl@^1.3.3: resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== +path-browserify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd" + integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g== + path-exists@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7" @@ -7529,7 +7597,7 @@ type-is@^1.6.16: media-typer "0.3.0" mime-types "~2.1.24" -typescript@^5.4.4: +typescript@^5.4.4, typescript@^5.8.3: version "5.8.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.3.tgz#92f8a3e5e3cf497356f4178c34cd65a7f5e8440e" integrity sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ== @@ -7917,7 +7985,7 @@ vite-plugin-vue-tracer@^0.1.3: optionalDependencies: fsevents "~2.3.3" -vscode-uri@^3.1.0: +vscode-uri@^3.0.8, vscode-uri@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.1.0.tgz#dd09ec5a66a38b5c3fffc774015713496d14e09c" integrity sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ== @@ -7948,6 +8016,14 @@ vue-router@latest: dependencies: "@vue/devtools-api" "^6.6.4" +vue-tsc@^2.2.10: + version "2.2.10" + resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-2.2.10.tgz#7b51a666cb90788884efd0caedc69fc1fc9c5b78" + integrity sha512-jWZ1xSaNbabEV3whpIDMbjVSVawjAyW+x1n3JeGQo7S0uv2n9F/JMgWW90tGWNFRKya4YwKMZgCtr0vRAM7DeQ== + dependencies: + "@volar/typescript" "~2.4.11" + "@vue/language-core" "2.2.10" + vue@^3.5.13: version "3.5.13" resolved "https://registry.yarnpkg.com/vue/-/vue-3.5.13.tgz#9f760a1a982b09c0c04a867903fc339c9f29ec0a"