Skip to content

fix(battery): prefer Mains/USB supplies when auto-detecting the adapter #5269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
klizas wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(battery): prefer Mains/USB supplies when auto-detecting the adapter #5269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 37 additions & 4 deletions src/modules/battery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,12 @@ void waybar::modules::Battery::refreshBatteries() {
check_map[bat.first] = false;
}

fs::path named_adapter;
fs::path mains_adapter;
fs::path usb_adapter;
fs::path online_adapter;
fs::path status_adapter;

try {
for (auto& node : fs::directory_iterator(data_dir_)) {
if (!fs::is_directory(node)) {
Expand Down Expand Up @@ -154,15 +160,42 @@ void waybar::modules::Battery::refreshBatteries() {
}
}
}
auto adap_defined = config_["adapter"].isString();
if (((adap_defined && dir_name == config_["adapter"].asString()) || !adap_defined) &&
(fs::exists(node.path() / "online") || fs::exists(node.path() / "status"))) {
adapter_ = node.path();
if (config_["adapter"].isString()) {
if (dir_name == config_["adapter"].asString() &&
(fs::exists(node.path() / "online") || fs::exists(node.path() / "status"))) {
named_adapter = node.path();
}
} else {
std::string type;
if (fs::exists(node.path() / "online")) {
std::ifstream{node.path() / "type"} >> type;
if (type == "Mains" && mains_adapter.empty()) {
mains_adapter = node.path();
} else if (type.starts_with("USB") && usb_adapter.empty()) {
usb_adapter = node.path();
} else if (online_adapter.empty()) {
online_adapter = node.path();
}
} else if (status_adapter.empty() && fs::exists(node.path() / "status")) {
status_adapter = node.path();
}
}
}
} catch (fs::filesystem_error& e) {
spdlog::warn("Battery directory tracking failed: {}", e.what());
}

if (!named_adapter.empty()) {
adapter_ = named_adapter;
} else if (!mains_adapter.empty()) {
adapter_ = mains_adapter;
} else if (!usb_adapter.empty()) {
adapter_ = usb_adapter;
} else if (!online_adapter.empty()) {
adapter_ = online_adapter;
} else if (!status_adapter.empty()) {
adapter_ = status_adapter;
}
if (warnFirstTime_ && batteries_.empty()) {
if (config_["bat"].isString()) {
spdlog::warn("No battery named {0}", config_["bat"].asString());
Expand Down
Loading