diff --git a/src/main.rs b/src/main.rs index bb756f2..c511bc0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -33,7 +33,7 @@ async fn api_allow( totals: &State>, ) -> Result, Status> { let result = rules.allow(rule).await; - totals.set_entries(rules.rules().await); + totals.set_entries(rules.total().await); info!("Delete `{rule}` from the in-memory rules (operation status: {result:?})"); Ok(Json(result.map_err(|e| { error!("Allow request handle error for `{rule}`: `{e}`"); @@ -48,7 +48,7 @@ async fn api_block( totals: &State>, ) -> Result, Status> { let result = rules.block(rule).await; - totals.set_entries(rules.rules().await); + totals.set_entries(rules.total().await); info!("Add `{rule}` to the in-memory rules (operation status: {result:?})"); Ok(Json(result.map_err(|e| { error!("Block request handle error for `{rule}`: `{e}`"); @@ -58,9 +58,9 @@ async fn api_block( #[rocket::get("/api/rules")] async fn api_rules(rules: &State>) -> Result>, Status> { - let result = rules.list().await; - info!("Get rules (total: {})", result.len()); - Ok(Json(result)) + let active = rules.active().await; + info!("Get rules (total: {})", active.len()); + Ok(Json(active)) } #[rocket::launch] @@ -71,7 +71,7 @@ async fn rocket() -> _ { let rules = Arc::new(Rules::from_opt(&opt.allow_list).await.unwrap()); - let totals = Arc::new(Total::with_rules(rules.rules().await)); + let totals = Arc::new(Total::with_rules(rules.total().await)); tokio::spawn({ let socks_rules = rules.clone(); diff --git a/src/rules.rs b/src/rules.rs index bc23499..0aaa466 100644 --- a/src/rules.rs +++ b/src/rules.rs @@ -58,7 +58,7 @@ impl Rules { }) } /// Get total rules from the current session - pub async fn rules(&self) -> u64 { + pub async fn total(&self) -> u64 { self.0.read().await.len() as u64 } /// Allow given `rule` @@ -72,15 +72,15 @@ impl Rules { Ok(self.0.write().await.remove(&Item::from_line(rule))) } /// Return active rules (from server memory) - pub async fn list(&self) -> Vec { - let mut list: Vec = self + pub async fn active(&self) -> Vec { + let mut rules: Vec = self .0 .read() .await .iter() .map(|item| item.to_string()) .collect(); - list.sort(); // HashSet does not keep the order - list + rules.sort(); // HashSet does not keep the order + rules } }