From 16f88d4401019eeedb1ba11b740edd7222a66177 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Mon, 20 Apr 2026 22:57:31 -0400
Subject: [PATCH] Combine file systems into one card

---
 cgi-bin/malp.rb | 74 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 55 insertions(+), 19 deletions(-)

diff --git a/cgi-bin/malp.rb b/cgi-bin/malp.rb
index 8be0289..c9a4cdc 100755
--- a/cgi-bin/malp.rb
+++ b/cgi-bin/malp.rb
@@ -182,16 +182,20 @@ if cgi.params.key?("content")
     end
 
     if filesystems.any?
-      html << %(<div class="section-label">File Systems</div>)
-      html << %(<div class="stack">)
-      filesystems.each do |entry|
-        mount = CGI.escapeHTML(entry["mount"].to_s)
+      total_size = filesystems.sum { |e| e["size"].to_i }
+      total_used = filesystems.sum { |e| e["used"].to_i }
+      total_pct_f = total_size > 0 ? (total_used * 100.0 / total_size) : 0.0
+      total_pct   = total_pct_f.round
+      total_cls   = total_pct_f >= 90 ? "bad" : total_pct_f >= 75 ? "warn" : "ok"
+
+      fs_rows = filesystems.map do |entry|
+        mount  = CGI.escapeHTML(entry["mount"].to_s)
         source = CGI.escapeHTML(entry["source"].to_s)
         fstype = CGI.escapeHTML(entry["fstype"].to_s)
         size_b = entry["size"].to_i
         used_b = entry["used"].to_i
-        pct_f = size_b > 0 ? (used_b * 100.0 / size_b) : 0.0
-        pct = pct_f.round
+        pct_f  = size_b > 0 ? (used_b * 100.0 / size_b) : 0.0
+        pct    = pct_f.round
         space_cls = pct_f >= 90 ? "bad" : pct_f >= 75 ? "warn" : "ok"
         used_h = CGI.escapeHTML(human_capacity(used_b))
         size_h = CGI.escapeHTML(human_capacity(size_b))
@@ -207,30 +211,62 @@ if cgi.params.key?("content")
         fs_stats << ["warn", "READ-ONLY"] if entry["readonly"]
 
         severities = [space_cls, inode_cls]
-        card_cls = severities.include?("bad")  ? "bad"  :
-                   severities.include?("warn") ? "warn" : "ok"
+        row_cls = severities.include?("bad")  ? "bad"  :
+                  severities.include?("warn") ? "warn" : "ok"
 
         stats_html = fs_stats.map { |c, txt|
           %(<span class="stat #{c}">#{CGI.escapeHTML(txt)}</span>)
         }.join
         stats_block = fs_stats.empty? ? "" :
-          %(<div class="drive-stats" style="margin-top:0.6rem;">#{stats_html}</div>)
+          %(<div class="drive-stats">#{stats_html}</div>)
 
-        html << <<~HTML
-          <div class="card #{card_cls}">
-            <div class="card-header">
-              <span class="card-title">#{mount} <span class="card-capacity">#{fstype}</span></span>
-              <span class="badge #{space_cls}">#{pct}%</span>
+        row_html = <<~HTML
+          <div class="subitem" style="flex-direction:column;align-items:stretch;gap:0.35rem;">
+            <div style="display:flex;justify-content:space-between;align-items:center;">
+              <div class="subitem-left">
+                <div class="dot #{space_cls}"></div>
+                <span class="subitem-name">#{mount} · #{source}</span>
+                <span class="card-capacity">#{fstype}</span>
+              </div>
+              <span class="subitem-value #{space_cls}">#{pct}% · #{used_h} / #{size_h}</span>
             </div>
-            <div style="display:flex;justify-content:space-between;align-items:center;margin-top:0.5rem;margin-bottom:0.3rem;">
-              <span style="font-size:0.72rem;color:#64748b;font-weight:600;">#{source}</span>
-              <span class="subitem-value #{space_cls}">#{used_h} / #{size_h}</span>
-            </div>
-            <div class="bar-track" style="height:6px;"><div class="bar-fill #{space_cls}" style="width:#{pct}%"></div></div>
+            <div class="bar-track"><div class="bar-fill #{space_cls}" style="width:#{pct}%"></div></div>
             #{stats_block}
           </div>
         HTML
+
+        [row_html, row_cls]
       end
+
+      severities = fs_rows.map { |_, c| c }
+      card_cls = severities.include?("bad")  ? "bad"  :
+                 severities.include?("warn") ? "warn" : "ok"
+
+      total_used_h = CGI.escapeHTML(human_capacity(total_used))
+      total_size_h = CGI.escapeHTML(human_capacity(total_size))
+
+      html << %(<div class="section-label">File Systems</div>)
+      html << <<~HTML
+        <div class="card #{card_cls}">
+          <div class="card-header">
+            <span class="card-title">File Systems</span>
+            <span class="badge #{total_cls}">#{total_pct}%</span>
+          </div>
+          <div class="subitems">
+      HTML
+
+      fs_rows.each { |row_html, _| html << row_html }
+
+      html << %(</div>)
+      html << <<~HTML
+        <div style="margin-top:0.75rem;padding-top:0.6rem;border-top:1px solid #1e2433;">
+          <div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:0.3rem;">
+            <span style="font-size:0.72rem;color:#64748b;font-weight:600;text-transform:uppercase;letter-spacing:0.05em;">Total</span>
+            <span class="subitem-value #{total_cls}">#{total_pct}% · #{total_used_h} / #{total_size_h}</span>
+          </div>
+          <div class="bar-track" style="height:6px;"><div class="bar-fill #{total_cls}" style="width:#{total_pct}%"></div></div>
+        </div>
+      HTML
       html << %(</div>)
     end