properly handle response

mbari-org · Feb 6, 2024 · 4225c76 · 4225c76
1 parent 84bcb44
commit 4225c76
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "odss2dash"
-version = "2.1.2"
+version = "2.2.0"
 authors = [
     "Carlos A. Rueda <[email protected]>",
 ]

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,9 @@
 2024-02
 
+2.2.0
+
+- trackdb_client: properly handle response, e.g., when an invalid platform ID is queried.
+
 2.1.2
 
 - some lib updates 

diff --git a/src/trackdb_client.rs b/src/trackdb_client.rs
@@ -51,9 +51,16 @@ pub fn get_platforms() -> Vec<PlatformRes> {
     match request.send() {
         Ok(res) => {
             if res.is_success() {
-                let platforms_res = res.json::<Vec<PlatformRes>>().unwrap();
-                log::debug!("odss platforms_res = {:?}", platforms_res);
-                platforms_res
+                match res.json::<Vec<PlatformRes>>() {
+                    Ok(platforms_res) => {
+                        log::debug!("odss platforms_res = {:?}", platforms_res);
+                        platforms_res
+                    }
+                    Err(e) => {
+                        log::error!("could not parse response: {}", e);
+                        vec![]
+                    }
+                }
             } else {
                 log::error!(
                     "GET {endpoint}: response: status={}, body={}",
@@ -79,9 +86,16 @@ pub fn get_platform(platform_id: &str) -> Option<PlatformRes> {
     match request.send() {
         Ok(res) => {
             if res.is_success() {
-                let platforms_res = res.json::<PlatformRes>().unwrap();
-                log::debug!("odss platform_res = {:?}", platforms_res);
-                Some(platforms_res)
+                match res.json::<PlatformRes>() {
+                    Ok(platform_res) => {
+                        log::debug!("odss platform_res = {:?}", platform_res);
+                        Some(platform_res)
+                    }
+                    Err(e) => {
+                        log::error!("could not parse response: {}", e);
+                        None
+                    }
+                }
             } else {
                 log::error!(
                     "GET {endpoint} response: status={}, body={}",