Custom Games fixes

Lazap-Development · Apr 14, 2024 · e8a7db2 · e8a7db2
1 parent 7878717
commit e8a7db2
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 18 deletions.
diff --git a/src-tauri/src/launchers/custom_games.rs b/src-tauri/src/launchers/custom_games.rs
@@ -6,6 +6,28 @@ use crate::{
     },
     CONFIG_DIR,
 };
+use serde::{Serialize, Deserialize};
+
+#[derive(Debug, Serialize, Deserialize)]
+struct GameData {
+    banner_path: String,
+    executable: String,
+    location: String,
+    display_name: String,
+    game_id: String,
+    launch_id: String,
+    size: i64,
+    launch_command: String,
+    launcher_name: String,
+    args: Vec<String>,
+    #[serde(default)]
+    lastlaunch: i64,
+    #[serde(default)]
+    launches: i32,
+    #[serde(default)]
+    favourite: bool,
+}
+
 pub async fn get_installed_games() -> Vec<GameObject> {
     let games_data = read_file(format!(
         "{}/cache/games/data.json",
@@ -22,18 +44,21 @@ pub async fn get_installed_games() -> Vec<GameObject> {
 
 #[tauri::command]
 pub async fn add_custom_game(location: String, display_name: String) {
-    let mut obj: GameObject = GameObject::new(
-        "".to_string(),
-        "".to_string(),
-        "".to_string(),
-        display_name,
-        "CustomGame".to_string(),
-        "".to_string(),
-        0,
-        "".to_string(),
-        "CustomGame".to_string(),
-        vec![],
-    );
+    let mut obj: GameData = GameData {
+        banner_path: "".to_string(),
+        executable: "".to_string(),
+        location: "".to_string(),
+        display_name: display_name,
+        game_id: "CustomGame".to_string(),
+        launch_id: "".to_string(),
+        size: 0,
+        launch_command: "".to_string(),
+        launcher_name: "CustomGame".to_string(),
+        args: vec![],
+        lastlaunch: 0,
+        launches: 0,
+        favourite: false,
+    };
     obj.executable = location
         .split("\\")
         .collect::<Vec<_>>()
@@ -73,7 +98,7 @@ pub async fn add_custom_game(location: String, display_name: String) {
             bannername
         );
     }
-    let mut games_data: Vec<GameObject> = serde_json::from_str(
+    let mut games_data: Vec<GameData> = serde_json::from_str(
         &read_file(format!(
             "{}/cache/games/data.json",
             CONFIG_DIR.lock().unwrap()

diff --git a/src/App.vue b/src/App.vue
@@ -340,8 +340,8 @@ export default {
           );
           data = data.filter(
             (a) =>
-              a.DisplayName !=
-              document.getElementById("removeGame").parentNode.parentNode
+              a.display_name !=
+              document.getElementById("removeGame").parentNode
                 .firstChild.innerHTML
           );
           await invoke("write_file", {

diff --git a/src/components/AllGames.vue b/src/components/AllGames.vue
@@ -115,7 +115,7 @@ export default {
           newGameLocation
         ) {
           await invoke("add_custom_game", {
-            location: newGameLocation.split("\\").slice(0, -1).join("\\"),
+            location: newGameLocation,
             displayName: document.getElementById("inputGameName").value,
           });
           loadGames("allGamesList");

diff --git a/src/components/find-games.vue b/src/components/find-games.vue
@@ -504,15 +504,15 @@ export default {
 
         let data = await storage.getGamesData();
         data = data
-          .filter((x) => typeof x.launches === "number")
+          .filter((x) => typeof x.launches === "number" && x.launches != 0)
           .sort((a, b) => b.launches - a.launches)
           .slice(0, 5);
 
         return data;
       } else if (listID === "recentGamesList") {
         let data = await storage.getGamesData();
         data = data
-          .filter((x) => typeof x.launches === "number")
+          .filter((x) => typeof x.launches === "number" && x.launches != 0)
           .sort((a, b) => b.launches - a.launches);
         return data;
       } else if (listID === "allGamesList") {