Skip to content

feat(image): expand ~ & $HOME in path #4607

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat(image): expand ~ & $HOME in path #4607

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16d7c9d
feat(image): expand `~` & `$HOME` in path
zspher Oct 28, 2025
d61bc85
perf(image): set image from `path` only once
zspher Oct 29, 2025
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
18 changes: 13 additions & 5 deletions src/modules/image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "modules/image.hpp"

#include <config.hpp>

waybar::modules::Image::Image(const std::string& id, const Json::Value& config)
: AModule(config, "image", id), box_(Gtk::ORIENTATION_HORIZONTAL, 0) {
box_.pack_start(image_);
Expand All @@ -26,6 +28,13 @@ waybar::modules::Image::Image(const std::string& id, const Json::Value& config)
size_ = 16;
}

if (config_["path"].isString()) {
auto result = Config::tryExpandPath(config_["path"].asString(), "");
path_ = result.empty() ? "" : result.front();
} else {
path_.clear();
}

if (interval_.count() == 0) {
interval_ = std::chrono::milliseconds::max();
}
Expand All @@ -47,13 +56,12 @@ void waybar::modules::Image::refresh(int sig) {
}

auto waybar::modules::Image::update() -> void {
if (config_["path"].isString()) {
path_ = config_["path"].asString();
} else if (config_["exec"].isString()) {
if (config_["exec"].isString()) {
output_ = util::command::exec(config_["exec"].asString(), "");
parseOutputRaw();
} else {
path_ = "";
// expand path if "~" or "$HOME" is present in original path
auto result = Config::tryExpandPath(path_, "");
path_ = result.empty() ? "" : result.front();
}

if (Glib::file_test(path_, Glib::FILE_TEST_EXISTS)) {
Expand Down