alhp_api general should be working

crates/alhp_api/src/lib.rs

@@ -1,14 +1,15 @@
-use log::{error, info};
-use reqwest::StatusCode;
-use reqwest::blocking::Client;
-use serde::{Deserialize, Serialize};
-use std::error::Error;
-use std::fmt;
-
 const API_BASE_URL: &str = "https://api.alhp.dev";
 const API_PACKAGES_EXT: &str = "/packages?";
 const API_GENERAL_EXT: &str = "/stats?";
 
+pub mod packages {
+    use crate::{API_BASE_URL, API_PACKAGES_EXT};
+    use log::{error, info};
+    use reqwest::StatusCode;
+    use serde::{Deserialize, Serialize};
+    use std::error::Error;
+    use std::fmt;
+
     #[derive(Debug, Clone, Copy, Serialize, Deserialize, Eq, PartialEq)]
     #[serde(rename_all = "lowercase")]
     pub enum PackageStatus {
@@ -101,14 +102,11 @@ impl PackageRequest {
                 API_PACKAGES_EXT,
                 self.query_string()
             );
-        println!("{}", query_url);
-        let client = Client::new();
             info!("Fetching URL: {}", query_url);
-        let response = client.get(query_url).send()?;
+            let response = reqwest::blocking::get(query_url)?;
             match response.status() {
                 StatusCode::OK => {
                     let response = response.text()?;
-                println!("{}", response);
                     match serde_json::from_str(&response) {
                         Ok(json) => Ok(json),
                         Err(e) => {
@@ -137,7 +135,69 @@ impl PackageRequest {
                         API_PACKAGES_EXT,
                         self.query_string()
                     );
-                panic!("Unexpected server response: {:?} for query url: {}", response, query_url);
+                    panic!(
+                        "Unexpected server response: {:?} for query url: {}",
+                        response, query_url
+                    );
+                }
+            }
+        }
+    }
+}
+
+pub mod general {
+    use crate::{API_BASE_URL, API_GENERAL_EXT};
+    use log::error;
+    use reqwest::StatusCode;
+    use serde::{Deserialize, Serialize};
+    use std::error::Error;
+
+    #[derive(Debug, Clone, Serialize, Deserialize)]
+    pub struct LtoStats {
+        pub enabled: usize,
+        pub disabled: usize,
+        pub unknown: usize,
+    }
+
+    #[derive(Debug, Clone, Serialize, Deserialize)]
+    pub struct GeneralResponse {
+        pub failed: usize,
+        pub skipped: usize,
+        pub latest: usize,
+        pub queued: usize,
+        pub lto: LtoStats,
+    }
+
+    #[derive(Debug, Clone, Serialize, Deserialize)]
+    pub struct GeneralRequest {
+        //No params yet.
+    }
+    impl GeneralRequest {
+        pub fn response(&self) -> Result<GeneralResponse, Box<dyn Error>> {
+            let query_url = format!("{}{}", API_BASE_URL, API_GENERAL_EXT);
+            let response = reqwest::blocking::get(query_url)?;
+            match response.status() {
+                StatusCode::OK => {
+                    let response = response.text()?;
+                    match serde_json::from_str(&response) {
+                        Ok(json) => Ok(json),
+                        Err(e) => {
+                            error!("Failed to deserialize JSON: {}", e);
+                            error!("Response body: {}", response);
+                            Err(Box::new(e))
+                        }
+                    }
+                }
+                StatusCode::INTERNAL_SERVER_ERROR => {
+                    panic!("Internal Server Error");
+                }
+                _ => {
+                    let query_url = format!("{}{}", API_BASE_URL, API_GENERAL_EXT,);
+                    panic!(
+                        "Unexpected server response: {:?} for query url: {}",
+                        response, query_url
+                    );
+                }
             }
         }
     }

src/main.rs

@@ -1,6 +1,7 @@
 use alhp_api;
-use alpm::{Alpm};
-use alhp_api::{PackageRequest, PackageStatus};
+use alhp_api::general::GeneralRequest;
+use alhp_api::packages::{PackageRequest, PackageStatus};
+use alpm::Alpm;
 
 fn query_installed_packages() {
     let alpm = match Alpm::new("/", "/var/lib/pacman") {
@@ -18,12 +19,16 @@ fn main() {
     let pkg = PackageRequest {
         status: vec![PackageStatus::Building, PackageStatus::Queued],
         pkgbase: None,
-        exact: true,
-        repo: Some("extra-x86-64-v3".to_string()),
+        exact: false,
+        // repo: Some("extra-x86-64-v3".to_string()),
+        repo: None,
         offset: 0,
         limit: 0,
     };
     let pkg = pkg.response().unwrap();
     println!("{:#?}", pkg);
+    let stats = GeneralRequest {};
+    let stats = stats.response().unwrap();
+    println!("{:#?}", stats);
     query_installed_packages();
 }