fix: use tracing instead of systemd log and fix default theme path

Cargo.toml

@@ -34,8 +34,8 @@ onagre-launcher-toolkit = { git = "https://github.com/onagre-launcher/launcher"
 clap = { version = "^4", features = ["derive"] }
 freedesktop-icons = "0.2.5"
 
-log = { version = "^0.4" }
-systemd-journal-logger = "2.1.1"
+tracing = "0.1.40"
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 
 once_cell = "^1"
 anyhow = "^1"

src/app/mod.rs

@@ -12,9 +12,9 @@ use iced::{
 use iced_core::widget::operation::scrollable::RelativeOffset;
 use iced_core::{Event, Font};
 use iced_style::Theme;
-use log::{debug, trace};
 use onagre_launcher_toolkit::launcher::{Request, Response};
 use once_cell::sync::Lazy;
+use tracing::{debug, trace};
 
 use crate::app::entries::pop_entry::PopSearchResult;
 use crate::app::entries::AsEntry;

src/app/state.rs

@@ -1,8 +1,8 @@
 use crate::app::cache::Cache;
 use crate::app::mode::ActiveMode;
 use crate::app::plugin_matchers::{match_web_plugins, Plugin};
-use log::debug;
 use onagre_launcher_toolkit::launcher::SearchResult;
+use tracing::debug;
 
 use crate::app::{Message, INPUT_ID};
 use crate::icons::IconPath;

src/app/style/mod.rs

@@ -5,9 +5,11 @@ use crate::app::style::search::input::SearchInputStyles;
 use crate::app::style::search::SearchContainerStyles;
 use crate::config::color::OnagreColor;
 use crate::config::padding::OnagrePadding;
+use crate::THEME_PATH;
 use iced::widget::container::Appearance;
 use iced::Background;
 use iced_core::BorderRadius;
+use tracing::{error, warn};
 
 pub mod app;
 pub mod rows;
@@ -16,16 +18,11 @@ pub mod search;
 
 impl Theme {
     pub fn load() -> Self {
-        let buf = dirs::config_dir()
-            .expect("Failed to open `$XDG_CONFIG_HOME`")
-            .join("onagre")
-            .join("theme.scss");
-
-        let theme = crate::config::parse_file(buf);
+        let buf = THEME_PATH.lock().unwrap().clone();
+        let theme = crate::config::parse_file(&buf);
         if let Err(err) = &theme {
-            eprintln!("Failed to parse theme:");
-            eprintln!("{err}");
-            eprintln!("Failing back to default theme");
+            error!("Failed to parse theme {buf:?}: {err}");
+            warn!("Failing back to default theme");
         };
 
         theme.unwrap_or_default()

src/app/subscriptions/pop_launcher.rs

@@ -6,12 +6,12 @@ use iced::Subscription;
 use iced_core::event::Status;
 use iced_runtime::futures::futures::stream;
 use iced_runtime::futures::subscription::Recipe;
-use log::debug;
 use onagre_launcher_toolkit::launcher::{json_input_stream, Request, Response};
 use std::hash::Hash;
 use std::process::Stdio;
 use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
 use tokio::process::{ChildStderr, ChildStdin, ChildStdout, Command};
+use tracing::debug;
 
 // Whenever a message is red from pop-launcher stdout, send it to the subscription receiver
 async fn handle_stdout(stdout: ChildStdout, mut sender: Sender<Response>) {

src/db/mod.rs

@@ -1,7 +1,7 @@
-use log::{debug, trace};
 use once_cell::sync::Lazy;
 use std::cmp::Reverse;
 use std::fmt::Debug;
+use tracing::{debug, trace};
 
 use serde::de::DeserializeOwned;
 use serde::Serialize;

src/db/web.rs

@@ -1,7 +1,7 @@
 use crate::db::{Database, Entity};
-use log::debug;
 use serde::{Deserialize, Serialize};
 use std::borrow::Cow;
+use tracing::debug;
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct WebEntity<'a> {

src/main.rs

@@ -1,12 +1,14 @@
 use std::path::PathBuf;
+use std::sync::Mutex;
 
 use anyhow::anyhow;
-use app::style::Theme;
 use clap::Parser;
-use log::{debug, info, LevelFilter};
 use once_cell::sync::Lazy;
-use std::sync::Mutex;
-use systemd_journal_logger::JournalLog;
+use tracing::{debug, info};
+use tracing_subscriber::layer::SubscriberExt;
+use tracing_subscriber::util::SubscriberInitExt;
+
+use app::style::Theme;
 
 pub mod app;
 pub mod config;
@@ -18,7 +20,7 @@ pub static THEME_PATH: Lazy<Mutex<PathBuf>> = Lazy::new(|| {
     Mutex::new(
         dirs::config_dir()
             .ok_or_else(|| anyhow!("Theme config not found"))
-            .map(|path| path.join("onagre").join("theme.toml"))
+            .map(|path| path.join("onagre").join("theme.scss"))
             .unwrap(),
     )
 });
@@ -40,8 +42,13 @@ struct Cli {
 }
 
 pub fn main() -> iced::Result {
-    JournalLog::new().unwrap().install().unwrap();
-    log::set_max_level(LevelFilter::Info);
+    tracing_subscriber::registry()
+        .with(tracing_subscriber::EnvFilter::new(
+            std::env::var("RUST_LOG").unwrap_or_else(|_| "onagre=info".into()),
+        ))
+        .with(tracing_subscriber::fmt::layer())
+        .init();
+
     info!("Starting onagre");
     let cli = Cli::parse();
     // User defined theme config, $XDG_CONFIG_DIR/onagre/theme.toml otherwise