RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(mpd): Add module name to log messages

pull/268/head
Minijackson 2019-04-18 11:48:38 +02:00
parent 22eccc2ac2
commit ab43d34a1e
No known key found for this signature in database
GPG Key ID: FEA888C9F5D64F62
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/modules/mpd.hpp
View File

@ -36,6 +36,8 @@ class MPD : public ALabel {
bool stopped(); bool stopped();
bool playing(); bool playing();
const std::string module_name_;
using unique_connection = std::unique_ptr<mpd_connection, decltype(&mpd_connection_free)>; using unique_connection = std::unique_ptr<mpd_connection, decltype(&mpd_connection_free)>;
using unique_status = std::unique_ptr<mpd_status, decltype(&mpd_status_free)>; using unique_status = std::unique_ptr<mpd_status, decltype(&mpd_status_free)>;
using unique_song = std::unique_ptr<mpd_song, decltype(&mpd_song_free)>; using unique_song = std::unique_ptr<mpd_song, decltype(&mpd_song_free)>;

13
src/modules/mpd.cpp
View File

@ -5,6 +5,7 @@
waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config) waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config)
: ALabel(config, "{album} - {artist} - {title}", 5), : ALabel(config, "{album} - {artist} - {title}", 5),
module_name_(id.empty() ? "mpd" : "mpd#" + id),
server_(nullptr), server_(nullptr),
port_(config["port"].asUInt()), port_(config["port"].asUInt()),
connection_(nullptr, &mpd_connection_free), connection_(nullptr, &mpd_connection_free),
@ -166,12 +167,12 @@ std::string waybar::modules::MPD::getStateIcon() {
} }
if (connection_ == nullptr) { if (connection_ == nullptr) {
std::cerr << "MPD: Trying to fetch state icon while disconnected" << std::endl; std::cerr << module_name_ << ": Trying to fetch state icon while disconnected" << std::endl;
return ""; return "";
} }
if (stopped()) { if (stopped()) {
std::cerr << "MPD: Trying to fetch state icon while stopped" << std::endl; std::cerr << module_name_ << ": Trying to fetch state icon while stopped" << std::endl;
return ""; return "";
} }
@ -188,7 +189,7 @@ std::string waybar::modules::MPD::getOptionIcon(std::string optionName, bool act
} }
if (connection_ == nullptr) { if (connection_ == nullptr) {
std::cerr << "MPD: Trying to fetch option icon while disconnected" << std::endl; std::cerr << module_name_ << ": Trying to fetch option icon while disconnected" << std::endl;
return ""; return "";
} }
@ -210,7 +211,7 @@ void waybar::modules::MPD::tryConnect() {
unique_connection(mpd_connection_new(server_, port_, 5'000), &mpd_connection_free); unique_connection(mpd_connection_new(server_, port_, 5'000), &mpd_connection_free);
if (connection_ == nullptr || alternate_connection_ == nullptr) { if (connection_ == nullptr || alternate_connection_ == nullptr) {
std::cerr << "Failed to connect to MPD" << std::endl; std::cerr << module_name_ << ": Failed to connect to MPD" << std::endl;
connection_.reset(); connection_.reset();
alternate_connection_.reset(); alternate_connection_.reset();
return; return;
@ -219,7 +220,7 @@ void waybar::modules::MPD::tryConnect() {
try { try {
checkErrors(connection_.get()); checkErrors(connection_.get());
} catch (std::runtime_error e) { } catch (std::runtime_error e) {
std::cerr << "Failed to connect to MPD: " << e.what() << std::endl; std::cerr << module_name_ << ": Failed to connect to MPD: " << e.what() << std::endl;
connection_.reset(); connection_.reset();
alternate_connection_.reset(); alternate_connection_.reset();
} }
@ -230,7 +231,7 @@ void waybar::modules::MPD::checkErrors(mpd_connection* conn) {
case MPD_ERROR_SUCCESS: case MPD_ERROR_SUCCESS:
return; return;
case MPD_ERROR_CLOSED: case MPD_ERROR_CLOSED:
std::cerr << "Connection to MPD closed" << std::endl; std::cerr << module_name_ << ": Connection to MPD closed" << std::endl;
mpd_connection_clear_error(conn); mpd_connection_clear_error(conn);
connection_.reset(); connection_.reset();
alternate_connection_.reset(); alternate_connection_.reset();