Merge pull request #147 from Lazap-Development/nightly

v0.8.1 Release Candidiate
Lazap-Development · Apr 28, 2024 · 9c79fbd · 9c79fbd
2 parents a6da996 + a21188a
commit 9c79fbd
Show file tree

Hide file tree

Showing 24 changed files with 435 additions and 443 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lazap",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "type": "module",
   "author": "Lazap Development",
   "license": "ISC",

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "lazap"
-version = "0.8.0"
+version = "0.8.1"
 description = "Lazap Launcher"
 authors = ["Lazap-Development"]
 license = "CC BY-NC-SA 4.0"
@@ -79,7 +79,7 @@ strip = true
 [features]
 # by default Tauri runs in production mode
 # when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL
-default = [ "custom-protocol" ]
+default = ["custom-protocol"]
 # this feature is used used for production builds where `devPath` points to the filesystem
 # DO NOT remove this
-custom-protocol = [ "tauri/custom-protocol" ]
+custom-protocol = ["tauri/custom-protocol"]
diff --git a/src-tauri/src/addons/spotify.rs b/src-tauri/src/addons/spotify.rs
@@ -28,8 +28,8 @@ const CUSTOM_ENGINE: engine::GeneralPurpose =
 #[actix_web::main]
 pub async fn main() -> std::io::Result<()> {
     unsafe {
-        // SPOTIFY_CLIENT_ID = "".to_string();
-        // SPOTIFY_CLIENT_SECRET = "".to_string();
+        // SPOTIFY_CLIENT_ID = String::new();
+        // SPOTIFY_CLIENT_SECRET = String::new();
 
         if SPOTIFY_CLIENT_ID.is_empty() || SPOTIFY_CLIENT_SECRET.is_empty() {
             let spotify_client_id = option_env!("SPOTIFY_CLIENT_ID");

diff --git a/src-tauri/src/launchers/custom_games.rs b/src-tauri/src/launchers/custom_games.rs
@@ -45,14 +45,14 @@ pub async fn get_installed_games() -> Vec<GameObject> {
 #[tauri::command]
 pub async fn add_custom_game(location: String, display_name: String) {
     let mut obj: GameData = GameData {
-        banner_path: "".to_string(),
-        executable: "".to_string(),
-        location: "".to_string(),
+        banner_path: String::new(),
+        executable: String::new(),
+        location: String::new(),
         display_name: display_name,
         game_id: "CustomGame".to_string(),
-        launch_id: "".to_string(),
+        launch_id: String::new(),
         size: 0,
-        launch_command: "".to_string(),
+        launch_command: String::new(),
         launcher_name: "CustomGame".to_string(),
         args: vec![],
         lastlaunch: 0,

diff --git a/src-tauri/src/launchers/gog.rs b/src-tauri/src/launchers/gog.rs
@@ -111,13 +111,13 @@ pub async fn get_installed_games() -> Vec<GameObject> {
         let img_data: ImageData = serde_json::from_str(&game_data.banner).unwrap();
         gameobjects.push(GameObject::new(
             banners::get_banner(&game_data.title, &(product_id.to_string()), "GOG", &img_data.icon).await,
-            "".to_string(),
+            String::new(),
             game.installation_path.to_string(),
             game_data.title.to_string(),
             product_id.to_string(),
             format!("\"{}\"", launcher_location) + " /command=runGame" + &format!(" /gameId={}", game.product_id) + &format!(" /path=\"{}\"", game.installation_path),
             0,
-            "".to_string(),
+            String::new(),
             "GOG".to_string(),
             vec![],
         ));

diff --git a/src-tauri/src/launchers/minecraft.rs b/src-tauri/src/launchers/minecraft.rs
@@ -72,7 +72,7 @@ async fn get_minecraft_launcher() -> Option<GameObject> {
                     "Minecraft".to_string(),
                     "0".to_string(),
                     0,
-                    "".to_string(),
+                    String::new(),
                     "Minecraft".to_string(),
                     args,
                 ));
@@ -114,7 +114,7 @@ async fn get_minecraft_launcher() -> Option<GameObject> {
                 "Minecraft".to_string(),
                 "0".to_string(),
                 0,
-                "".to_string(),
+                String::new(),
                 "Minecraft".to_string(),
                 vec![],
             ));
@@ -151,7 +151,7 @@ async fn get_minecraft_launcher() -> Option<GameObject> {
             "Minecraft".to_string(),
             "0".to_string(),
             0,
-            "".to_string(),
+            String::new(),
             "Minecraft".to_string(),
             vec![],
         ));

diff --git a/src-tauri/src/launchers/riot_games.rs b/src-tauri/src/launchers/riot_games.rs
@@ -86,7 +86,7 @@ pub async fn parse_game_object(path: &str, game: &str) -> GameObject {
         game.to_string(),
         0.to_string(),
         0,
-        "".to_string(),
+        String::new(),
         "RiotGames".to_string(),
         args,
     );

diff --git a/src-tauri/src/launchers/rockstar_games.rs b/src-tauri/src/launchers/rockstar_games.rs
@@ -288,7 +288,7 @@ async fn parse_game_object(path: &str, name: &str) -> Option<GameObject> {
                 format!("{}-{}", game.title_id, game.ros_title_id),
                 "0".to_string(),
                 0,
-                "".to_string(),
+                String::new(),
                 "RockstarGames".to_string(),
                 vec![],
             ));

diff --git a/src-tauri/src/launchers/steam.rs b/src-tauri/src/launchers/steam.rs
@@ -131,41 +131,41 @@ pub async fn get_installed_games() -> Vec<GameObject> {
             #[cfg(target_os = "macos")]
             temp_all_games.push(GameObject::new(
                 banners::get_banner(&game_file_parsed.name, &game_file_parsed.appid, "Steam", "").await,
-                "".to_string(),
+                String::new(),
                 game_file_parsed.installdir.to_string(),
                 game_file_parsed.name,
                 game_file_parsed.appid.parse().unwrap(),
                 "0".to_string(),
                 game_file_parsed.size_on_disk.parse().unwrap(),
-                "".to_string(),
+                String::new(),
                 "Steam".to_string(),
                 vec![],
             ));
 
             #[cfg(target_os = "windows")]
             temp_all_games.push(GameObject::new(
                 banners::get_banner(&game_file_parsed.name, &game_file_parsed.appid, "Steam", "").await,
-                "".to_string(),
+                String::new(),
                 game_file_parsed.launcherpath.to_string(),
                 game_file_parsed.name,
                 game_file_parsed.appid.parse().unwrap(),
                 "0".to_string(),
                 game_file_parsed.size_on_disk.parse().unwrap(),
-                "".to_string(),
+                String::new(),
                 "Steam".to_string(),
                 vec![],
             ));
 
             #[cfg(target_os = "linux")]
             temp_all_games.push(GameObject::new(
                 banners::get_banner(&game_file_parsed.name, &game_file_parsed.appid, "Steam", "").await,
-                "".to_string(),
-                "".to_string(),
+                String::new(),
+                String::new(),
                 game_file_parsed.name,
                 game_file_parsed.appid.parse().unwrap(),
                 "0".to_string(),
                 game_file_parsed.size_on_disk.parse().unwrap(),
-                "".to_string(),
+                String::new(),
                 "Steam".to_string(),
                 vec![],
             ));

diff --git a/src-tauri/src/launchers/uplay.rs b/src-tauri/src/launchers/uplay.rs
@@ -32,13 +32,13 @@ pub async fn get_installed_games() -> Vec<GameObject> {
                 if !game_res_loc.is_empty() {
                     all_games.push(GameObject::new(
                         banners::get_banner(&y, "", "Uplay", "").await,
-                        "".to_string(),
+                        String::new(),
                         game_res_loc,
                         y,
                         123.to_string(),
-                        "".to_string(),
+                        String::new(),
                         0,
-                        "".to_string(),
+                        String::new(),
                         "Uplay".to_string(),
                         vec![],
                     ));

diff --git a/src-tauri/src/launchers/wine_managers.rs b/src-tauri/src/launchers/wine_managers.rs
@@ -82,7 +82,7 @@ async fn get_lutris_games() -> Option<Vec<GameObject>> {
             game.game_id,
             game.launch_id.to_string(),
             game.size,
-            "".to_string(),
+            String::new(),
             "Lutris".to_string(),
             vec![],
         ))

diff --git a/src-tauri/src/launchers/xbox_games.rs b/src-tauri/src/launchers/xbox_games.rs
@@ -181,9 +181,9 @@ pub fn parse_game_object(game: XboxGame) -> Option<GameObject> {
         location.to_string(),
         game.name,
         game.package_full_name,
-        "".to_string(),
+        String::new(),
         0,
-        "".to_string(),
+        String::new(),
         "XboxGames".to_string(),
         vec![],
     );

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -67,7 +67,6 @@ fn main() {
             if !window.is_visible().unwrap() {
                 window.show().unwrap()
             }
-
             app.emit_all("single-instance", Payload { args: argv, cwd })
                 .unwrap();
         }))

diff --git a/src-tauri/src/modules/banners.rs b/src-tauri/src/modules/banners.rs
@@ -6,9 +6,17 @@ use std::{
 use reqwest::header::{ACCEPT, CONTENT_TYPE};
 use serde::Deserialize;
 
-use crate::{operations::{custom_fs::d_f_exists, misc::sha256}, CONFIG_DIR};
+use crate::{
+    operations::{custom_fs::d_f_exists, misc::sha256},
+    CONFIG_DIR,
+};
 
-pub async fn get_banner(display_name: &str, game_id: &str, launcher_name: &str, url: &str) -> String {
+pub async fn get_banner(
+    display_name: &str,
+    game_id: &str,
+    launcher_name: &str,
+    url: &str,
+) -> String {
     match launcher_name {
         "Steam" => {
             return fetch_banner(
@@ -53,7 +61,7 @@ pub async fn get_banner(display_name: &str, game_id: &str, launcher_name: &str,
             if display_name.replace(" ", "_") == "Rockstar_Games_Launcher" {
                 return fetch_banner(format!("https://cdn.player.one/sites/player.one/files/2019/08/26/rockstar-games.png"), display_name).await;
             }
-            return "".to_string();
+            return String::new();
         }
         // "XboxGames" => {
         //     return fetch_banner(url.to_string(), display_name).await;
@@ -79,10 +87,7 @@ pub async fn get_banner(display_name: &str, game_id: &str, launcher_name: &str,
 }
 
 async fn fetch_banner(url: String, display_name: &str) -> String {
-    let banners_dir = format!(
-        "{}/cache/games/banners",
-        CONFIG_DIR.lock().unwrap()
-    );
+    let banners_dir = format!("{}/cache/games/banners", CONFIG_DIR.lock().unwrap());
 
     let dispsha256 = sha256(display_name.replace(" ", "_")).await.unwrap();
     let file_path: String = format!("{}/{}.png", banners_dir, dispsha256);
@@ -110,10 +115,7 @@ struct GameWithinRawg {
 }
 
 async fn rawg_fetch_banner(display_name: &str) -> String {
-    let banners_dir = format!(
-        "{}/cache/games/banners",
-        CONFIG_DIR.lock().unwrap()
-    );
+    let banners_dir = format!("{}/cache/games/banners", CONFIG_DIR.lock().unwrap());
 
     let dispsha256 = sha256(display_name.replace(" ", "_")).await.unwrap();
     let file_path: String = format!("{}/{}.png", banners_dir, dispsha256);
@@ -132,18 +134,19 @@ async fn rawg_fetch_banner(display_name: &str) -> String {
 
     match response.status() {
         reqwest::StatusCode::OK => {
-            let banner_response = reqwest::get(
-                &response
-                    .json::<RAWGApi>()
-                    .await
-                    .unwrap()
-                    .results
-                    .get(0)
-                    .unwrap()
-                    .background_image,
-            )
-            .await
-            .unwrap();
+            let background_image_url =
+                match response.json::<RAWGApi>().await.unwrap().results.get(0) {
+                    Some(result) => result.background_image.clone(),
+                    None => return String::new(),
+                };
+
+            let banner_response = match reqwest::get(&background_image_url).await {
+                Ok(response) => response,
+                Err(err) => {
+                    eprintln!("Error fetching background image: {}", err);
+                    return String::new();
+                }
+            };
             let mut file = File::create(&file_path).unwrap();
 
             let mut content = Cursor::new(banner_response.bytes().await.unwrap());
@@ -153,7 +156,7 @@ async fn rawg_fetch_banner(display_name: &str) -> String {
         }
         _ => {
             println!("Something unexpected happened... Trace -> init_reqwest");
-            return "".to_string();
+            return String::new();
         }
     }
 }
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Lazap",
-    "version": "0.8.0"
+    "version": "0.8.1"
   },
   "tauri": {
     "macOSPrivateApi": true,
@@ -70,8 +70,8 @@
     },
     "bundle": {
       "active": true,
-      "category": "DeveloperTool",
-      "copyright": "",
+      "category": "Utility",
+      "copyright": "CC BY-NC-SA 4.0",
       "deb": {
         "depends": []
       },
@@ -93,7 +93,7 @@
         "signingIdentity": null
       },
       "resources": [],
-      "shortDescription": "",
+      "shortDescription": "Lazap",
       "targets": "all",
       "windows": {
         "certificateThumbprint": null,