From e363e51c877324b2371930415cd4f8fa3eecf026 Mon Sep 17 00:00:00 2001 From: Breadway Date: Wed, 24 Jun 2026 07:05:07 +0800 Subject: [PATCH] chore: repo cleanup for v0.2.0 - Fix read_cpu_temp loop: ok()? was aborting iteration on unreadable hwmon entries instead of continuing to the next; use let Ok(...) else continue - Fix osd.rs: replace stdout.unwrap() with defensive let-else guard - PKGBUILD: bump pkgver to 0.2.0, replace libpulse dep with wireplumber + pipewire-pulse + brightnessctl (actual runtime tools used) - bakery.toml: same dep fix as PKGBUILD - Cargo.toml: fix repository URL casing (breadway -> Breadway) - theme.rs: add wifi-popover-row-unsaved opacity rule Co-Authored-By: Claude Sonnet 4.6 Claude-Session: https://claude.ai/code/session_01PxgMEoa2PWNkKnW88pbMBM --- Cargo.toml | 2 +- bakery.toml | 2 +- packaging/arch/PKGBUILD | 4 ++-- src/bar/stats.rs | 2 +- src/osd.rs | 2 +- src/theme.rs | 1 + 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0794931..ce5e979 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" description = "Minimal status bar and notification daemon for Hyprland on Wayland" license = "MIT" authors = ["Breadway "] -repository = "https://github.com/breadway/breadbar" +repository = "https://github.com/Breadway/breadbar" keywords = ["wayland", "hyprland", "bar", "status-bar", "gtk4"] categories = ["gui"] diff --git a/bakery.toml b/bakery.toml index 03f03fe..bd1153f 100644 --- a/bakery.toml +++ b/bakery.toml @@ -1,7 +1,7 @@ name = "breadbar" description = "Minimal status bar and notification daemon for Hyprland" binaries = ["breadbar"] -system_deps = ["gtk4", "gtk4-layer-shell", "iw", "libpulse"] +system_deps = ["gtk4", "gtk4-layer-shell", "wireplumber", "pipewire-pulse", "brightnessctl", "iw"] optional_system_deps = ["hyprland"] bread_deps = [] diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index c021698..bb55a53 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Breadway pkgname=breadbar -pkgver=0.1.0 +pkgver=0.2.0 pkgrel=1 pkgdesc="Minimal status bar and notification daemon for Hyprland" arch=('x86_64') @@ -11,7 +11,7 @@ license=('MIT') # default -flto=auto emits GCC LTO bitcode the Rust (lld) link cannot read, # causing undefined-symbol errors. Disable LTO. options=(!lto !debug) -depends=('gtk4' 'gtk4-layer-shell' 'libpulse' 'iw') +depends=('gtk4' 'gtk4-layer-shell' 'wireplumber' 'pipewire-pulse' 'brightnessctl' 'iw') optdepends=( 'hyprland: workspace and window data integration' ) diff --git a/src/bar/stats.rs b/src/bar/stats.rs index 7dc9dc2..71f5015 100644 --- a/src/bar/stats.rs +++ b/src/bar/stats.rs @@ -298,7 +298,7 @@ async fn read_wifi() -> (String, &'static str) { fn read_cpu_temp() -> Option { for entry in fs::read_dir("/sys/class/hwmon").ok()?.flatten() { let path = entry.path(); - let name = fs::read_to_string(path.join("name")).ok()?; + let Ok(name) = fs::read_to_string(path.join("name")) else { continue }; if name.trim() == "k10temp" { let raw = fs::read_to_string(path.join("temp1_input")).ok()?; return Some(raw.trim().parse::().ok()? / 1000.0); diff --git a/src/osd.rs b/src/osd.rs index 74f0ec7..55106ec 100644 --- a/src/osd.rs +++ b/src/osd.rs @@ -32,7 +32,7 @@ fn volume_watcher(tx: mpsc::Sender) { return; }; - let stdout = child.stdout.take().unwrap(); + let Some(stdout) = child.stdout.take() else { return }; let reader = BufReader::new(stdout); for line in reader.lines().map_while(Result::ok) { diff --git a/src/theme.rs b/src/theme.rs index b104966..ba3c011 100644 --- a/src/theme.rs +++ b/src/theme.rs @@ -48,6 +48,7 @@ fn load_css() -> String { border-radius: 4px; padding: 2px 6px; }}\ .wifi-popover-row:hover {{ background: alpha({on_bg}, 0.08); }}\ .wifi-popover-row-active {{ color: {accent}; }}\ + .wifi-popover-row-unsaved {{ opacity: 0.4; }}\ .wifi-popover-loading {{ opacity: 0.5; padding: 8px; }}\ .media-widget {{ border-radius: 4px; padding: 0 6px; cursor: pointer; }}\ .media-widget:hover {{ background: alpha({on_bg}, 0.10); }}\