added table layout for processes, and added CPU cores' visuals

Author: Hillary520

cpu_monitor.py

@@ -8,7 +8,16 @@ def get_cpu_usage(self):
         cpu = psutil.cpu_percent(interval=1)
         return self._format_usage(cpu)
 
+    def get_cpu_cores_usage(self):
+        cores = psutil.cpu_percent(interval=1, percpu=True)
+        return [self._format_core_usage(idx, core) for idx, core in enumerate(cores)]
+
     def _format_usage(self, cpu):
         cpu_percent = cpu / 100.0
         cpu_visual = '#' * int(cpu_percent * self.bars) + '-' * (self.bars - int(cpu_percent * self.bars))
         return f"CPU: [{cpu_visual}] {cpu:.2f}%"
+
+    def _format_core_usage(self, core_idx, core):
+        core_percent = core / 100.0
+        core_visual = '#' * int(core_percent * self.bars) + '-' * (self.bars - int(core_percent * self.bars))
+        return f"Core {core_idx}: [{core_visual}] {core:.2f}%"

main.py

@@ -25,7 +25,9 @@ def main(stdscr):
 
             # Get real-time data
             cpu_output = cpu_monitor.get_cpu_usage()
+            cpu_cores_output = cpu_monitor.get_cpu_cores_usage()
             memory_output = memory_monitor.get_memory_usage()
+            swap_output = memory_monitor.get_swap_usage()
             bandwidth_output = network_monitor.get_bandwidth_usage()
             sys_info_output = system_info.get_system_info()
             processes_output = process_monitor.get_running_processes(num_processes=10)
@@ -35,36 +37,51 @@ def main(stdscr):
 
             # Define color pairs
             curses.start_color()
-            curses.init_pair(1, curses.COLOR_YELLOW, curses.COLOR_BLACK)
-            curses.init_pair(2, curses.COLOR_GREEN, curses.COLOR_BLACK)
-            curses.init_pair(3, curses.COLOR_BLUE, curses.COLOR_BLACK)
-            curses.init_pair(4, curses.COLOR_CYAN, curses.COLOR_BLACK)
-            curses.init_pair(5, curses.COLOR_RED, curses.COLOR_BLACK)
+            curses.init_pair(1, curses.COLOR_GREEN, curses.COLOR_BLACK)  # CPU color
+            curses.init_pair(2, curses.COLOR_YELLOW, curses.COLOR_BLACK) # CPU Cores color
+            curses.init_pair(3, curses.COLOR_BLUE, curses.COLOR_BLACK)   # Network color
+            curses.init_pair(4, curses.COLOR_CYAN, curses.COLOR_BLACK)   # Headers color
+            curses.init_pair(5, curses.COLOR_RED, curses.COLOR_BLACK)    # Processes color
+            curses.init_pair(6, curses.COLOR_WHITE, curses.COLOR_BLACK)  # General text color
 
-            # Print CPU and Memory Usage
-            stdscr.addstr(0, 0, "CPU Usage", curses.color_pair(4))
+            # Print CPU Usage
+            stdscr.addstr(0, 0, "CPU Usage", curses.color_pair(4) | curses.A_BOLD)
             stdscr.addstr(1, 0, cpu_output[:half_width], curses.color_pair(1))
-            stdscr.addstr(2, 0, "Memory Usage", curses.color_pair(4))
-            stdscr.addstr(3, 0, memory_output[:half_width], curses.color_pair(2))
+            for idx, core_output in enumerate(cpu_cores_output[:len(cpu_cores_output) // 2]):
+                if 2 + idx < height:
+                    stdscr.addstr(2 + idx, 0, core_output[:half_width], curses.color_pair(2))
 
-            # Print Bandwidth Usage
-            stdscr.addstr(0, half_width, "Network Usage", curses.color_pair(4))
-            stdscr.addstr(1, half_width, bandwidth_output.replace('Received', '↓').replace('Sent', '↑')[:half_width], curses.color_pair(3))
+            # Print Memory Usage and Network Usage
+            mem_net_start = 3 + len(cpu_cores_output) // 2
+            stdscr.addstr(mem_net_start, 0, "Memory Usage", curses.color_pair(4) | curses.A_BOLD)
+            stdscr.addstr(mem_net_start + 1, 0, memory_output[:half_width], curses.color_pair(6))
+            stdscr.addstr(mem_net_start + 2, 0, swap_output[:half_width], curses.color_pair(6))
+            stdscr.addstr(mem_net_start + 4, 0, "Network Usage", curses.color_pair(4) | curses.A_BOLD)
+            stdscr.addstr(mem_net_start + 5, 0, bandwidth_output.replace('Received', '↓').replace('Sent', '↑')[:half_width], curses.color_pair(3))
+
+            # Print CPU Cores in the second column
+            stdscr.addstr(0, half_width, "CPU Cores", curses.color_pair(4) | curses.A_BOLD)
+            for idx, core_output in enumerate(cpu_cores_output[len(cpu_cores_output) // 2:]):
+                if 1 + idx < height:
+                    stdscr.addstr(1 + idx, half_width, core_output[:half_width], curses.color_pair(2))
 
             # Print System Info
-            stdscr.addstr(5, 0, "System Info", curses.color_pair(4))
-            stdscr.addstr(6, 0, "-----------", curses.color_pair(4))
+            sys_info_start = mem_net_start + 7
+            stdscr.addstr(sys_info_start, 0, "System Info", curses.color_pair(4) | curses.A_BOLD)
             sys_info_lines = [line[:half_width] for line in sys_info_output.split("\n")]
             for idx, line in enumerate(sys_info_lines):
-                if 7 + idx < height:
-                    stdscr.addstr(7 + idx, 0, line, curses.color_pair(4))
+                if sys_info_start + 1 + idx < height:
+                    stdscr.addstr(sys_info_start + 1 + idx, 0, line, curses.color_pair(6))
 
-            # Print Running Processes
-            stdscr.addstr(5, half_width, "Running Processes", curses.color_pair(4))
-            stdscr.addstr(6, half_width, "-----------------", curses.color_pair(4))
+            # Print Running Processes in a table format
+            process_start = sys_info_start
+            stdscr.addstr(process_start, half_width, "Running Processes", curses.color_pair(4) | curses.A_BOLD)
+            stdscr.addstr(process_start + 1, half_width, f"{'PID':<8} {'USER':<12} {'NAME':<25} {'MEM%':<8}", curses.color_pair(6) | curses.A_BOLD)
+            processes_output = sorted(processes_output, key=lambda p: p['memory_percent'], reverse=True)
             for idx, process in enumerate(processes_output):
-                if 7 + idx < height:
-                    stdscr.addstr(7 + idx, half_width, process[:half_width], curses.color_pair(5))
+                process_info = f"{process['pid']:<8} {process['username']:<12} {process['name']:<25} {process['memory_percent']:<8.2f}"
+                if process_start + 2 + idx < height:
+                    stdscr.addstr(process_start + 2 + idx, half_width, process_info[:half_width], curses.color_pair(5))
 
             stdscr.refresh()
             time.sleep(0.5)  # Wait for 0.5 seconds before updating again

memory_monitor.py

@@ -12,3 +12,12 @@ def _format_usage(self, memory):
         memory_percent = memory / 100.0
         memory_visual = '#' * int(memory_percent * self.bars) + '-' * (self.bars - int(memory_percent * self.bars))
         return f"Memory: [{memory_visual}] {memory:.2f}%"
+
+    def get_swap_usage(self):
+        swap = psutil.swap_memory().percent
+        return self._format_usage_swap(swap)
+
+    def _format_usage_swap(self, swap):
+        swap_percent = swap / 100.0
+        swap_visual = '#' * int(swap_percent * self.bars) + '-' * (self.bars - int(swap_percent * self.bars))
+        return f"Swap: [{swap_visual}] {swap:.2f}%"

processes.py

@@ -2,23 +2,11 @@
 
 class ProcessMonitor:
     def get_running_processes(self, num_processes=10):
-        processes = psutil.process_iter(attrs=['name', 'pid', 'username'])
-        process_info = []
-        for process in processes:
+        processes = []
+        for process in psutil.process_iter(attrs=['pid', 'name', 'username', 'memory_percent']):
             try:
-                name = process.info['name']
-                pid = process.info['pid']
-                username = process.info['username']
-                process_info.append(f"{name} (PID: {pid}, User: {username})")
+                processes.append(process.info)
             except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
                 continue
-            if len(process_info) >= num_processes:
-                break
-        return process_info
-
-# Example usage:
-if __name__ == "__main__":
-    process_monitor = ProcessMonitor()
-    processes = process_monitor.get_running_processes()
-    for process in processes:
-        print(process)
+        sorted_processes = sorted(processes, key=lambda p: p['memory_percent'], reverse=True)
+        return sorted_processes[:num_processes]