From ca47c2c97e60a94742dd8a0b14f0eafbe58fd613 Mon Sep 17 00:00:00 2001
From: nicolargo <nicolashennion@gmail.com>
Date: Sat, 21 Nov 2015 15:38:28 +0100
Subject: [PATCH] First try for the Folders plugin in the WebUI

---
 conf/glances.conf                              | 18 +++++++++---------
 glances/outputs/glances_curses.py              |  4 ++--
 glances/outputs/static/html/index.html         |  1 +
 glances/outputs/static/html/stats.html         |  1 +
 .../{glances_folder.py => glances_folders.py}  |  0
 5 files changed, 13 insertions(+), 11 deletions(-)
 rename glances/plugins/{glances_folder.py => glances_folders.py} (100%)

diff --git a/conf/glances.conf b/conf/glances.conf
index dbee5a7d..6b6e78e4 100644
--- a/conf/glances.conf
+++ b/conf/glances.conf
@@ -99,7 +99,7 @@ critical=90
 # Allow additionnals files types (comma-separated FS type)
 #allow=zfs
 
-#[folders]
+[folders]
 # Define a folder list to monitor
 # The list is composed of items (list_#nb <= 10)
 # An item is defined by:
@@ -107,14 +107,14 @@ critical=90
 # * careful: optional careful threshold (in MB)
 # * warning: optional warning threshold (in MB)
 # * critical: optional critical threshold (in MB)
-#folder_1_path=/tmp
-#folder_1_careful=2500
-#folder_1_warning=3000
-#folder_1_critical=3500
-#folder_2_path=/home/nicolargo/Videos
-#folder_2_warning=17000
-#folder_2_critical=20000
-#folder_3_path=/nonexisting
+folder_1_path=/tmp
+folder_1_careful=2500
+folder_1_warning=3000
+folder_1_critical=3500
+folder_2_path=/home/nicolargo/Videos
+folder_2_warning=17000
+folder_2_critical=20000
+folder_3_path=/nonexisting
 
 [sensors]
 # Sensors core thresholds (in Celsius...)
diff --git a/glances/outputs/glances_curses.py b/glances/outputs/glances_curses.py
index 3d340d8a..5155ba8e 100644
--- a/glances/outputs/glances_curses.py
+++ b/glances/outputs/glances_curses.py
@@ -497,7 +497,7 @@ class _GlancesCurses(object):
             'diskio').get_stats_display(args=self.args)
         stats_fs = stats.get_plugin('fs').get_stats_display(
             args=self.args, max_width=plugin_max_width)
-        stats_folder = stats.get_plugin('folder').get_stats_display(
+        stats_folders = stats.get_plugin('folders').get_stats_display(
             args=self.args, max_width=plugin_max_width)
         stats_raid = stats.get_plugin('raid').get_stats_display(
             args=self.args)
@@ -675,7 +675,7 @@ class _GlancesCurses(object):
             self.new_line()
             self.display_plugin(stats_fs)
             self.new_line()
-            self.display_plugin(stats_folder)
+            self.display_plugin(stats_folders)
             self.new_line()
             self.display_plugin(stats_raid)
             self.new_line()
diff --git a/glances/outputs/static/html/index.html b/glances/outputs/static/html/index.html
index 46493c8c..d0272694 100644
--- a/glances/outputs/static/html/index.html
+++ b/glances/outputs/static/html/index.html
@@ -25,6 +25,7 @@
     <script type="text/javascript" src="services/plugins/glances_diskio.js"></script>
     <script type="text/javascript" src="services/plugins/glances_docker.js"></script>
     <script type="text/javascript" src="services/plugins/glances_fs.js"></script>
+    <script type="text/javascript" src="services/plugins/glances_folders.js"></script>
     <script type="text/javascript" src="services/plugins/glances_ip.js"></script>
     <script type="text/javascript" src="services/plugins/glances_load.js"></script>
     <script type="text/javascript" src="services/plugins/glances_mem.js"></script>
diff --git a/glances/outputs/static/html/stats.html b/glances/outputs/static/html/stats.html
index 8a201c9a..2d9b245a 100644
--- a/glances/outputs/static/html/stats.html
+++ b/glances/outputs/static/html/stats.html
@@ -51,6 +51,7 @@
                 <section id="network" class="plugin table-row-group" ng-show="show.network" ng-include src="'plugins/network.html'"></section>
                 <section id="diskio" class="plugin table-row-group" ng-show="show.diskio" ng-include src="'plugins/diskio.html'"></section>
                 <section id="fs" class="plugin table-row-group" ng-show="show.fs" ng-include src="'plugins/fs.html'"></section>
+                <section id="folders" class="plugin table-row-group" ng-show="show.folders" ng-include src="'plugins/folders.html'"></section>
                 <section id="raid" class="plugin table-row-group" ng-show="statsRaid.hasDisks()" ng-include src="'plugins/raid.html'"></section>
                 <section id="sensors" class="plugin table-row-group" ng-show="show.sensors && statsSensors.sensors.length > 0" ng-include src="'plugins/sensors.html'"></section>
             </div>
diff --git a/glances/plugins/glances_folder.py b/glances/plugins/glances_folders.py
similarity index 100%
rename from glances/plugins/glances_folder.py
rename to glances/plugins/glances_folders.py