zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-08-17 14:51:04 +02:00
Code Activity

fix: panic when module controller errors

Browse source 
If an individual controller fails, it will now error independently and allow other modules to continue loading.

Fixes #1057
This commit is contained in:
Jake Stanger 2025-06-22 16:23:10 +01:00
parent 81ce2c169f
commit 673b05e337
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
2 changed files with 54 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/bar.rs
View file

@ -10,7 +10,7 @@ use gtk::{Application, ApplicationWindow, Orientation, Window, WindowType};
use gtk_layer_shell::LayerShell; use gtk_layer_shell::LayerShell;
use std::rc::Rc; use std::rc::Rc;
use std::time::Duration; use std::time::Duration;
use tracing::{debug, info}; use tracing::{debug, error, info};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
enum Inner { enum Inner {
@ -381,7 +381,10 @@ fn add_modules(
let module_factory = BarModuleFactory::new(ironbar.clone(), popup.clone()).into(); let module_factory = BarModuleFactory::new(ironbar.clone(), popup.clone()).into();
for config in modules { for config in modules {
config.create(&module_factory, content, info)?; let name = config.name();
if let Err(err) = config.create(&module_factory, content, info) {
error!("failed to create module {name}: {:?}", err);
}
} }
Ok(()) Ok(())

52
src/config/mod.rs
View file

@ -45,11 +45,10 @@ use crate::modules::workspaces::WorkspacesModule;
use crate::modules::{AnyModuleFactory, ModuleFactory, ModuleInfo}; use crate::modules::{AnyModuleFactory, ModuleFactory, ModuleInfo};
use cfg_if::cfg_if; use cfg_if::cfg_if;
use color_eyre::Result; use color_eyre::Result;
use serde::Deserialize;
use std::collections::HashMap;
#[cfg(feature = "schema")] #[cfg(feature = "schema")]
use schemars::JsonSchema; use schemars::JsonSchema;
use serde::Deserialize;
use std::collections::HashMap;
pub use self::common::{CommonConfig, ModuleJustification, ModuleOrientation, TransitionType}; pub use self::common::{CommonConfig, ModuleJustification, ModuleOrientation, TransitionType};
pub use self::layout::LayoutConfig; pub use self::layout::LayoutConfig;
@ -153,6 +152,53 @@ impl ModuleConfig {
Self::Workspaces(module) => create!(module), Self::Workspaces(module) => create!(module),
} }
} }
pub fn name(&self) -> String {
match self {
#[cfg(feature = "bindmode")]
ModuleConfig::Bindmode(_) => "Bindmode",
#[cfg(feature = "cairo")]
ModuleConfig::Cairo(_) => "Cario",
#[cfg(feature = "clipboard")]
ModuleConfig::Clipboard(_) => "Clipboard",
#[cfg(feature = "clock")]
ModuleConfig::Clock(_) => "Clock",
#[cfg(feature = "custom")]
ModuleConfig::Custom(_) => "Custom",
#[cfg(feature = "focused")]
ModuleConfig::Focused(_) => "Focused",
#[cfg(feature = "keyboard")]
ModuleConfig::Keyboard(_) => "Keyboard",
#[cfg(feature = "label")]
ModuleConfig::Label(_) => "Label",
#[cfg(feature = "launcher")]
ModuleConfig::Launcher(_) => "Launcher",
#[cfg(feature = "menu")]
ModuleConfig::Menu(_) => "Menu",
#[cfg(feature = "music")]
ModuleConfig::Music(_) => "Music",
#[cfg(feature = "network_manager")]
ModuleConfig::NetworkManager(_) => "NetworkManager",
#[cfg(feature = "notifications")]
ModuleConfig::Notifications(_) => "Notifications",
#[cfg(feature = "script")]
ModuleConfig::Script(_) => "Script",
#[cfg(feature = "sys_info")]
ModuleConfig::SysInfo(_) => "SysInfo",
#[cfg(feature = "tray")]
ModuleConfig::Tray(_) => "Tray",
#[cfg(feature = "upower")]
ModuleConfig::Upower(_) => "UPower",
#[cfg(feature = "volume")]
ModuleConfig::Volume(_) => "Volume",
#[cfg(feature = "workspaces")]
ModuleConfig::Workspaces(_) => "Workspaces",
// in case no modules are compiled
#[allow(unreachable_patterns)]
_ => "",
}
.to_string()
}
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]