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

Ellipsize song info when too long 

When artist, title, album artist, or album are truncated, trim trailing whitespace & replace last 3 characters with "..." as long as they are longer than (char limit - 3).
Currently, "max_length" being set will cause the entire "format" string to be truncated & ellipsized, but there is no way to ellipsize the individual tags.

e.g. with artist-len == 13 and artist == "Queens of the Stone Age"
Old behavior: artist = "Queens of the"
New behavior: artist = "Queens of..."
pull/1369/head
Kogasa 2022-01-04 01:43:49 -06:00 committed by GitHub
parent ce56a80792
commit 4d266cfb64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,10 +147,53 @@ 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()); if (config_["artist-len"].isInt()) {
if (config_["album-artist-len"].isInt()) album_artist = album_artist.substr(0, config_["album-artist-len"].asInt()); if (artist.length() > (config_["artist-len"].asInt() - 3U)) {
if (config_["album-len"].isInt()) album = album.substr(0, config_["album-len"].asInt()); artist = artist.substr(0, config_["artist-len"].asInt() - 3U);
if (config_["title-len"].isInt()) title = title.substr(0,config_["title-len"].asInt()); std::size_t found = artist.find_last_not_of(" \t\f\v\n\r");
if (found != std::string::npos) {
artist = artist.erase(found + 1).append("...");
} else
artist.clear();
} else
artist = artist.substr(0, config_["artist-len"].asInt());
}
if (config_["album-artist-len"].isInt()) {
if (album_artist.length() > (config_["album-artist-len"].asInt() - 3U)) {
album_artist = album_artist.substr(0, config_["album-artist-len"].asInt() - 3U);
std::size_t found = album_artist.find_last_not_of(" \t\f\v\n\r");
if (found != std::string::npos) {
album_artist = album_artist.erase(found + 1).append("...");
} else
album_artist.clear();
} else
album_artist = album_artist.substr(0, config_["album-artist-len"].asInt());
}
if (config_["album-len"].isInt()) {
if (album.length() > (config_["album-len"].asInt() - 3U)) {
album = album.substr(0, config_["album-len"].asInt() - 3U);
std::size_t found = album.find_last_not_of(" \t\f\v\n\r");
if (found != std::string::npos) {
album = album.erase(found + 1).append("...");
} else
album.clear();
} else
album = album.substr(0, config_["album-len"].asInt());
}
if (config_["title-len"].isInt()) {
if (title.length() > (config_["title-len"].asInt() - 3U)) {
title = title.substr(0, config_["title-len"].asInt() - 3U);
std::size_t found = title.find_last_not_of(" \t\f\v\n\r");
if (found != std::string::npos) {
title = title.erase(found + 1).append("...");
} else
title.clear();
} else
title = title.substr(0, config_["title-len"].asInt());
}
try { try {
label_.set_markup( label_.set_markup(