[PATCH proxmox v2 07/34] notify: matcher: break out calendar matcher into submodule

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

No functional changes.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
 proxmox-notify/src/matcher/calendar.rs | 46 ++++++++++++++++++++++++
 proxmox-notify/src/matcher/mod.rs      | 48 +++-----------------------
 2 files changed, 50 insertions(+), 44 deletions(-)
 create mode 100644 proxmox-notify/src/matcher/calendar.rs

diff --git a/proxmox-notify/src/matcher/calendar.rs b/proxmox-notify/src/matcher/calendar.rs
new file mode 100644
index 00000000..5deab13e
--- /dev/null
+++ b/proxmox-notify/src/matcher/calendar.rs
@@ -0,0 +1,46 @@
+use std::fmt;
+use std::str::FromStr;
+
+use proxmox_time::DailyDuration;
+
+use crate::{Error, Notification};
+
+use super::MatchDirective;
+
+/// Match timestamp of the notification.
+#[derive(Clone, Debug)]
+pub struct CalendarMatcher {
+    schedule: DailyDuration,
+    original: String,
+}
+
+impl MatchDirective for CalendarMatcher {
+    fn matches(&self, notification: &Notification) -> Result<bool, Error> {
+        self.schedule
+            .time_match(notification.metadata.timestamp, false)
+            .map_err(|err| Error::Generic(format!("could not match timestamp: {err}")))
+    }
+}
+
+impl fmt::Display for CalendarMatcher {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.write_str(&self.original)
+    }
+}
+
+impl FromStr for CalendarMatcher {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<Self, Error> {
+        let schedule = proxmox_time::parse_daily_duration(s)
+            .map_err(|e| Error::Generic(format!("could not parse schedule: {e}")))?;
+
+        Ok(Self {
+            schedule,
+            original: s.to_string(),
+        })
+    }
+}
+
+proxmox_serde::forward_deserialize_to_from_str!(CalendarMatcher);
+proxmox_serde::forward_serialize_to_display!(CalendarMatcher);
diff --git a/proxmox-notify/src/matcher/mod.rs b/proxmox-notify/src/matcher/mod.rs
index dd0e25b5..48aaa351 100644
--- a/proxmox-notify/src/matcher/mod.rs
+++ b/proxmox-notify/src/matcher/mod.rs
@@ -1,23 +1,20 @@
 use std::collections::HashSet;
-use std::fmt;
 use std::fmt::Debug;
-use std::str::FromStr;
 
-use const_format::concatcp;
-use regex::Regex;
 use serde::{Deserialize, Serialize};
 use tracing::{error, info};
 
-use proxmox_schema::api_types::{COMMENT_SCHEMA, SAFE_ID_REGEX_STR};
-use proxmox_schema::{ApiStringFormat, Schema, StringSchema, Updater, api, const_regex};
-use proxmox_time::{DailyDuration, parse_daily_duration};
+use proxmox_schema::api_types::COMMENT_SCHEMA;
+use proxmox_schema::{Updater, api};
 
 use crate::schema::ENTITY_NAME_SCHEMA;
 use crate::{Error, Notification, Origin};
 
+pub mod calendar;
 pub mod field;
 pub mod severity;
 
+use calendar::CalendarMatcher;
 use field::FieldMatcher;
 use severity::SeverityMatcher;
 
@@ -203,43 +200,6 @@ impl MatcherConfig {
     }
 }
 
-/// Match timestamp of the notification.
-#[derive(Clone, Debug)]
-pub struct CalendarMatcher {
-    schedule: DailyDuration,
-    original: String,
-}
-
-proxmox_serde::forward_deserialize_to_from_str!(CalendarMatcher);
-proxmox_serde::forward_serialize_to_display!(CalendarMatcher);
-
-impl MatchDirective for CalendarMatcher {
-    fn matches(&self, notification: &Notification) -> Result<bool, Error> {
-        self.schedule
-            .time_match(notification.metadata.timestamp, false)
-            .map_err(|err| Error::Generic(format!("could not match timestamp: {err}")))
-    }
-}
-
-impl fmt::Display for CalendarMatcher {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str(&self.original)
-    }
-}
-
-impl FromStr for CalendarMatcher {
-    type Err = Error;
-    fn from_str(s: &str) -> Result<Self, Error> {
-        let schedule = parse_daily_duration(s)
-            .map_err(|e| Error::Generic(format!("could not parse schedule: {e}")))?;
-
-        Ok(Self {
-            schedule,
-            original: s.to_string(),
-        })
-    }
-}
-
 #[api]
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
-- 
2.47.3