Improve events organization (#2801)

## Problem

While moving some logic to separate packages, we found out some circular
dependency problems with some types, especially with `http::Event`
struct from *agama-lib* package.

## Solution

* Extract to *agama-utils* the types used for the HTTP API . In the
future, the CLI will use these types without the need to depend on types
from all Agama packages.
* The events of the new API are separated from the old events.
* The events are shared to all the packages, making possilbe to use a
single broadcast channel to emit events.
* Remove the events listener which is not needed anymore.
* The manager emits a `StatusChanged` event.
* The progress adds information of the `ProgressChanged` event.
* The progress emits a `ProgressFinished` event everytime a progress is
finished.

Author: joseivanlopez

rust/Cargo.lock

@@ -6,17 +6,12 @@ edition.workspace = true
 
 [dependencies]
 anyhow = "1.0.99"
-merge-struct = "0.1.0"
-serde = { version = "1.0.219", features = ["derive"] }
 thiserror = "2.0.16"
 agama-locale-data = { path = "../agama-locale-data" }
 agama-utils = { path = "../agama-utils" }
 regex = "1.11.2"
 tracing = "0.1.41"
-serde_with = "3.14.0"
-utoipa = "5.4.0"
 gettext-rs = { version = "0.7.2", features = ["gettext-system"] }
-serde_json = "1.0.143"
 tokio = { version = "1.47.1", features = ["macros", "rt-multi-thread", "sync"] }
 tokio-stream = "0.1.17"
 zbus = "5.11.0"

rust/agama-l10n/Cargo.toml

@@ -1,4 +1,4 @@
-// Copyright (c) [2024] SUSE LLC
+// Copyright (c) [2025] SUSE LLC
 //
 // All Rights Reserved.
 //
@@ -18,39 +18,42 @@
 // To contact SUSE LLC about this file by physical or electronic mail, you may
 // find current contact information at www.suse.com.
 
-//! Representation of the localization settings
+use crate::service;
+use agama_locale_data::{KeymapId, LocaleId, TimezoneId};
+use agama_utils::api;
+use agama_utils::api::l10n::SystemInfo;
 
-use crate::extended_config::ExtendedConfig;
-use serde::{Deserialize, Serialize};
-
-/// User configuration for the localization of the target system.
-///
-/// This configuration is provided by the user, so all the values are optional.
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, utoipa::ToSchema)]
-#[schema(as = l10n::UserConfig)]
-#[serde(rename_all = "camelCase")]
+#[derive(Clone, PartialEq)]
 pub struct Config {
-    /// Locale (e.g., "en_US.UTF-8").
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(alias = "language")]
-    pub locale: Option<String>,
-    /// Keymap (e.g., "us", "cz(qwerty)", etc.).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(alias = "keyboard")]
-    pub keymap: Option<String>,
-    /// Timezone (e.g., "Europe/Berlin").
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub timezone: Option<String>,
+    pub locale: LocaleId,
+    pub keymap: KeymapId,
+    pub timezone: TimezoneId,
 }
 
-/// Converts the localization configuration, which contains values for all the
-/// elements, into a user configuration.
-impl From<&ExtendedConfig> for Config {
-    fn from(config: &ExtendedConfig) -> Self {
-        Config {
-            locale: Some(config.locale.to_string()),
-            keymap: Some(config.keymap.to_string()),
-            timezone: Some(config.timezone.to_string()),
+impl Config {
+    pub fn new_from(system: &SystemInfo) -> Self {
+        Self {
+            locale: system.locale.clone(),
+            keymap: system.keymap.clone(),
+            timezone: system.timezone.clone(),
+        }
+    }
+
+    pub fn merge(&self, config: &api::l10n::Config) -> Result<Self, service::Error> {
+        let mut merged = self.clone();
+
+        if let Some(language) = &config.locale {
+            merged.locale = language.parse()?
         }
+
+        if let Some(keyboard) = &config.keymap {
+            merged.keymap = keyboard.parse()?
+        }
+
+        if let Some(timezone) = &config.timezone {
+            merged.timezone = timezone.parse()?;
+        }
+
+        Ok(merged)
     }
 }

rust/agama-l10n/src/config.rs

@@ -44,21 +44,8 @@ pub use service::Service;
 mod model;
 pub use model::{Model, ModelAdapter};
 
-mod system_info;
-pub use system_info::SystemInfo;
-
 mod config;
-pub use config::Config;
-
-mod proposal;
-pub use proposal::Proposal;
-
-pub mod event;
-pub use event::Event;
-
+mod dbus;
 pub mod helpers;
 pub mod message;
-
-mod dbus;
-mod extended_config;
 mod monitor;

rust/agama-l10n/src/extended_config.rs

@@ -18,10 +18,10 @@
 // To contact SUSE LLC about this file by physical or electronic mail, you may
 // find current contact information at www.suse.com.
 
-use crate::{config::Config, proposal::Proposal, system_info::SystemInfo};
 use agama_locale_data::{KeymapId, LocaleId};
 use agama_utils::actor::Message;
-use serde::Deserialize;
+use agama_utils::api;
+use agama_utils::api::l10n::{Proposal, SystemInfo};
 
 #[derive(Clone)]
 pub struct GetSystem;
@@ -44,16 +44,10 @@ impl<T> SetSystem<T> {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, utoipa::ToSchema)]
-pub struct SystemConfig {
-    pub locale: Option<String>,
-    pub keymap: Option<String>,
-}
-
 pub struct GetConfig;
 
 impl Message for GetConfig {
-    type Reply = Config;
+    type Reply = api::l10n::Config;
 }
 
 pub struct SetConfig<T> {

rust/agama-l10n/src/lib.rs

@@ -19,25 +19,45 @@
 // find current contact information at www.suse.com.
 
 mod keyboard;
-pub use keyboard::{Keymap, KeymapsDatabase};
+pub use keyboard::KeymapsDatabase;
 
 mod locale;
-pub use locale::{LocaleEntry, LocalesDatabase};
+pub use locale::LocalesDatabase;
 
 mod timezone;
-pub use timezone::{TimezoneEntry, TimezonesDatabase};
+pub use timezone::TimezonesDatabase;
 
 use crate::{helpers, service};
 use agama_locale_data::{KeymapId, LocaleId, TimezoneId};
+use agama_utils::api::l10n::SystemInfo;
 use regex::Regex;
-use std::{env, fs::OpenOptions, io::Write, process::Command};
+use std::env;
+use std::fs::OpenOptions;
+use std::io::Write;
+use std::process::Command;
 
 /// Abstract the localization-related configuration from the underlying system.
 ///
 /// It offers an API to query and set different localization elements of a
 /// system. This trait can be implemented to replace the real system during
 /// tests.
 pub trait ModelAdapter: Send + 'static {
+    /// Reads the system info.
+    fn read_system_info(&self) -> SystemInfo {
+        let locales = self.locales_db().entries().clone();
+        let keymaps = self.keymaps_db().entries().clone();
+        let timezones = self.timezones_db().entries().clone();
+
+        SystemInfo {
+            locales,
+            keymaps,
+            timezones,
+            locale: self.locale(),
+            keymap: self.keymap().unwrap(),
+            timezone: Default::default(),
+        }
+    }
+
     /// Locales database.
     fn locales_db(&self) -> &LocalesDatabase;
 

rust/agama-l10n/src/message.rs

@@ -18,45 +18,12 @@
 // To contact SUSE LLC about this file by physical or electronic mail, you may
 // find current contact information at www.suse.com.
 
-use agama_locale_data::{get_localectl_keymaps, keyboard::XkbConfigRegistry, KeymapId};
-use gettextrs::*;
-use serde::ser::{Serialize, SerializeStruct};
+use agama_locale_data::get_localectl_keymaps;
+use agama_locale_data::keyboard::XkbConfigRegistry;
+use agama_locale_data::KeymapId;
+use agama_utils::api::l10n::Keymap;
 use std::collections::HashMap;
 
-// Minimal representation of a keymap
-#[derive(Clone, Debug, utoipa::ToSchema)]
-pub struct Keymap {
-    /// Keymap identifier (e.g., "us")
-    pub id: KeymapId,
-    /// Keymap description
-    description: String,
-}
-
-impl Keymap {
-    pub fn new(id: KeymapId, description: &str) -> Self {
-        Self {
-            id,
-            description: description.to_string(),
-        }
-    }
-
-    pub fn localized_description(&self) -> String {
-        gettext(&self.description)
-    }
-}
-
-impl Serialize for Keymap {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        let mut state = serializer.serialize_struct("Keymap", 2)?;
-        state.serialize_field("id", &self.id.to_string())?;
-        state.serialize_field("description", &self.localized_description())?;
-        state.end()
-    }
-}
-
 /// Represents the keymaps database.
 ///
 /// The list of supported keymaps is read from `systemd-localed` and the

rust/agama-l10n/src/model.rs

@@ -21,26 +21,10 @@
 //! This module provides support for reading the locales database.
 
 use agama_locale_data::LocaleId;
+use agama_utils::api::l10n::LocaleEntry;
 use anyhow::Context;
-use serde::Serialize;
-use serde_with::{serde_as, DisplayFromStr};
 use std::{fs, process::Command};
 
-/// Represents a locale, including the localized language and territory.
-#[serde_as]
-#[derive(Debug, Serialize, Clone, utoipa::ToSchema)]
-pub struct LocaleEntry {
-    /// The locale code (e.g., "es_ES.UTF-8").
-    #[serde_as(as = "DisplayFromStr")]
-    pub id: LocaleId,
-    /// Localized language name (e.g., "Spanish", "Español", etc.)
-    pub language: String,
-    /// Localized territory name (e.g., "Spain", "España", etc.)
-    pub territory: String,
-    /// Console font
-    pub consolefont: Option<String>,
-}
-
 /// Represents the locales database.
 ///
 /// The list of supported locales is read from `systemd-localed`. However, the