tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2023-12-21 10:22:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean (#31)

Browse Source
This commit is contained in:
Alex
2018-08-20 14:50:45 +02:00
committed by GitHub
parent b7e3d10fb7
commit 49232eed8d
30 changed files with 261 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/factory.cpp
View File

@ -1,38 +1,38 @@
#include "factory.hpp"
waybar::Factory::Factory(Bar &bar, Json::Value config)
: _bar(bar), _config(std::move(config))
waybar::Factory::Factory(Bar& bar, const Json::Value& config)
: bar_(bar), config_(config)
{}
waybar::IModule* waybar::Factory::makeModule(const std::string &name)
waybar::IModule* waybar::Factory::makeModule(const std::string &name) const
{
try {
if (name == "battery") {
return new waybar::modules::Battery(_config[name]);
return new waybar::modules::Battery(config_[name]);
}
if (name == "sway/workspaces") {
return new waybar::modules::sway::Workspaces(_bar, _config[name]);
return new waybar::modules::sway::Workspaces(bar_, config_[name]);
}
if (name == "sway/window") {
return new waybar::modules::sway::Window(_bar, _config[name]);
return new waybar::modules::sway::Window(bar_, config_[name]);
}
if (name == "memory") {
return new waybar::modules::Memory(_config[name]);
return new waybar::modules::Memory(config_[name]);
}
if (name == "cpu") {
return new waybar::modules::Cpu(_config[name]);
return new waybar::modules::Cpu(config_[name]);
}
if (name == "clock") {
return new waybar::modules::Clock(_config[name]);
return new waybar::modules::Clock(config_[name]);
}
if (name == "network") {
return new waybar::modules::Network(_config[name]);
return new waybar::modules::Network(config_[name]);
}
if (name == "pulseaudio") {
return new waybar::modules::Pulseaudio(_config[name]);
return new waybar::modules::Pulseaudio(config_[name]);
}
if (name.compare(0, 7, "custom/") == 0 && name.size() > 7) {
return new waybar::modules::Custom(name.substr(7), _config[name]);
return new waybar::modules::Custom(name.substr(7), config_[name]);
}
} catch (const std::exception& e) {
auto err = fmt::format("Disabling module \"{}\", {}", name, e.what());