[PATCH proxmox v6 05/43] notify: matcher: break out severity matcher into submodule

[Lukas Wagner <l.wagner@proxmox.com>]

No functional changes.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Michael Köppl <m.koeppl@proxmox.com>
Tested-by: Michael Köppl <m.koeppl@proxmox.com>
---
 proxmox-notify/src/matcher/mod.rs      | 56 +++-------------------
 proxmox-notify/src/matcher/severity.rs | 66 ++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 49 deletions(-)
 create mode 100644 proxmox-notify/src/matcher/severity.rs

diff --git a/proxmox-notify/src/matcher/mod.rs b/proxmox-notify/src/matcher/mod.rs
index 9d9d5d42..b27f72c0 100644
--- a/proxmox-notify/src/matcher/mod.rs
+++ b/proxmox-notify/src/matcher/mod.rs
@@ -13,7 +13,11 @@ use proxmox_schema::{ApiStringFormat, Schema, StringSchema, Updater, api, const_
 use proxmox_time::{DailyDuration, parse_daily_duration};
 
 use crate::schema::ENTITY_NAME_SCHEMA;
-use crate::{Error, Notification, Origin, Severity};
+use crate::{Error, Notification, Origin};
+
+pub mod severity;
+
+use severity::SeverityMatcher;
 
 pub const MATCHER_TYPENAME: &str = "matcher";
 
@@ -337,46 +341,6 @@ impl MatcherConfig {
     }
 }
 
-/// Match severity of the notification.
-#[derive(Clone, Debug)]
-pub struct SeverityMatcher {
-    severities: Vec<Severity>,
-}
-
-proxmox_serde::forward_deserialize_to_from_str!(SeverityMatcher);
-proxmox_serde::forward_serialize_to_display!(SeverityMatcher);
-
-/// Common trait implemented by all matching directives
-impl MatchDirective for SeverityMatcher {
-    /// Check if this directive matches a given notification
-    fn matches(&self, notification: &Notification) -> Result<bool, Error> {
-        Ok(self.severities.contains(&notification.metadata.severity))
-    }
-}
-
-impl fmt::Display for SeverityMatcher {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let severities: Vec<String> = self.severities.iter().map(|s| format!("{s}")).collect();
-        f.write_str(&severities.join(","))
-    }
-}
-
-impl FromStr for SeverityMatcher {
-    type Err = Error;
-    fn from_str(s: &str) -> Result<Self, Error> {
-        let mut severities = Vec::new();
-
-        for element in s.split(',') {
-            let element = element.trim();
-            let severity: Severity = element.parse()?;
-
-            severities.push(severity)
-        }
-
-        Ok(Self { severities })
-    }
-}
-
 /// Match timestamp of the notification.
 #[derive(Clone, Debug)]
 pub struct CalendarMatcher {
@@ -478,6 +442,8 @@ pub fn check_matches<'a>(
 
 #[cfg(test)]
 mod tests {
+    use crate::Severity;
+
     use super::*;
     use serde_json::Value;
     use std::collections::HashMap;
@@ -519,14 +485,6 @@ mod tests {
         assert!("regex:'3=b.*".parse::<FieldMatcher>().is_err());
         assert!("invalid:'bar=b.*".parse::<FieldMatcher>().is_err());
     }
-    #[test]
-    fn test_severities() {
-        let notification =
-            Notification::from_template(Severity::Notice, "test", Value::Null, Default::default());
-
-        let matcher: SeverityMatcher = "info,notice,warning,error".parse().unwrap();
-        assert!(matcher.matches(&notification).unwrap());
-    }
 
     #[test]
     fn test_empty_matcher_matches_always() {
diff --git a/proxmox-notify/src/matcher/severity.rs b/proxmox-notify/src/matcher/severity.rs
new file mode 100644
index 00000000..4b126d85
--- /dev/null
+++ b/proxmox-notify/src/matcher/severity.rs
@@ -0,0 +1,66 @@
+use std::fmt;
+use std::str::FromStr;
+
+use crate::{Error, Notification, Severity};
+
+use super::MatchDirective;
+
+/// Match severity of the notification.
+#[derive(Clone, Debug)]
+pub struct SeverityMatcher {
+    severities: Vec<Severity>,
+}
+
+/// Common trait implemented by all matching directives
+impl MatchDirective for SeverityMatcher {
+    /// Check if this directive matches a given notification
+    fn matches(&self, notification: &Notification) -> Result<bool, Error> {
+        Ok(self.severities.contains(&notification.metadata.severity))
+    }
+}
+
+impl fmt::Display for SeverityMatcher {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let severities: Vec<String> = self.severities.iter().map(|s| format!("{s}")).collect();
+        f.write_str(&severities.join(","))
+    }
+}
+
+impl FromStr for SeverityMatcher {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<Self, Error> {
+        let mut severities = Vec::new();
+
+        for element in s.split(',') {
+            let element = element.trim();
+            let severity: Severity = element.parse()?;
+
+            severities.push(severity)
+        }
+
+        Ok(Self { severities })
+    }
+}
+
+proxmox_serde::forward_deserialize_to_from_str!(SeverityMatcher);
+proxmox_serde::forward_serialize_to_display!(SeverityMatcher);
+
+#[cfg(test)]
+mod test {
+    use serde_json::Value;
+
+    use crate::{
+        Notification, Severity,
+        matcher::{MatchDirective as _, severity::SeverityMatcher},
+    };
+
+    #[test]
+    fn test_severities() {
+        let notification =
+            Notification::from_template(Severity::Notice, "test", Value::Null, Default::default());
+
+        let matcher: SeverityMatcher = "info,notice,warning,error".parse().unwrap();
+        assert!(matcher.matches(&notification).unwrap());
+    }
+}
-- 
2.47.3