feat: fallback to default values for Linux field, add json files tests

Heroic-Games-Launcher · Mar 31, 2023 · 6f09c77 · 6f09c77
1 parent 03c5ca7
commit 6f09c77
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 8 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -2,7 +2,6 @@
 extern crate rocket;
 use rocket::{http::Status, serde::json};
 use structs::{GOGConfig, PlatformConfig};
-use tokio::fs;
 
 mod structs;
 mod utils;
@@ -22,13 +21,13 @@ async fn get_config(id: String) -> (Status, Option<json::Json<GOGConfig>>) {
 
     let mut gog_config = gog_config.unwrap();
 
-    let data_file = fs::canonicalize(format!("./games_data/{id}.json")).await; // This will return error if path doesn't exist
-    if let Ok(data_file) = data_file {
-        let raw_data = fs::read_to_string(&data_file).await.unwrap();
-        if let Ok(config) = serde_json::from_str::<PlatformConfig>(&raw_data) {
-            gog_config.content.linux = Some(config);
-        };
+    match utils::read_linux_config(id).await {
+        Some(linux_config) => {
+            gog_config.content.linux = Some(linux_config);
+        }
+        None => gog_config.content.linux = Some(PlatformConfig::default()),
     }
+
     (Status::Ok, Some(json::Json(gog_config)))
 }
 

diff --git a/src/structs.rs b/src/structs.rs
@@ -30,6 +30,18 @@ pub struct PlatformConfig {
     pub cloud_storage: CloudStorage,
 }
 
+impl PlatformConfig {
+    pub fn default() -> PlatformConfig {
+        PlatformConfig {
+            overlay: Overlay { supported: false },
+            cloud_storage: CloudStorage {
+                enabled: false,
+                locations: Vec::new(),
+            },
+        }
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 pub struct GOGConfigContent {
     #[serde(rename = "MacOS")]

diff --git a/src/utils.rs b/src/utils.rs
@@ -1,4 +1,5 @@
-use crate::structs::GOGConfig;
+use crate::structs::{GOGConfig, PlatformConfig};
+use tokio::fs;
 
 pub async fn get_gog_remote_config(id: String) -> Option<GOGConfig> {
     let response = reqwest::get(format!("https://remote-config.gog.com/components/galaxy_client/clients/{id}?component_version=2.0.50")).await;
@@ -15,3 +16,36 @@ pub async fn get_gog_remote_config(id: String) -> Option<GOGConfig> {
         Err(_) => None,
     }
 }
+
+pub async fn read_linux_config(id: String) -> Option<PlatformConfig> {
+    let data_file = fs::canonicalize(format!("./games_data/{id}.json")).await; // This will return error if path doesn't exist
+    if let Ok(data_file) = data_file {
+        let raw_data = fs::read_to_string(&data_file).await.unwrap();
+        if let Ok(config) = serde_json::from_str::<PlatformConfig>(&raw_data) {
+            return Some(config);
+        };
+    }
+    None
+}
+
+#[async_test]
+async fn check_configs() {
+    let mut read_dir = fs::read_dir("./games_data/")
+        .await
+        .expect("Failed to read games data config");
+
+    loop {
+        let file = read_dir.next_entry().await;
+        if file.is_err() {
+            break;
+        }
+
+        if let Some(file) = file.unwrap() {
+            let path = file.path();
+            let raw_data = fs::read_to_string(&path).await.unwrap();
+            serde_json::from_str::<PlatformConfig>(&raw_data).expect("Failed to parse json file");
+        } else {
+            break;
+        }
+    }
+}