feat: add tracing support + update deps

Cargo.toml

@@ -3,27 +3,33 @@ name = "cosmic-osd"
 version = "0.1.0"
 edition = "2021"
 license = "GPL-3.0-or-later"
+rust-version = "1.80"
 
 [dependencies]
-env_logger = "0.11.3"
-futures = "0.3.30"
+
+tracing-subscriber = { version = "0.3", default-features = false, features = [
+    "std",
+    "fmt",
+    "env-filter",
+] }
+tracing-journald = "0.3"
+tracing = "0.1"
+futures = "0.3"
 i18n-embed = { version = "0.14", features = [
     "fluent-system",
     "desktop-requester",
 ] }
-i18n-embed-fl = "0.8"
+i18n-embed-fl = "0.9"
 libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false, features = [
     "tokio",
     "wayland",
 ] }
-libpulse-binding = "2.28.1"
-log = "0.4.21"
-once_cell = "1.18.0"
-rust-embed = "8.0.0"
-rustix = "0.38.31"
-serde = { version = "1.0.140", features = ["derive"] }
-tokio = { version = "1.23.0", features = ["process"] }
-tokio-stream = "0.1.11"
-uzers = "0.11.3"
-zbus = { version = "4.2.2", default-features = false, features = ["tokio"] }
-cosmic-settings-subscriptions = { git = "https://github.com/pop-os/cosmic-settings-subscriptions" }
+libpulse-binding = "2"
+rust-embed = "8"
+rustix = "0.38"
+serde = { version = "1", features = ["derive"] }
+tokio = { version = "1.40", features = ["process"] }
+tokio-stream = "0.1"
+uzers = "0.12"
+zbus = { version = "4", default-features = false, features = ["tokio"] }
+cosmic-settings-subscriptions = { git = "https://github.com/pop-os/cosmic-settings-subscriptions", rev = "21cc79434fa24f1fbd6dc4e8d394aa51d5ee12d9" }

src/components/app.rs

@@ -112,21 +112,21 @@ impl cosmic::Application for App {
                         self.system_connection = Some(connection)
                     }
                     dbus::Event::Error(context, err) => {
-                        log::error!("Failed to {}: {}", context, err);
+                        error!("Failed to {}: {}", context, err);
                     }
                 }
                 iced::Command::none()
             }
             Msg::PolkitAgent(event) => match event {
                 polkit_agent::Event::CreateDialog(params) => {
-                    log::trace!("create polkit dialog: {}", params.cookie);
+                    trace!("create polkit dialog: {}", params.cookie);
                     let id = SurfaceId::unique();
                     let (state, cmd) = polkit_dialog::State::new(id, params);
                     self.surfaces.insert(id, Surface::PolkitDialog(state));
                     cmd
                 }
                 polkit_agent::Event::CancelDialog { cookie } => {
-                    log::trace!("cancel polkit dialog: {}", cookie);
+                    trace!("cancel polkit dialog: {}", cookie);
                     if let Some((id, _)) = self.surfaces.iter().find(|(_id, surface)| {
                         if let Surface::PolkitDialog(state) = surface {
                             state.params.cookie == cookie

src/components/osd_indicator.rs

@@ -178,7 +178,7 @@ impl State {
     }
 
     pub fn update(self, msg: Msg) -> (Option<Self>, Command<Msg>) {
-        log::trace!("indicator msg: {:?}", msg);
+        trace!("indicator msg: {:?}", msg);
         match msg {
             Msg::Ignore => (Some(self), Command::none()),
             Msg::Close => (None, destroy_layer_surface(self.id)),

src/components/polkit_dialog.rs

@@ -15,7 +15,6 @@ use cosmic::{
     iced_sctk::commands::layer_surface::{
         destroy_layer_surface, get_layer_surface, KeyboardInteractivity, Layer,
     },
-    theme,
 };
 use std::{
     collections::HashMap,

src/localize.rs

@@ -0,0 +1,46 @@
+use std::sync::LazyLock;
+
+use i18n_embed::{
+    fluent::{fluent_language_loader, FluentLanguageLoader},
+    DefaultLocalizer, LanguageLoader, Localizer,
+};
+use rust_embed::RustEmbed;
+
+#[derive(RustEmbed)]
+#[folder = "./i18n/"]
+struct Localizations;
+
+pub static LANGUAGE_LOADER: LazyLock<FluentLanguageLoader> = LazyLock::new(|| {
+    let loader: FluentLanguageLoader = fluent_language_loader!();
+
+    loader
+        .load_fallback_language(&Localizations)
+        .expect("Error while loading fallback language");
+
+    loader
+});
+
+#[macro_export]
+macro_rules! fl {
+    ($message_id:literal) => {{
+        i18n_embed_fl::fl!($crate::localize::LANGUAGE_LOADER, $message_id)
+    }};
+
+    ($message_id:literal, $($args:expr),*) => {{
+        i18n_embed_fl::fl!($crate::localize::LANGUAGE_LOADER, $message_id, $($args), *)
+    }};
+}
+
+// Get the `Localizer` to be used for localizing this library.
+fn localizer() -> Box<dyn Localizer> {
+    Box::from(DefaultLocalizer::new(&*LANGUAGE_LOADER, &Localizations))
+}
+
+pub fn localize() {
+    let localizer = localizer();
+    let requested_languages = i18n_embed::DesktopLanguageRequester::requested_languages();
+
+    if let Err(error) = localizer.select(&requested_languages) {
+        eprintln!("Error while loading language for App List {}", error);
+    }
+}

src/main.rs

@@ -1,35 +1,36 @@
-use i18n_embed::{
-    fluent::{fluent_language_loader, FluentLanguageLoader},
-    DesktopLanguageRequester,
-};
-use once_cell::sync::Lazy;
-use rust_embed::RustEmbed;
+#[macro_use]
+extern crate tracing;
 
 mod components;
+mod localize;
 mod subscriptions;
 
-pub static LANG_LOADER: Lazy<FluentLanguageLoader> = Lazy::new(|| fluent_language_loader!());
+fn setup_logs() {
+    use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
 
-#[derive(RustEmbed)]
-#[folder = "i18n"]
-struct Localizations;
+    let fmt_layer = fmt::layer().with_target(false);
+    let filter_layer = EnvFilter::try_from_default_env().unwrap_or(EnvFilter::new(format!(
+        "warn,{}=warn",
+        env!("CARGO_CRATE_NAME")
+    )));
 
-#[macro_export]
-macro_rules! fl {
-    ($message_id:literal) => {{
-        i18n_embed_fl::fl!($crate::LANG_LOADER, $message_id)
-    }};
-
-    ($message_id:literal, $($args:expr),*) => {{
-        i18n_embed_fl::fl!($crate::LANG_LOADER, $message_id, $($args), *)
-    }};
+    if let Ok(journal_layer) = tracing_journald::layer() {
+        tracing_subscriber::registry()
+            .with(filter_layer)
+            .with(fmt_layer)
+            .with(journal_layer)
+            .init();
+    } else {
+        tracing_subscriber::registry()
+            .with(filter_layer)
+            .with(fmt_layer)
+            .init();
+    }
 }
 
 fn main() {
-    let requested_languages = DesktopLanguageRequester::requested_languages();
-    i18n_embed::select(&*LANG_LOADER, &Localizations, &requested_languages)
-        .expect("Failed to load languages");
+    setup_logs();
+    localize::localize();
 
-    env_logger::init();
     components::app::main().unwrap();
 }

src/subscriptions/polkit_agent_helper.rs

@@ -27,7 +27,7 @@ pub fn subscription(pw_name: &str, cookie: &str, retry: u32) -> iced::Subscripti
         async move {
             if let Some(mut agent_helper) = agent_helper {
                 let msg = agent_helper.next().await.unwrap_or_else(|err| {
-                    log::error!("reading from polkit agent helper: {}", err);
+                    error!("reading from polkit agent helper: {}", err);
                     Some(Event::Failed)
                 });
                 if let Some(msg) = msg {
@@ -40,7 +40,7 @@ pub fn subscription(pw_name: &str, cookie: &str, retry: u32) -> iced::Subscripti
                 match AgentHelper::new(&pw_name, &cookie).await {
                     Ok((helper, responder)) => (Event::Responder(responder), Some(helper)),
                     Err(err) => {
-                        log::error!("creating polkit agent helper: {}", err);
+                        error!("creating polkit agent helper: {}", err);
                         (Event::Failed, None)
                     }
                 }
@@ -87,7 +87,7 @@ impl AgentHelper {
                 "SUCCESS" => Event::Complete(true),
                 "FAILURE" => Event::Complete(false),
                 _ => {
-                    log::error!("Unknown line '{}' from 'polkit-agent-helper-1'", line);
+                    error!("Unknown line '{}' from 'polkit-agent-helper-1'", line);
                     continue;
                 }
             }));