filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Project Alouette: je te plume la queue (et je la remplace par mieux)

Browse Source
This commit is contained in:
mdecimus
2025-07-09 20:38:27 +02:00
parent 698ce0de2e
commit d04a4331c3
83 changed files with 3479 additions and 2987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/utils/src/config/parser.rs
View File

@@ -582,13 +582,10 @@ mod tests {
);
assert_eq!(
config.sub_keys("sets.strings", "").collect::<Vec<_>>(),
config.sub_keys("sets.strings", ""),
vec!["green", "red", "yellow"]
);
assert_eq!(
config.sub_keys("sets", ".red").collect::<Vec<_>>(),
vec!["string", "strings"]
);
assert_eq!(config.sub_keys("sets", ".red"), vec!["string", "strings"]);
}
}

173
crates/utils/src/config/utils.rs
View File

@@ -104,30 +104,51 @@ impl Config {
}
}
pub fn sub_keys<'x, 'y: 'x>(
&'y self,
prefix: impl AsKey,
suffix: &'y str,
) -> impl Iterator<Item = &'x str> + 'x {
pub fn sub_keys(&self, prefix: impl AsKey, suffix: &str) -> Vec<String> {
let mut last_key = "";
let prefix = prefix.as_prefix();
self.keys.keys().filter_map(move |key| {
let key = key.strip_prefix(&prefix)?;
let key = if !suffix.is_empty() {
key.strip_suffix(suffix)?
} else if let Some((key, _)) = key.split_once('.') {
key
} else {
key
};
if last_key != key {
last_key = key;
Some(key)
} else {
None
}
})
self.keys
.keys()
.filter_map(move |key| {
let key = key.strip_prefix(&prefix)?;
let key = if !suffix.is_empty() {
key.strip_suffix(suffix)?
} else if let Some((key, _)) = key.split_once('.') {
key
} else {
key
};
if last_key != key {
last_key = key;
Some(key.to_string())
} else {
None
}
})
.collect()
}
pub fn sub_keys_with_suffixes(&self, prefix: impl AsKey, suffixes: &[&str]) -> Vec<String> {
let mut last_key = "";
let prefix = prefix.as_prefix();
self.keys
.keys()
.filter_map(move |key| {
let key = key.strip_prefix(&prefix)?;
let key = suffixes
.iter()
.filter_map(|suffix| key.strip_suffix(suffix))
.next()?;
if last_key != key {
last_key = key;
Some(key.to_string())
} else {
None
}
})
.collect()
}
pub fn prefix<'x, 'y: 'x>(&'y self, prefix: impl AsKey) -> impl Iterator<Item = &'x str> + 'x {
@@ -628,16 +649,6 @@ pub trait AsKey: Clone {
fn as_prefix(&self) -> String;
}
impl AsKey for &str {
fn as_key(&self) -> String {
self.to_string()
}
fn as_prefix(&self) -> String {
format!("{self}.")
}
}
impl AsKey for String {
fn as_key(&self) -> String {
self.to_string()
@@ -658,53 +669,111 @@ impl AsKey for &String {
}
}
impl AsKey for (&str, &str) {
impl AsKey for &str {
fn as_key(&self) -> String {
format!("{}.{}", self.0, self.1)
self.to_string()
}
fn as_prefix(&self) -> String {
format!("{}.{}.", self.0, self.1)
format!("{self}.")
}
}
impl AsKey for (&str, &String) {
impl<A, B> AsKey for (A, B)
where
A: AsRef<str> + Clone,
B: AsRef<str> + Clone,
{
fn as_key(&self) -> String {
format!("{}.{}", self.0, self.1)
format!("{}.{}", self.0.as_ref(), self.1.as_ref(),)
}
fn as_prefix(&self) -> String {
format!("{}.{}.", self.0, self.1)
format!("{}.{}.", self.0.as_ref(), self.1.as_ref(),)
}
}
impl AsKey for (&String, &str) {
impl<A, B, C> AsKey for (A, B, C)
where
A: AsRef<str> + Clone,
B: AsRef<str> + Clone,
C: AsRef<str> + Clone,
{
fn as_key(&self) -> String {
format!("{}.{}", self.0, self.1)
format!(
"{}.{}.{}",
self.0.as_ref(),
self.1.as_ref(),
self.2.as_ref()
)
}
fn as_prefix(&self) -> String {
format!("{}.{}.", self.0, self.1)
format!(
"{}.{}.{}.",
self.0.as_ref(),
self.1.as_ref(),
self.2.as_ref()
)
}
}
impl AsKey for (&str, &str, &str) {
impl<A, B, C, D> AsKey for (A, B, C, D)
where
A: AsRef<str> + Clone,
B: AsRef<str> + Clone,
C: AsRef<str> + Clone,
D: AsRef<str> + Clone,
{
fn as_key(&self) -> String {
format!("{}.{}.{}", self.0, self.1, self.2)
format!(
"{}.{}.{}.{}",
self.0.as_ref(),
self.1.as_ref(),
self.2.as_ref(),
self.3.as_ref()
)
}
fn as_prefix(&self) -> String {
format!("{}.{}.{}.", self.0, self.1, self.2)
format!(
"{}.{}.{}.{}.",
self.0.as_ref(),
self.1.as_ref(),
self.2.as_ref(),
self.3.as_ref()
)
}
}
impl AsKey for (&str, &str, &str, &str) {
impl<A, B, C, D, E> AsKey for (A, B, C, D, E)
where
A: AsRef<str> + Clone,
B: AsRef<str> + Clone,
C: AsRef<str> + Clone,
D: AsRef<str> + Clone,
E: AsRef<str> + Clone,
{
fn as_key(&self) -> String {
format!("{}.{}.{}.{}", self.0, self.1, self.2, self.3)
format!(
"{}.{}.{}.{}.{}",
self.0.as_ref(),
self.1.as_ref(),
self.2.as_ref(),
self.3.as_ref(),
self.4.as_ref()
)
}
fn as_prefix(&self) -> String {
format!("{}.{}.{}.{}.", self.0, self.1, self.2, self.3)
format!(
"{}.{}.{}.{}.{}.",
self.0.as_ref(),
self.1.as_ref(),
self.2.as_ref(),
self.3.as_ref(),
self.4.as_ref()
)
}
}
@@ -745,16 +814,10 @@ ip = "a:b::1:1"
let mut config = Config::default();
config.parse(toml).unwrap();
assert_eq!(config.sub_keys("queues", ""), ["a", "x", "z"]);
assert_eq!(config.sub_keys("servers", ""), ["my relay", "submissions"]);
assert_eq!(
config.sub_keys("queues", "").collect::<Vec<_>>(),
["a", "x", "z"]
);
assert_eq!(
config.sub_keys("servers", "").collect::<Vec<_>>(),
["my relay", "submissions"]
);
assert_eq!(
config.sub_keys("queues.z.retry", "").collect::<Vec<_>>(),
config.sub_keys("queues.z.retry", ""),
["0000", "0001", "0002", "0003", "0004"]
);
assert_eq!(