zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-04-19 19:34:24 +02:00
Code Activity

refactor: extract initialisation macro

Browse source
This commit is contained in:
Reinout Meliesie 2024-06-18 01:19:04 +02:00
parent 2ae8d50cab
commit d56f76f6a8
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
1 changed files with 119 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
src/clients/networkmanager/mod.rs
View file

@ -35,67 +35,65 @@ struct ClientInner<'l> {
dbus_connection: Connection,
}
impl Client {
fn new() -> Result<Client> {
let state = Mutable::new(State {
wired: WiredState::Unknown,
wifi: WifiState::Unknown,
cellular: CellularState::Unknown,
vpn: VpnState::Unknown,
});
let dbus_connection = Connection::system()?;
let root_object = {
let root_object = DbusProxyBlocking::new(&dbus_connection)?;
// Workaround for the fact that zbus (unnecessarily) requires a static lifetime here
Box::leak(Box::new(root_object))
};
Ok(Client(Arc::new(ClientInner {
state,
root_object,
active_connections: RwLock::new(HashMap::new()),
devices: RwLock::new(HashMap::new()),
dbus_connection,
})))
macro_rules! initialise_path_map {
(
$client:expr,
$path_map:ident,
$proxy_type:ident
$(, |$new_path:ident| $property_watcher:expr)*
) => {
let new_paths = $client.root_object.$path_map()?;
let mut path_map = HashMap::new();
for new_path in new_paths {
let new_proxy = $proxy_type::builder(&$client.dbus_connection)
.path(new_path.clone())?
.build()?;
path_map.insert(new_path.clone(), new_proxy);
$({
let $new_path = &new_path;
$property_watcher;
})*
}
*write_lock!($client.$path_map) = path_map;
};
}
fn run(&self) -> Result<()> {
macro_rules! spawn_path_list_watcher {
macro_rules! spawn_path_list_watcher {
(
$client:expr,
$property:ident,
$property_changes:ident,
$proxy_type:ident,
$(|$inner_client:ident, $new_path:ident| $property_watcher:expr,)*
$proxy_type:ident
$(, |$inner_client:ident, $new_path:ident| $property_watcher:expr)*
) => {
let client = $client.clone();
spawn_blocking_result!({
let changes = client.root_object.$property_changes();
for _ in changes {
let mut new_pathmap = HashMap::new();
let mut new_path_map = HashMap::new();
{
let new_paths = client.root_object.$property()?;
let pathmap = read_lock!(client.$property);
let path_map = read_lock!(client.$property);
for new_path in new_paths {
if pathmap.contains_key(&new_path) {
let proxy = pathmap
if path_map.contains_key(&new_path) {
let proxy = path_map
.get(&new_path)
.expect("Should contain the key, guarded by runtime check");
new_pathmap.insert(new_path, proxy.to_owned());
new_path_map.insert(new_path, proxy.to_owned());
} else {
let new_proxy = $proxy_type::builder(&client.dbus_connection)
.path(new_path.clone())?
.build()?;
new_pathmap.insert(new_path.clone(), new_proxy);
new_path_map.insert(new_path.clone(), new_proxy);
$({
let $inner_client = &client;
let $new_path = &new_path;
$property_watcher
$property_watcher;
})*
}
}
}
*write_lock!(client.$property) = new_pathmap;
*write_lock!(client.$property) = new_path_map;
client.state.set(State {
// TODO: Investigate if there's a sane way to do only the relevant updates
wired: determine_wired_state(&read_lock!(client.devices))?,
@ -107,9 +105,9 @@ impl Client {
Ok(())
});
}
}
}
macro_rules! spawn_property_watcher {
macro_rules! spawn_property_watcher {
(
$client:expr,
$path:expr,
@ -138,51 +136,54 @@ impl Client {
Ok(())
});
};
}
impl Client {
fn new() -> Result<Client> {
let state = Mutable::new(State {
wired: WiredState::Unknown,
wifi: WifiState::Unknown,
cellular: CellularState::Unknown,
vpn: VpnState::Unknown,
});
let dbus_connection = Connection::system()?;
let root_object = {
let root_object = DbusProxyBlocking::new(&dbus_connection)?;
// Workaround for the fact that zbus (unnecessarily) requires a static lifetime here
Box::leak(Box::new(root_object))
};
Ok(Client(Arc::new(ClientInner {
state,
root_object,
active_connections: RwLock::new(HashMap::new()),
devices: RwLock::new(HashMap::new()),
dbus_connection,
})))
}
// Initialisation
{
// Initial active connections path list
{
let new_paths = self.0.root_object.active_connections()?;
let mut pathmap = write_lock!(self.0.active_connections);
for new_path in new_paths {
let new_proxy =
ActiveConnectionDbusProxyBlocking::builder(&self.0.dbus_connection)
.path(new_path.clone())?
.build()?;
pathmap.insert(new_path, new_proxy);
}
}
// Initial devices path list
{
let new_paths = self.0.root_object.devices()?;
let mut pathmap = write_lock!(self.0.devices);
for new_path in new_paths {
let new_proxy = DeviceDbusProxyBlocking::builder(&self.0.dbus_connection)
.path(new_path.clone())?
.build()?;
pathmap.insert(new_path.clone(), new_proxy);
spawn_property_watcher!(self.0, new_path, receive_state_changed, devices);
}
}
fn run(&self) -> Result<()> {
initialise_path_map!(
self.0,
active_connections,
ActiveConnectionDbusProxyBlocking
);
initialise_path_map!(self.0, devices, DeviceDbusProxyBlocking, |path| {
spawn_property_watcher!(self.0, path, receive_state_changed, devices);
});
self.0.state.set(State {
wired: determine_wired_state(&read_lock!(self.0.devices))?,
wifi: determine_wifi_state(&read_lock!(self.0.devices))?,
cellular: determine_cellular_state(&read_lock!(self.0.devices))?,
vpn: determine_vpn_state(&read_lock!(self.0.active_connections))?,
});
}
spawn_path_list_watcher!(
self.0,
active_connections,
receive_active_connections_changed,
ActiveConnectionDbusProxyBlocking,
ActiveConnectionDbusProxyBlocking
);
spawn_path_list_watcher!(
self.0,
devices,
@ -190,7 +191,7 @@ impl Client {
DeviceDbusProxyBlocking,
|client, path| {
spawn_property_watcher!(client, path, receive_state_changed, devices);
},
}
);
Ok(())