From f0bb0c2887e55c65896fdbc2b38a5d1b0579a904 Mon Sep 17 00:00:00 2001
From: Akashdeep Dhar <akashdeep.dhar@gmail.com>
Date: Nov 23 2021 06:09:11 +0000
Subject: Create mainwind subpackage under reader package


Signed-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>

---

diff --git a/obserware/readers/mainwind/__init__.py b/obserware/readers/mainwind/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/obserware/readers/mainwind/__init__.py
diff --git a/obserware/readers/mainwind/tab_performance.py b/obserware/readers/mainwind/tab_performance.py
new file mode 100644
index 0000000..62a6699
--- /dev/null
+++ b/obserware/readers/mainwind/tab_performance.py
@@ -0,0 +1,88 @@
+import getpass
+from os import uname
+
+import cpuinfo
+import psutil
+
+
+def return_bottombar_threaded_statistics():
+    retndata = {
+        "cpud_percent": psutil.cpu_percent(),
+        "memo_percent": psutil.virtual_memory().percent,
+        "swap_percent": psutil.swap_memory().percent,
+        "disk_percent": psutil.disk_usage("/").percent,
+    }
+    return retndata
+
+
+def return_bottombar_onetimed_statistics():
+    retndata = {
+        "username": getpass.getuser(),
+        "hostname": uname().nodename,
+        "systname": uname().sysname,
+        "rlsename": uname().release,
+    }
+    return retndata
+
+
+def return_mainscreen_onetimed_statistics():
+    retndata = {
+        "cpudinfo": cpuinfo.get_cpu_info()["brand_raw"],
+        "memoinfo": psutil.virtual_memory().total // 1048576,
+        "swapinfo": psutil.swap_memory().total // 1048576,
+    }
+    return retndata
+
+
+def return_mainscreen_threaded_statistics():
+    retndata = {
+        "memo": {
+            "percentage": {
+                "used": psutil.virtual_memory().used
+                * 100
+                / psutil.virtual_memory().total,
+                "cached": psutil.virtual_memory().cached
+                * 100
+                / psutil.virtual_memory().total,
+                "free": psutil.virtual_memory().free
+                * 100
+                / psutil.virtual_memory().total,
+            },
+            "absolute": {
+                "used": psutil.virtual_memory().used // 1048576,
+                "cached": psutil.virtual_memory().cached // 1048576,
+                "free": psutil.virtual_memory().free // 1048576,
+                "total": psutil.virtual_memory().total // 1048576,
+                "active": psutil.virtual_memory().active // 1048576,
+                "buffers": psutil.virtual_memory().buffers // 1048576,
+                "shared": psutil.virtual_memory().shared // 1048576,
+                "slab": psutil.virtual_memory().slab // 1048576,
+            },
+        },
+        "swap": {
+            "percentage": {
+                "used": psutil.swap_memory().used * 100 / psutil.swap_memory().total,
+                "free": psutil.swap_memory().free * 100 / psutil.swap_memory().total,
+            },
+            "absolute": {
+                "used": psutil.swap_memory().used // 1048576,
+                "free": psutil.swap_memory().free // 1048576,
+                "total": psutil.swap_memory().total // 1048576,
+                "sin": psutil.swap_memory().sin // 1048576,
+                "sout": psutil.swap_memory().sout // 1048576,
+            },
+        },
+        "cpud": {
+            "percentage": {
+                "used": psutil.cpu_percent(),
+                "free": 100 - psutil.cpu_percent(),
+            },
+            "absolute": {
+                "ctx_switches": psutil.cpu_stats().ctx_switches,
+                "interrupts": psutil.cpu_stats().interrupts,
+                "soft_interrupts": psutil.cpu_stats().soft_interrupts,
+                "sys_calls": psutil.cpu_stats().syscalls,
+            },
+        },
+    }
+    return retndata
diff --git a/obserware/readers/mainwind_mx.py b/obserware/readers/mainwind_mx.py
deleted file mode 100644
index 62a6699..0000000
--- a/obserware/readers/mainwind_mx.py
+++ /dev/null
@@ -1,88 +0,0 @@
-import getpass
-from os import uname
-
-import cpuinfo
-import psutil
-
-
-def return_bottombar_threaded_statistics():
-    retndata = {
-        "cpud_percent": psutil.cpu_percent(),
-        "memo_percent": psutil.virtual_memory().percent,
-        "swap_percent": psutil.swap_memory().percent,
-        "disk_percent": psutil.disk_usage("/").percent,
-    }
-    return retndata
-
-
-def return_bottombar_onetimed_statistics():
-    retndata = {
-        "username": getpass.getuser(),
-        "hostname": uname().nodename,
-        "systname": uname().sysname,
-        "rlsename": uname().release,
-    }
-    return retndata
-
-
-def return_mainscreen_onetimed_statistics():
-    retndata = {
-        "cpudinfo": cpuinfo.get_cpu_info()["brand_raw"],
-        "memoinfo": psutil.virtual_memory().total // 1048576,
-        "swapinfo": psutil.swap_memory().total // 1048576,
-    }
-    return retndata
-
-
-def return_mainscreen_threaded_statistics():
-    retndata = {
-        "memo": {
-            "percentage": {
-                "used": psutil.virtual_memory().used
-                * 100
-                / psutil.virtual_memory().total,
-                "cached": psutil.virtual_memory().cached
-                * 100
-                / psutil.virtual_memory().total,
-                "free": psutil.virtual_memory().free
-                * 100
-                / psutil.virtual_memory().total,
-            },
-            "absolute": {
-                "used": psutil.virtual_memory().used // 1048576,
-                "cached": psutil.virtual_memory().cached // 1048576,
-                "free": psutil.virtual_memory().free // 1048576,
-                "total": psutil.virtual_memory().total // 1048576,
-                "active": psutil.virtual_memory().active // 1048576,
-                "buffers": psutil.virtual_memory().buffers // 1048576,
-                "shared": psutil.virtual_memory().shared // 1048576,
-                "slab": psutil.virtual_memory().slab // 1048576,
-            },
-        },
-        "swap": {
-            "percentage": {
-                "used": psutil.swap_memory().used * 100 / psutil.swap_memory().total,
-                "free": psutil.swap_memory().free * 100 / psutil.swap_memory().total,
-            },
-            "absolute": {
-                "used": psutil.swap_memory().used // 1048576,
-                "free": psutil.swap_memory().free // 1048576,
-                "total": psutil.swap_memory().total // 1048576,
-                "sin": psutil.swap_memory().sin // 1048576,
-                "sout": psutil.swap_memory().sout // 1048576,
-            },
-        },
-        "cpud": {
-            "percentage": {
-                "used": psutil.cpu_percent(),
-                "free": 100 - psutil.cpu_percent(),
-            },
-            "absolute": {
-                "ctx_switches": psutil.cpu_stats().ctx_switches,
-                "interrupts": psutil.cpu_stats().interrupts,
-                "soft_interrupts": psutil.cpu_stats().soft_interrupts,
-                "sys_calls": psutil.cpu_stats().syscalls,
-            },
-        },
-    }
-    return retndata