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

feat(fs): Add option to remove invalid/unmounted endpoints

Browse Source
This commit is contained in:
Michael Carlberg 2016-12-30 22:44:28 +01:00
parent cb4e0e03f8
commit 53f781f527
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/modules/fs.hpp
View File

@ -61,11 +61,12 @@ namespace modules {
vector<string> m_mountpoints; vector<string> m_mountpoints;
vector<fs_mount_t> m_mounts; vector<fs_mount_t> m_mounts;
bool m_fixed = false; bool m_fixed{false};
int m_spacing = 2; bool m_remove_unmounted{false};
int m_spacing{2};
// used while formatting output // used while formatting output
size_t m_index = 0; size_t m_index{0_z};
}; };
} }

30
src/modules/fs.cpp
View File

@ -23,9 +23,10 @@ namespace modules {
*/ */
fs_module::fs_module(const bar_settings& bar, string name_) : timer_module<fs_module>(bar, move(name_)) { fs_module::fs_module(const bar_settings& bar, string name_) : timer_module<fs_module>(bar, move(name_)) {
m_mountpoints = m_conf.get_list<string>(name(), "mount"); m_mountpoints = m_conf.get_list<string>(name(), "mount");
m_fixed = m_conf.get<bool>(name(), "fixed-values", m_fixed); m_remove_unmounted = m_conf.get(name(), "remove-unmounted", m_remove_unmounted);
m_spacing = m_conf.get<int>(name(), "spacing", m_spacing); m_fixed = m_conf.get(name(), "fixed-values", m_fixed);
m_interval = chrono::duration<double>(m_conf.get<float>(name(), "interval", 30)); m_spacing = m_conf.get(name(), "spacing", m_spacing);
m_interval = m_conf.get(name(), "interval", 30s);
// Add formats and elements // Add formats and elements
m_formatter->add( m_formatter->add(
@ -47,6 +48,12 @@ namespace modules {
if (m_formatter->has(TAG_RAMP_CAPACITY)) { if (m_formatter->has(TAG_RAMP_CAPACITY)) {
m_rampcapacity = load_ramp(m_conf, name(), TAG_RAMP_CAPACITY); m_rampcapacity = load_ramp(m_conf, name(), TAG_RAMP_CAPACITY);
} }
// Warn about "unreachable" format tag
if (m_formatter->has(TAG_LABEL_UNMOUNTED) && m_remove_unmounted) {
m_log.warn("%s: Defined format tag \"%s\" will never be used (reason: `remove-unmounted = true`)", name(),
TAG_LABEL_UNMOUNTED);
}
} }
/** /**
@ -88,14 +95,25 @@ namespace modules {
mount->bytes_free = b_free; mount->bytes_free = b_free;
mount->bytes_used = b_used; mount->bytes_used = b_used;
mount->percentage_free = math_util::percentage<decltype(b_avail)>(b_avail, 0, b_total); mount->percentage_free = math_util::percentage(b_avail, 0UL, b_total);
mount->percentage_used = math_util::percentage<decltype(b_avail)>(b_used, 0, b_total); mount->percentage_used = math_util::percentage(b_used, 0UL, b_total);
mount->percentage_free_s = string_util::floatval(mount->percentage_free, 2, m_fixed, m_bar.locale); mount->percentage_free_s = string_util::floatval(mount->percentage_free, 2, m_fixed, m_bar.locale);
mount->percentage_used_s = string_util::floatval(mount->percentage_used, 2, m_fixed, m_bar.locale); mount->percentage_used_s = string_util::floatval(mount->percentage_used, 2, m_fixed, m_bar.locale);
} }
} }
if (m_remove_unmounted) {
for (auto&& mount : m_mounts) {
if (!mount->mounted) {
m_log.info("%s: Removing mountpoint \"%s\" (reason: `remove-unmounted = true`)", name(), mount->mountpoint);
m_mountpoints.erase(
std::remove(m_mountpoints.begin(), m_mountpoints.end(), mount->mountpoint), m_mountpoints.end());
m_mounts.erase(std::remove(m_mounts.begin(), m_mounts.end(), mount), m_mounts.end());
}
}
}
return true; return true;
} }
@ -105,7 +123,7 @@ namespace modules {
string fs_module::get_output() { string fs_module::get_output() {
string output; string output;
for (m_index = 0; m_index < m_mounts.size(); ++m_index) { for (m_index = 0_z; m_index < m_mounts.size(); ++m_index) {
if (!output.empty()) { if (!output.empty()) {
m_builder->space(m_spacing); m_builder->space(m_spacing);
} }