Changed human friendly output in web interface network monitor

grapheneX · Aug 30, 2019 · 5fc1a5c · 5fc1a5c
1 parent 42ff3b9
commit 5fc1a5c
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 14 deletions.
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/graphenex/core/utils/sysinfo.py b/graphenex/core/utils/sysinfo.py
@@ -5,20 +5,44 @@
 import psutil
 import re
 
+
 class SysInformation:
-
+    UNITS_MAPPING = [
+        (1 << 50, ' PB'),
+        (1 << 40, ' TB'),
+        (1 << 30, ' GB'),
+        (1 << 20, ' MB'),
+        (1 << 10, ' KB'),
+        (1, (' byte', ' bytes')),
+    ]
+
+    @staticmethod
+    def pretty_size(bytes, units=UNITS_MAPPING):
+        for factor, suffix in units:
+            if bytes >= factor:
+                break
+        amount = int(bytes / factor)
+
+        if isinstance(suffix, tuple):
+            singular, multiple = suffix
+            if amount == 1:
+                suffix = singular
+            else:
+                suffix = multiple
+        return str(amount) + suffix
+
     @staticmethod
     def get_network_info():
         masks = list()
         MaskResult = namedtuple('MaskResult', ['name', 'recv', 'sent', 'slug'])
         for mask, data in OrderedDict(psutil.net_io_counters(pernic=True)).items():
             if data.packets_recv > 0 or data.packets_sent > 0:
-                res = MaskResult(mask, data.packets_recv, data.packets_sent, 
-                    SysInformation.slugify(mask))
+                res = MaskResult(mask, SysInformation.pretty_size(data.packets_recv), SysInformation.pretty_size(data.packets_sent),
+                                 SysInformation.slugify(mask))
                 masks.append(res)
 
         return masks
-    
+
     @staticmethod
     def get_disk_info():
         disks = list()
@@ -30,9 +54,9 @@ def get_disk_info():
                 disks.append(res)
             except PermissionError:
                 pass
-        
+
         return disks
-    
+
     @staticmethod
     def get_general_info():
         uname = platform.uname()
@@ -52,11 +76,12 @@ def get_all_info():
         return info_dict
 
     @staticmethod
-    def slugify(text, delim='-'): 
+    def slugify(text, delim='-'):
         """
         Generate an ASCII-only slug.
         """
-        _punctuation_re = re.compile(r'[\t !"#$%&\'()*\-/<=>?@\[\\\]^_`{|},.]+')
+        _punctuation_re = re.compile(
+            r'[\t !"#$%&\'()*\-/<=>?@\[\\\]^_`{|},.]+')
         result = []
         for word in _punctuation_re.split(text.lower()):
             word = normalize('NFKD', word) \
@@ -66,4 +91,4 @@ def slugify(text, delim='-'):
             if word:
                 result.append(word)
 
-        return delim.join(result)
+        return delim.join(result)
diff --git a/graphenex/core/web/__init__.py b/graphenex/core/web/__init__.py
@@ -6,6 +6,8 @@
 import webbrowser
 import secrets
 
+
+
 logger = GraphenexLogger(__name__)
 app = Flask(__name__)
 app.config['SECRET_KEY'] = '77a98d7971ec94c8aae6dd2d'

diff --git a/graphenex/core/web/views.py b/graphenex/core/web/views.py
@@ -33,8 +33,7 @@ def decorated_function(*args, **kwargs):
             return f(*args, **kwargs)
         else:
             emit('auth', {'text': 'Not authenticated'})
-            disconnect()
-
+
     return decorated_function