mirror of
https://codeberg.org/YGGverse/psocks.git
synced 2026-04-01 00:45:27 +00:00
implement list reload method; reload list on enable request
This commit is contained in:
parent
a27d7a4ab8
commit
d52b580844
4 changed files with 55 additions and 18 deletions
|
|
@ -9,8 +9,8 @@ use std::collections::HashSet;
|
|||
|
||||
pub struct List {
|
||||
pub is_enabled: bool,
|
||||
//pub source: Source,
|
||||
pub rules: HashSet<Rule>,
|
||||
pub source: Source,
|
||||
}
|
||||
|
||||
impl List {
|
||||
|
|
@ -18,29 +18,37 @@ impl List {
|
|||
let mut rules = HashSet::new();
|
||||
let source = Source::from_str(src)?;
|
||||
if is_enabled {
|
||||
for line in source.get().await?.lines() {
|
||||
if line.starts_with("/") || line.starts_with("#") || line.is_empty() {
|
||||
continue; // skip comments
|
||||
}
|
||||
if !rules.insert(Rule::from_line(line)) {
|
||||
warn!("List `{src}` contains duplicated entry: `{line}`")
|
||||
}
|
||||
}
|
||||
reload(&mut rules, &source).await?;
|
||||
}
|
||||
Ok(Self {
|
||||
rules,
|
||||
//source,
|
||||
source,
|
||||
is_enabled,
|
||||
})
|
||||
}
|
||||
/// Change rule set status by list ID
|
||||
pub fn set_enabled(&mut self, is_enabled: bool) -> bool {
|
||||
pub async fn set_enabled(&mut self, is_enabled: bool) -> Result<bool> {
|
||||
let was_enabled = self.is_enabled;
|
||||
self.is_enabled = is_enabled;
|
||||
was_enabled
|
||||
if is_enabled {
|
||||
reload(&mut self.rules, &self.source).await?;
|
||||
}
|
||||
Ok(was_enabled)
|
||||
}
|
||||
/// Check if rule is exist in the items index
|
||||
pub fn contains(&self, value: &str) -> bool {
|
||||
self.is_enabled && self.rules.iter().any(|rule| rule.contains(value))
|
||||
}
|
||||
}
|
||||
async fn reload(rules: &mut HashSet<Rule>, source: &Source) -> Result<()> {
|
||||
rules.clear();
|
||||
for line in source.get().await?.lines() {
|
||||
if line.starts_with("/") || line.starts_with("#") || line.is_empty() {
|
||||
continue; // skip comments
|
||||
}
|
||||
if !rules.insert(Rule::from_line(line)) {
|
||||
warn!("List `{source}` contains duplicated entry: `{line}`")
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue