nvrl/fluxo-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 13 Wiki Activity

clippy
CI / Lint and Test (pull_request) Failing after 1m31s
Details
CI / Version Check (pull_request) Failing after 3s
Details

Browse Source
This commit is contained in:
Nils Pukropp
2026-04-03 15:01:23 +02:00
parent 16d12e6dce
commit 25ecde96fa
7 changed files with 59 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon.rs
+4 -4
View File
@@ -114,10 +114,10 @@ pub async fn run_daemon(config_path: Option<PathBuf>) -> Result<()> {
let (ev_tx, mut ev_rx) = mpsc::channel(1);
let mut watcher = RecommendedWatcher::new(
move |res: notify::Result<Event>| {
if let Ok(event) = res {
if event.kind.is_modify() || event.kind.is_create() {
let _ = ev_tx.blocking_send(());
}
if let Ok(event) = res
&& (event.kind.is_modify() || event.kind.is_create())
{
let _ = ev_tx.blocking_send(());
}
},
NotifyConfig::default(),
src/modules/backlight.rs
+4 -4
View File
@@ -114,10 +114,10 @@ impl BacklightDaemon {
let (ev_tx, ev_rx) = mpsc::channel();
let mut watcher = RecommendedWatcher::new(
move |res: notify::Result<Event>| {
if let Ok(event) = res {
if event.kind.is_modify() {
let _ = ev_tx.send(());
}
if let Ok(event) = res
&& event.kind.is_modify()
{
let _ = ev_tx.send(());
}
},
NotifyConfig::default(),
src/modules/bt/mod.rs
+22 -30
View File
@@ -137,48 +137,40 @@ impl WaybarModule for BtModule {
match action.as_str() {
"connect" => {
if let Some(mac) = args.get(1) {
if let Ok(session) = bluer::Session::new().await {
if let Ok(adapter) = session.default_adapter().await {
if let Ok(addr) = mac.parse::<bluer::Address>() {
if let Ok(device) = adapter.device(addr) {
let _ = device.connect().await;
}
}
}
if let Ok(session) = bluer::Session::new().await
&& let Ok(adapter) = session.default_adapter().await
&& let Ok(addr) = mac.parse::<bluer::Address>()
&& let Ok(device) = adapter.device(addr)
{
let _ = device.connect().await;
}
trigger_robust_poll(state.clone());
}
return Ok(WaybarOutput::default());
}
"disconnect" if bt_state.connected => {
if let Ok(session) = bluer::Session::new().await {
if let Ok(adapter) = session.default_adapter().await {
if let Ok(addr) = bt_state.device_address.parse::<bluer::Address>() {
if let Ok(device) = adapter.device(addr) {
let _ = device.disconnect().await;
}
}
}
if let Ok(session) = bluer::Session::new().await
&& let Ok(adapter) = session.default_adapter().await
&& let Ok(addr) = bt_state.device_address.parse::<bluer::Address>()
&& let Ok(device) = adapter.device(addr)
{
let _ = device.disconnect().await;
}
trigger_robust_poll(state.clone());
return Ok(WaybarOutput::default());
}
"menu_data" => {
let mut devs = Vec::new();
if let Ok(session) = bluer::Session::new().await {
if let Ok(adapter) = session.default_adapter().await {
if let Ok(addresses) = adapter.device_addresses().await {
for addr in addresses {
if let Ok(device) = adapter.device(addr) {
if device.is_paired().await.unwrap_or(false) {
let alias = device
.alias()
.await
.unwrap_or_else(|_| addr.to_string());
devs.push(format!("{} ({})", alias, addr));
}
}
}
if let Ok(session) = bluer::Session::new().await
&& let Ok(adapter) = session.default_adapter().await
&& let Ok(addresses) = adapter.device_addresses().await
{
for addr in addresses {
if let Ok(device) = adapter.device(addr)
&& device.is_paired().await.unwrap_or(false)
{
let alias = device.alias().await.unwrap_or_else(|_| addr.to_string());
devs.push(format!("{} ({})", alias, addr));
}
}
}
src/modules/dnd.rs
+5 -6
View File
@@ -89,12 +89,11 @@ impl DndDaemon {
let mut stream = props_proxy.receive_properties_changed().await?;
while let Some(signal) = stream.next().await {
let args = signal.args()?;
if args.interface_name == "org.erikreider.swaync.control" {
if let Some(val) = args.changed_properties.get("dnd") {
if let Ok(is_dnd) = bool::try_from(val) {
let _ = tx.send(DndState { is_dnd });
}
}
if args.interface_name == "org.erikreider.swaync.control"
&& let Some(val) = args.changed_properties.get("dnd")
&& let Ok(is_dnd) = bool::try_from(val)
{
let _ = tx.send(DndState { is_dnd });
}
}
}
src/modules/keyboard.rs
+8 -12
View File
@@ -76,19 +76,15 @@ impl KeyboardDaemon {
.args(["devices", "-j"])
.output()
.await
&& let Ok(json) = serde_json::from_slice::<serde_json::Value>(&output.stdout)
&& let Some(keyboards) = json.get("keyboards").and_then(|v| v.as_array())
&& let Some(main_kb) = keyboards.last()
{
if let Ok(json) = serde_json::from_slice::<serde_json::Value>(&output.stdout) {
if let Some(keyboards) = json.get("keyboards").and_then(|v| v.as_array()) {
if let Some(main_kb) = keyboards.last() {
// The last active one is usually the main one
if let Some(layout) = main_kb.get("active_keymap").and_then(|v| v.as_str())
{
let _ = tx.send(KeyboardState {
layout: layout.to_string(),
});
}
}
}
// The last active one is usually the main one
if let Some(layout) = main_kb.get("active_keymap").and_then(|v| v.as_str()) {
let _ = tx.send(KeyboardState {
layout: layout.to_string(),
});
}
}
src/modules/mpris.rs
+8 -8
View File
@@ -156,15 +156,15 @@ impl MprisDaemon {
artist = a.to_string();
}
}
if let Some(v) = metadata.get("xesam:title") {
if let Ok(t) = <&str>::try_from(v) {
title = t.to_string();
}
if let Some(v) = metadata.get("xesam:title")
&& let Ok(t) = <&str>::try_from(v)
{
title = t.to_string();
}
if let Some(v) = metadata.get("xesam:album") {
if let Ok(a) = <&str>::try_from(v) {
album = a.to_string();
}
if let Some(v) = metadata.get("xesam:album")
&& let Ok(a) = <&str>::try_from(v)
{
album = a.to_string();
}
// Only send if changed
src/signaler.rs
+8 -8
View File
@@ -36,17 +36,17 @@ impl WaybarSignaler {
}
fn send_signal(&mut self, signal_num: i32) {
if let Some(last) = self.last_signal_sent.get(&signal_num) {
if last.elapsed() < Duration::from_millis(50) {
return;
}
if let Some(last) = self.last_signal_sent.get(&signal_num)
&& last.elapsed() < Duration::from_millis(50)
{
return;
}
let mut valid_pid = false;
if let Some(pid) = self.cached_pid {
if kill(pid, None).is_ok() {
valid_pid = true;
}
if let Some(pid) = self.cached_pid
&& kill(pid, None).is_ok()
{
valid_pid = true;
}
if !valid_pid {