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

change variable instead of substr(len)

This commit is contained in:
nullobsi 2021-02-26 13:29:58 -08:00
parent 9b9daaee6f
commit 1573e1eb97
No known key found for this signature in database
GPG Key ID: 38EE62ECC1E68FDC
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/modules/mpd/mpd.cpp
View File

@ -143,26 +143,18 @@ void waybar::modules::MPD::setLabel() {
std::string repeatIcon = getOptionIcon("repeat", repeatActivated); std::string repeatIcon = getOptionIcon("repeat", repeatActivated);
bool singleActivated = mpd_status_get_single(status_.get()); bool singleActivated = mpd_status_get_single(status_.get());
std::string singleIcon = getOptionIcon("single", singleActivated); std::string singleIcon = getOptionIcon("single", singleActivated);
if (config_["artist-len"].isInt()) artist = artist.substr(0, config_["artist-len"].asInt());
auto artistLen = config_["artist-len"].isInt() ? if (config_["album-artist-len"].isInt()) album_artist = album_artist.substr(0, config_["album-artist-len"].asInt());
config_["artist-len"].asInt() : artist.size(); if (config_["album-len"].isInt()) album = album.substr(0, config_["album-len"].asInt());
if (config_["title-len"].isInt()) title = title.substr(0,config_["title-len"].asInt());
auto albumArtistLen = config_["album-artist-len"].isInt() ?
config_["album-artist-len"].asInt() : album_artist.size();
auto albumLen = config_["album-len"].isInt() ?
config_["album-len"].asInt() : album.size();
auto titleLen = config_["title-len"].isInt() ?
config_["title-len"].asInt() : title.size();
try { try {
label_.set_markup( label_.set_markup(
fmt::format(format, fmt::format(format,
fmt::arg("artist", Glib::Markup::escape_text(artist.substr(0, artistLen)).raw()), fmt::arg("artist", Glib::Markup::escape_text(artist).raw()),
fmt::arg("albumArtist", Glib::Markup::escape_text(album_artist.substr(0, albumArtistLen)).raw()), fmt::arg("albumArtist", Glib::Markup::escape_text(album_artist).raw()),
fmt::arg("album", Glib::Markup::escape_text(album.substr(0, albumLen)).raw()), fmt::arg("album", Glib::Markup::escape_text(album).raw()),
fmt::arg("title", Glib::Markup::escape_text(title.substr(0, titleLen)).raw()), fmt::arg("title", Glib::Markup::escape_text(title).raw()),
fmt::arg("date", Glib::Markup::escape_text(date).raw()), fmt::arg("date", Glib::Markup::escape_text(date).raw()),
fmt::arg("elapsedTime", elapsedTime), fmt::arg("elapsedTime", elapsedTime),
fmt::arg("totalTime", totalTime), fmt::arg("totalTime", totalTime),
@ -183,10 +175,10 @@ void waybar::modules::MPD::setLabel() {
: "MPD (connected)"; : "MPD (connected)";
try { try {
auto tooltip_text = fmt::format(tooltip_format, auto tooltip_text = fmt::format(tooltip_format,
fmt::arg("artist", artist.substr(0, artistLen).raw()), fmt::arg("artist", artist.raw()),
fmt::arg("albumArtist", album_artist.substr(0, albumArtistLen).raw()), fmt::arg("albumArtist", album_artist.raw()),
fmt::arg("album", album.substr(0, albumLen).raw()), fmt::arg("album", album.raw()),
fmt::arg("title", title.substr(0, titleLen).raw()), fmt::arg("title", title.raw()),
fmt::arg("date", date), fmt::arg("date", date),
fmt::arg("elapsedTime", elapsedTime), fmt::arg("elapsedTime", elapsedTime),
fmt::arg("totalTime", totalTime), fmt::arg("totalTime", totalTime),