From d2a6773c2682c6ce1c2062d7c5d020c51f57d76c Mon Sep 17 00:00:00 2001
From: Michael Carlberg <c@rlberg.se>
Date: Sun, 13 Nov 2016 06:40:35 +0100
Subject: [PATCH] fix(fs): Remove unmounted format tags

---
 examples/CMakeLists.txt |  2 +-
 examples/config         |  2 +-
 src/modules/fs.cpp      | 18 ++++++++----------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 97caf746..c5df1e67 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 
 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")
 
 # Strip disabled modules {{{
diff --git a/examples/config b/examples/config
index 5928e374..cabeff7f 100644
--- a/examples/config
+++ b/examples/config
@@ -41,7 +41,7 @@ font-1 = unifont:size=6;-2
 font-2 = siji:pixelsize=10;0
 
 modules-left = bspwm i3 mpd
-modules-center = filesystem
+modules-center = 
 modules-right = backlight volume memory cpu wlan eth battery temperature date powermenu
 
 tray-position = right
diff --git a/src/modules/fs.cpp b/src/modules/fs.cpp
index cdfd9811..3a52e9ea 100644
--- a/src/modules/fs.cpp
+++ b/src/modules/fs.cpp
@@ -21,8 +21,7 @@ namespace modules {
     // Add formats and elements
     m_formatter->add(
         FORMAT_MOUNTED, TAG_LABEL_MOUNTED, {TAG_LABEL_MOUNTED, TAG_BAR_FREE, TAG_BAR_USED, TAG_RAMP_CAPACITY});
-    m_formatter->add(
-        FORMAT_UNMOUNTED, TAG_LABEL_UNMOUNTED, {TAG_LABEL_UNMOUNTED, TAG_BAR_FREE, TAG_BAR_USED, TAG_RAMP_CAPACITY});
+    m_formatter->add(FORMAT_UNMOUNTED, TAG_LABEL_UNMOUNTED, {TAG_LABEL_UNMOUNTED});
 
     if (m_formatter->has(TAG_LABEL_MOUNTED))
       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();
 
       while (mtab->next(&mount)) {
-        if (strncmp(mount->mnt_dir, mountpoint.c_str(), strlen(mount->mnt_dir)) != 0) {
+        if (string{mount->mnt_dir} != mountpoint) {
           continue;
         }
 
@@ -118,13 +117,8 @@ namespace modules {
       builder->node(m_barused->output(disk->percentage_used));
     } else if (tag == TAG_RAMP_CAPACITY) {
       builder->node(m_rampcapacity->get_by_percentage(disk->percentage_free));
-    } else if (tag == TAG_LABEL_MOUNTED || tag == TAG_LABEL_UNMOUNTED) {
-      label_t label;
-
-      if (tag == TAG_LABEL_MOUNTED)
-        label = m_labelmounted->clone();
-      else
-        label = m_labelunmounted->clone();
+    } else if (tag == TAG_LABEL_MOUNTED) {
+      auto& label = m_labelmounted;
 
       label->reset_tokens();
       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));
 
       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 {
       return false;
     }