mirror of
https://github.com/Astatin3/unshell.git
synced 2026-06-09 06:47:59 -06:00
Make config use dropdown
This commit is contained in:
@@ -21,7 +21,8 @@ pub async fn start_api(address: &str, database: Database) {
|
||||
|
||||
let mut router = Router::new().route("/api/auth", post(auth::sign_in));
|
||||
router = route_get_trees(router);
|
||||
router = route_get_keys(router);
|
||||
router = route_get_all_tree_values(router);
|
||||
router = route_get_tree_keys(router);
|
||||
router = route_trees(router);
|
||||
|
||||
axum::serve(listener, router.with_state(database))
|
||||
@@ -46,7 +47,7 @@ fn route_get_trees(router: Router<Database>) -> Router<Database> {
|
||||
}
|
||||
|
||||
// Route the "keys" api for each tree
|
||||
fn route_get_keys(router: Router<Database>) -> Router<Database> {
|
||||
fn route_get_tree_keys(router: Router<Database>) -> Router<Database> {
|
||||
router.route(
|
||||
"/api/keys/{*path}",
|
||||
get(
|
||||
@@ -63,6 +64,24 @@ fn route_get_keys(router: Router<Database>) -> Router<Database> {
|
||||
)
|
||||
}
|
||||
|
||||
// Route the "values" api to get all the values for each tree
|
||||
fn route_get_all_tree_values(router: Router<Database>) -> Router<Database> {
|
||||
router.route(
|
||||
"/api/values/{*path}",
|
||||
get(
|
||||
async |State(database): State<Database>,
|
||||
Path(path): Path<String>,
|
||||
Extension(_): Extension<CurrentUser>| {
|
||||
debug!("GET /api/values/{}", path);
|
||||
let result = database.all_tree_values(&path);
|
||||
|
||||
Json(serde_json::to_value(result).unwrap())
|
||||
},
|
||||
)
|
||||
.layer(middleware::from_fn(auth::authorize)),
|
||||
)
|
||||
}
|
||||
|
||||
// Loop through all trees and add /api/<tree>/<path> POST aand GET listeners for them
|
||||
fn route_trees(mut router: Router<Database>) -> Router<Database> {
|
||||
for tree in crate::DATABASE_TREES.iter() {
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
use std::collections::HashMap;
|
||||
|
||||
use sled::Tree;
|
||||
use unshell_lib::error;
|
||||
|
||||
@@ -28,17 +30,6 @@ impl Database {
|
||||
.collect::<Vec<String>>()
|
||||
}
|
||||
|
||||
pub fn get_keys(&self, tree_name: &str) -> Result<Vec<String>, String> {
|
||||
Ok(self
|
||||
.get_tree(tree_name)?
|
||||
.iter()
|
||||
.keys()
|
||||
.map(|key| {
|
||||
String::from_utf8_lossy(&key.expect("This key should exist").to_vec()).to_string()
|
||||
})
|
||||
.collect::<Vec<String>>())
|
||||
}
|
||||
|
||||
pub fn put_value(&self, tree_name: &str, key: &str, value: &str) -> Result<(), String> {
|
||||
match self.get_tree(tree_name)?.insert(key, value) {
|
||||
Ok(_) => Ok(()),
|
||||
@@ -62,6 +53,29 @@ impl Database {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_keys(&self, tree_name: &str) -> Result<Vec<String>, String> {
|
||||
Ok(self
|
||||
.get_tree(tree_name)?
|
||||
.iter()
|
||||
.keys()
|
||||
.map(|key| {
|
||||
String::from_utf8_lossy(&key.expect("This key should exist").to_vec()).to_string()
|
||||
})
|
||||
.collect::<Vec<String>>())
|
||||
}
|
||||
|
||||
pub fn all_tree_values(&self, tree_name: &str) -> Result<HashMap<String, String>, String> {
|
||||
Ok(self
|
||||
.get_keys(tree_name)?
|
||||
.iter()
|
||||
.map(|key| -> Result<(String, String), String> {
|
||||
Ok((key.clone(), self.get_value(tree_name, &key)?))
|
||||
})
|
||||
.collect::<Result<Vec<(String, String)>, String>>()?
|
||||
.into_iter()
|
||||
.collect::<HashMap<String, String>>())
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for Database {
|
||||
|
||||
Reference in New Issue
Block a user