lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-04-14 17:03:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

raw_get -> get

Browse source
This commit is contained in:
Filip Tibell 2024-02-13 16:45:17 +01:00
parent 2b1b0dab22
commit 3702bc98bd
No known key found for this signature in database
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/lune/builtins/net/config.rs
View file

@ -26,7 +26,7 @@ impl<'lua> FromLua<'lua> for RequestConfigOptions {
return Ok(Self::default()); return Ok(Self::default());
} else if let LuaValue::Table(tab) = value { } else if let LuaValue::Table(tab) = value {
// Extract flags // Extract flags
let decompress = match tab.raw_get::<_, Option<bool>>("decompress") { let decompress = match tab.get::<_, Option<bool>>("decompress") {
Ok(decomp) => Ok(decomp.unwrap_or(true)), Ok(decomp) => Ok(decomp.unwrap_or(true)),
Err(_) => Err(LuaError::RuntimeError( Err(_) => Err(LuaError::RuntimeError(
"Invalid option value for 'decompress' in request config options".to_string(), "Invalid option value for 'decompress' in request config options".to_string(),
@ -72,27 +72,27 @@ impl FromLua<'_> for RequestConfig {
// If we got a table we are able to configure the entire request // If we got a table we are able to configure the entire request
if let LuaValue::Table(tab) = value { if let LuaValue::Table(tab) = value {
// Extract url // Extract url
let url = match tab.raw_get::<_, LuaString>("url") { let url = match tab.get::<_, LuaString>("url") {
Ok(config_url) => Ok(config_url.to_string_lossy().to_string()), Ok(config_url) => Ok(config_url.to_string_lossy().to_string()),
Err(_) => Err(LuaError::runtime("Missing 'url' in request config")), Err(_) => Err(LuaError::runtime("Missing 'url' in request config")),
}?; }?;
// Extract method // Extract method
let method = match tab.raw_get::<_, LuaString>("method") { let method = match tab.get::<_, LuaString>("method") {
Ok(config_method) => config_method.to_string_lossy().trim().to_ascii_uppercase(), Ok(config_method) => config_method.to_string_lossy().trim().to_ascii_uppercase(),
Err(_) => "GET".to_string(), Err(_) => "GET".to_string(),
}; };
// Extract query // Extract query
let query = match tab.raw_get::<_, LuaTable>("query") { let query = match tab.get::<_, LuaTable>("query") {
Ok(tab) => table_to_hash_map(tab, "query")?, Ok(tab) => table_to_hash_map(tab, "query")?,
Err(_) => HashMap::new(), Err(_) => HashMap::new(),
}; };
// Extract headers // Extract headers
let headers = match tab.raw_get::<_, LuaTable>("headers") { let headers = match tab.get::<_, LuaTable>("headers") {
Ok(tab) => table_to_hash_map(tab, "headers")?, Ok(tab) => table_to_hash_map(tab, "headers")?,
Err(_) => HashMap::new(), Err(_) => HashMap::new(),
}; };
// Extract body // Extract body
let body = match tab.raw_get::<_, LuaString>("body") { let body = match tab.get::<_, LuaString>("body") {
Ok(config_body) => Some(config_body.as_bytes().to_owned()), Ok(config_body) => Some(config_body.as_bytes().to_owned()),
Err(_) => None, Err(_) => None,
}; };
@ -112,7 +112,7 @@ impl FromLua<'_> for RequestConfig {
))), ))),
}?; }?;
// Parse any extra options given // Parse any extra options given
let options = match tab.raw_get::<_, LuaValue>("options") { let options = match tab.get::<_, LuaValue>("options") {
Ok(opts) => RequestConfigOptions::from_lua(opts, lua)?, Ok(opts) => RequestConfigOptions::from_lua(opts, lua)?,
Err(_) => RequestConfigOptions::default(), Err(_) => RequestConfigOptions::default(),
}; };
@ -158,9 +158,9 @@ impl<'lua> FromLua<'lua> for ServeConfig<'lua> {
}) })
} }
LuaValue::Table(t) => { LuaValue::Table(t) => {
let handle_request: Option<LuaFunction> = t.raw_get("handleRequest")?; let handle_request: Option<LuaFunction> = t.get("handleRequest")?;
let handle_web_socket: Option<LuaFunction> = t.raw_get("handleWebSocket")?; let handle_web_socket: Option<LuaFunction> = t.get("handleWebSocket")?;
let address: Option<LuaString> = t.raw_get("address")?; let address: Option<LuaString> = t.get("address")?;
if handle_request.is_some() || handle_web_socket.is_some() { if handle_request.is_some() || handle_web_socket.is_some() {
return Ok(ServeConfig { return Ok(ServeConfig {
handle_request: handle_request.unwrap_or_else(|| { handle_request: handle_request.unwrap_or_else(|| {