save

Signed-off-by: Jan Zachmann <50990105+JanZachmann@users.noreply.github.com>

Author: JanZachmann

Cargo.lock

@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 name = "omnect-device-service"
 readme = "README.md"
 repository = "https://github.com/omnect/omnect-device-service.git"
-version = "0.41.6"
+version = "0.41.9"
 
 [dependencies]
 actix-server = { version = "2.6", default-features = false }
@@ -25,12 +25,11 @@ freedesktop_entry_parser = { version = "1.3", default-features = false }
 futures = { version = "0.3", default-features = false }
 futures-util = { version = "0.3", default-features = false }
 glob = { version = "0.3", default-features = false }
+inotify = { version = "0.11", default-features = false, features = ["stream"] }
 lazy_static = { version = "1.5", default-features = false }
 log = { version = "0.4", default-features = false }
 log-panics = { version = "2", default-features = false }
 modemmanager = { git = "https://github.com/omnect/modemmanager.git", tag = "0.3.4", default-features = false, optional = true }
-notify = { version = "8.0", default-features = false }
-notify-debouncer-full = { version = "0.5", default-features = false }
 regex-lite = { version = "0.1", default-features = true }
 reqwest = { version = "0.12", default-features = false, features = [
   "default-tls",
@@ -64,7 +63,6 @@ tokio-stream = { version = "0.1", default-features = false, features = [
   "time",
 ] }
 toml = { version = "0.8", default-features = false, features = ["parse"] }
-typeid = { version = "1.0", default-features = false }
 uuid = { version = "1.17", default-features = false }
 x509-parser = { version = "0.17", default-features = false }
 zbus = { version = "5.7", default-features = false, features = ["tokio"] }

Cargo.toml

@@ -1,14 +1,18 @@
 use crate::{
     common::{from_json_file, to_json_file},
-    twin::{Feature, feature::*},
+    twin::feature::{self, *},
 };
 use anyhow::{Context, Result, bail, ensure};
 use azure_iot_sdk::client::IotMessage;
+use inotify::WatchMask;
 use log::{info, warn};
-use notify_debouncer_full::notify::*;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
-use std::{collections::HashMap, env, path::Path};
+use std::{
+    collections::HashMap,
+    env,
+    path::{Path, PathBuf},
+};
 use tokio::sync::mpsc::Sender;
 
 macro_rules! consent_path {
@@ -54,6 +58,7 @@ pub struct ConsentConfig {
 }
 
 pub struct DeviceUpdateConsent {
+    file_map: HashMap<std::ffi::c_int, PathBuf>,
     tx_reported_properties: Option<Sender<serde_json::Value>>,
 }
 
@@ -87,8 +92,13 @@ impl Feature for DeviceUpdateConsent {
 
     async fn command(&mut self, cmd: &Command) -> CommandResult {
         match cmd {
-            Command::WatchPath(file) => {
-                self.report_consent(from_json_file(&file.path)?).await?;
+            Command::WatchPath(cmd) => {
+                self.report_consent(from_json_file(
+                    self.file_map
+                        .get(&cmd.event.wd.get_watch_descriptor_id())
+                        .context("context")?,
+                )?)
+                .await?;
             }
             Command::DesiredGeneralConsent(cmd) => {
                 self.update_general_consent(cmd).await?;
@@ -108,22 +118,18 @@ impl DeviceUpdateConsent {
     const ID: &'static str = "device_update_consent";
 
     pub fn new() -> Result<Self> {
+        let mut file_map = HashMap::new();
+
         for path in [request_consent_path!(), history_consent_path!()] {
-            watch_path(
-                Watch {
-                    command: PathCommand {
-                        feature_id: typeid::ConstTypeId::of::<Self>(),
-                        path,
-                    },
-                    event_kinds: vec![EventKind::Modify(event::ModifyKind::Data(
-                        event::DataChange::Content,
-                    ))],
-                },
-                RecursiveMode::Recursive,
-            )?;
+            file_map.insert(
+                feature::add_watch::<Self>(&path, WatchMask::MODIFY)?.get_watch_descriptor_id(),
+                path,
+            );
         }
+
         Ok(DeviceUpdateConsent {
             tx_reported_properties: None,
+            file_map,
         })
     }
 

src/twin/consent.rs

@@ -2,13 +2,13 @@ use crate::{
     bootloader_env,
     common::from_json_file,
     systemd,
-    twin::{Feature, feature::*},
+    twin::feature::{self, *},
     web_service,
 };
 use anyhow::{Context, Result, bail};
 use azure_iot_sdk::client::IotMessage;
+use inotify::WatchMask;
 use log::{debug, info, warn};
-use notify_debouncer_full::notify::*;
 use serde::{Deserialize, Serialize};
 use serde_json::{from_reader, json};
 use serde_repr::*;
@@ -17,7 +17,7 @@ use std::{
     env,
     fs::{File, read_dir},
     io::BufReader,
-    path::PathBuf,
+    path::Path,
 };
 use tokio::sync::mpsc::Sender;
 
@@ -37,8 +37,8 @@ macro_rules! config_path {
 
 macro_rules! custom_config_dir_path {
     () => {
-        PathBuf::from(
-            env::var("FACTORY_RESET_CUSTOM_CONFIG_DIR_PATH")
+        Path::new(
+            &env::var("FACTORY_RESET_CUSTOM_CONFIG_DIR_PATH")
                 .unwrap_or("/etc/omnect/factory-reset.d".to_string()),
         )
     };
@@ -186,18 +186,9 @@ impl FactoryReset {
             result: FactoryReset::factory_reset_result()?,
         };
 
-        watch_path(
-            Watch {
-                command: PathCommand {
-                    feature_id: typeid::ConstTypeId::of::<Self>(),
-                    path: custom_config_dir_path!(),
-                },
-                event_kinds: vec![
-                    EventKind::Create(event::CreateKind::File),
-                    EventKind::Remove(event::RemoveKind::File),
-                ],
-            },
-            RecursiveMode::Recursive,
+        feature::add_watch::<Self>(
+            custom_config_dir_path!(),
+            WatchMask::CREATE | WatchMask::DELETE,
         )?;
 
         Ok(FactoryReset {