From d7cadc16038cf0baf0cfabb85b23a786a67a6e12 Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Sat, 14 May 2022 02:02:52 -0400 Subject: [PATCH] Get background file using API --- src-tauri/Cargo.lock | 7 +++++++ src-tauri/Cargo.toml | 2 ++ src-tauri/src/main.rs | 11 +++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 6052185..57c6bb8 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -641,6 +641,7 @@ version = "0.1.0" dependencies = [ "futures-util", "hudsucker", + "json", "lazy_static", "open", "registry", @@ -1759,6 +1760,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "json" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" + [[package]] name = "json-patch" version = "0.2.6" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index f5bc100..305fcec 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -26,6 +26,8 @@ lazy_static = "1.4.0" registry = "1.2.1" # Program opener. open = "2.1.2" +# JSON parser. +json = "0.12.4" # Dependencies for the HTTP(S) proxy. hudsucker = "0.17.2" diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 3399fa4..86038bc 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -8,6 +8,7 @@ use open; mod downloader; mod lang; mod proxy; +mod web; fn main() { tauri::Builder::default() @@ -20,14 +21,14 @@ fn main() { downloader::stop_download, lang::get_lang ]) - .run(tauri::generate_context!()) + .run(tauri::generate_context!()) .expect("error while running tauri application"); } #[tauri::command] async fn connect(port: u16) { // Log message to console. - println!("Connecting to proxy..."); + println!("Connecting to proxy..."); // Create and start a proxy. proxy::create_proxy(port).await; @@ -58,4 +59,10 @@ fn run_jar(path: String, execute_in: String) { Ok(_) => (), Err(e) => println!("Failed to open jar ({} from {}): {}", &path, &execute_in, e), }; +} + +#[tauri::command] +async fn get_bg_file() -> String { + let query = web::query("https://api.grasscutters.xyz/cultivation/query").await; + let response_data = object!json::parse(&query); } \ No newline at end of file