From 30e2420f089867a1b084246487eb6fb4968323b8 Mon Sep 17 00:00:00 2001
From: Facetoe <facetoe@facetoe.com.au>
Date: Thu, 11 Aug 2016 17:23:11 +0800
Subject: [PATCH] Revert breaking changes to disk.py

(163af76e89e36e3d238016afe9e46c65c7c9306b,
73dae9bfec7e16be4b9ad363700a9365e48695fe)
---
 i3pystatus/disk.py | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/i3pystatus/disk.py b/i3pystatus/disk.py
index 9d08614..5b130f2 100644
--- a/i3pystatus/disk.py
+++ b/i3pystatus/disk.py
@@ -1,23 +1,15 @@
 import os
 
 from i3pystatus import IntervalModule
-
 from .core.util import round_dict
 
 
 class Disk(IntervalModule):
     """
-    Obtains usage statistics from the given mounted filesystem.
+    Gets ``{used}``, ``{free}``, ``{avail}`` and ``{total}`` amount of bytes on the given mounted filesystem.
 
-     .. rubric:: Available formatters
-
-     * `{used}`  — used space (unit determined by divisor)
-     * `{free}`  — free space (unit determined by divisor)
-     * `{avail}` — avail space (unit determined by divisor)
-     * `{total}` — total space (unit determined by divisor)
-     * `{percentage_used}`  — percentage used
-     * `{percentage_free}`  — percentage free
-     * `{percentage_avail}`  — percentage avail
+    These values can also be expressed as percentages with the ``{percentage_used}``, ``{percentage_free}``
+    and ``{percentage_avail}`` formats.
     """
 
     settings = (
@@ -27,9 +19,6 @@ class Disk(IntervalModule):
         ("display_limit", "if more space is available than this limit the module is hidden"),
         ("critical_limit", "critical space limit (see critical_color)"),
         ("critical_color", "the critical color"),
-        ("critical_metric",
-         "the metric used for calculating the critical limit. Available metrics are "
-         "used, free, avail, percentage_free, percentage_avail and percentage_used."),
         ("color", "the common color"),
         ("round_size", "precision, None for INT"),
         ("mounted_only", "display only if path is a valid mountpoint"),
@@ -40,7 +29,6 @@ class Disk(IntervalModule):
     color = "#FFFFFF"
     color_not_mounted = "#FFFFFF"
     critical_color = "#FF0000"
-    critical_metric = 'avail'
     format = "{free}/{avail}"
     format_not_mounted = None
     divisor = 1024 ** 3
@@ -76,6 +64,8 @@ class Disk(IntervalModule):
             self.output = {}
             return
 
+        critical = available < self.critical_limit
+
         cdict = {
             "total": (stat.f_bsize * stat.f_blocks) / self.divisor,
             "free": (stat.f_bsize * stat.f_bfree) / self.divisor,
@@ -85,12 +75,6 @@ class Disk(IntervalModule):
             "percentage_avail": stat.f_bavail / stat.f_blocks * 100,
             "percentage_used": (stat.f_blocks - stat.f_bfree) / stat.f_blocks * 100,
         }
-
-        if self.critical_metric not in cdict:
-            raise Exception("{} is not a valid critical_metric. Available metrics: {}"
-                            .format(self.critical_metric, list(cdict.keys())))
-        critical = (cdict[self.critical_metric] > self.critical_limit) and self.critical_limit > 0
-
         round_dict(cdict, self.round_size)
 
         self.data = cdict