pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(fs): Remove unmounted format tags

Browse source
This commit is contained in:
Michael Carlberg 2016-11-13 06:40:35 +01:00
parent 9a0df75a91
commit d2a6773c26
3 changed files with 10 additions and 12 deletions
examples
CMakeLists.txtconfig
src/modules
fs.cpp

2
examples/CMakeLists.txt
View file

@ -3,7 +3,7 @@
# #
set(MODULES_LEFT "bspwm i3 mpd") set(MODULES_LEFT "bspwm i3 mpd")
set(MODULES_CENTER "filesystem") set(MODULES_CENTER "")
set(MODULES_RIGHT "backlight volume memory cpu wlan eth battery temperature date powermenu") set(MODULES_RIGHT "backlight volume memory cpu wlan eth battery temperature date powermenu")
# Strip disabled modules {{{ # Strip disabled modules {{{

2
examples/config
View file

@ -41,7 +41,7 @@ font-1 = unifont:size=6;-2
font-2 = siji:pixelsize=10;0 font-2 = siji:pixelsize=10;0
modules-left = bspwm i3 mpd modules-left = bspwm i3 mpd
modules-center = filesystem modules-center =
modules-right = backlight volume memory cpu wlan eth battery temperature date powermenu modules-right = backlight volume memory cpu wlan eth battery temperature date powermenu
tray-position = right tray-position = right

18
src/modules/fs.cpp
View file

@ -21,8 +21,7 @@ namespace modules {
// Add formats and elements // Add formats and elements
m_formatter->add( m_formatter->add(
FORMAT_MOUNTED, TAG_LABEL_MOUNTED, {TAG_LABEL_MOUNTED, TAG_BAR_FREE, TAG_BAR_USED, TAG_RAMP_CAPACITY}); FORMAT_MOUNTED, TAG_LABEL_MOUNTED, {TAG_LABEL_MOUNTED, TAG_BAR_FREE, TAG_BAR_USED, TAG_RAMP_CAPACITY});
m_formatter->add( m_formatter->add(FORMAT_UNMOUNTED, TAG_LABEL_UNMOUNTED, {TAG_LABEL_UNMOUNTED});
FORMAT_UNMOUNTED, TAG_LABEL_UNMOUNTED, {TAG_LABEL_UNMOUNTED, TAG_BAR_FREE, TAG_BAR_USED, TAG_RAMP_CAPACITY});
if (m_formatter->has(TAG_LABEL_MOUNTED)) if (m_formatter->has(TAG_LABEL_MOUNTED))
m_labelmounted = load_optional_label(m_conf, name(), TAG_LABEL_MOUNTED, "%mountpoint% %percentage_free%"); m_labelmounted = load_optional_label(m_conf, name(), TAG_LABEL_MOUNTED, "%mountpoint% %percentage_free%");
@ -56,7 +55,7 @@ namespace modules {
auto& disk = m_disks.back(); auto& disk = m_disks.back();
while (mtab->next(&mount)) { while (mtab->next(&mount)) {
if (strncmp(mount->mnt_dir, mountpoint.c_str(), strlen(mount->mnt_dir)) != 0) { if (string{mount->mnt_dir} != mountpoint) {
continue; continue;
} }
@ -118,13 +117,8 @@ namespace modules {
builder->node(m_barused->output(disk->percentage_used)); builder->node(m_barused->output(disk->percentage_used));
} else if (tag == TAG_RAMP_CAPACITY) { } else if (tag == TAG_RAMP_CAPACITY) {
builder->node(m_rampcapacity->get_by_percentage(disk->percentage_free)); builder->node(m_rampcapacity->get_by_percentage(disk->percentage_free));
} else if (tag == TAG_LABEL_MOUNTED || tag == TAG_LABEL_UNMOUNTED) { } else if (tag == TAG_LABEL_MOUNTED) {
label_t label; auto& label = m_labelmounted;
if (tag == TAG_LABEL_MOUNTED)
label = m_labelmounted->clone();
else
label = m_labelunmounted->clone();
label->reset_tokens(); label->reset_tokens();
label->replace_token("%mountpoint%", disk->mountpoint); label->replace_token("%mountpoint%", disk->mountpoint);
@ -139,6 +133,10 @@ namespace modules {
label->replace_token("%used%", string_util::filesize(disk->bytes_used, 2, m_fixed, m_bar.locale)); label->replace_token("%used%", string_util::filesize(disk->bytes_used, 2, m_fixed, m_bar.locale));
builder->node(label); builder->node(label);
} else if (tag == TAG_LABEL_UNMOUNTED) {
m_labelunmounted->reset_tokens();
m_labelunmounted->replace_token("%mountpoint%", disk->mountpoint);
builder->node(m_labelunmounted);
} else { } else {
return false; return false;
} }