Merge pull request #6 from HoodedUnicorn/test

Test

Author: HoodedUnicorn

FPS-Monitor.py

@@ -1,84 +1,86 @@
-import platform
-
 import pygame
 import sys
 import psutil
 import gpustat
-from GPUtil import GPUtil
+import cpuinfo
+
+
+pygame.init()
+height = 700
+width = 300
+screen = pygame.display.set_mode((height, width))
+clock = pygame.time.Clock()
+font = pygame.font.SysFont("Century Gothic", 16)
 
 
 def fpsrun():
     fps = str(int(clock.get_fps()))
-    fps_text = font.render(fps, 1, pygame.Color("white"))
+    fps_text = font.render("FPS: " + fps, 1, pygame.Color("white"))
     return fps_text
 
 
-class SystemInfo:
-    def __init__(self):
-        self.gpu_usage = None
-        self.gpu_name = None
-        self.cpu_usage = None
-        self.cpu_name = None
-
-
-sys_info = SystemInfo()
-
-# Get GPU usage and name
-gpu_percent = GPUtil.getGPUs()[0].load
-sys_info.gpu_usage = gpu_percent
-sys_info.gpu_name = GPUtil.getGPUs()[0].name
-
-# Get CPU usage and name
-sys_info.cpu_usage = psutil.cpu_percent()
-sys_info.cpu_name = platform.processor()
-
-# Print the information
-print("GPU: ", sys_info.gpu_name, " Usage: ", sys_info.gpu_usage, "%")
-print("CPU: ", sys_info.cpu_name, " Usage: ", sys_info.cpu_usage, "%")
-
-
 def get_cpu_usage():
+    cpu_info = cpuinfo.get_cpu_info()['brand_raw']
     cpu_usage = psutil.cpu_percent()
-    return str(cpu_usage) + "%"
 
+    if 'AMD' in cpu_info:
+        color = pygame.Color("red")
+    elif 'Intel' in cpu_info:
+        color = pygame.Color("blue")
+    else:
+        color = pygame.Color("white")
+
+    cpu_usage_text = font.render("CPU Usage: " + str(cpu_usage) + "%", 1, color)
+    return cpu_usage_text
 
 def get_cpu_name():
-    # Get CPU information
-    cpu_percent = psutil.cpu_percent()
-    cpu_name = psutil.cpu_freq().name
-    logical_cpus = psutil.cpu_count()
-    physical_cpus = psutil.cpu_count(logical=False)
+    cpu_name = cpuinfo.get_cpu_info()['brand_raw']
+    if 'AMD' in cpu_name:
+        cpu_name_text = font.render("CPU Name: " + cpu_name, 1, pygame.Color("red"))
+    elif 'Intel' in cpu_name:
+        cpu_name_text = font.render("CPU Name: " + cpu_name, 1, pygame.Color("blue"))
+    else:
+        cpu_name_text = font.render("CPU Name: " + cpu_name, 1, pygame.Color("white"))
+    return cpu_name_text
 
 
 def get_gpu_usage():
     gpu_stats = gpustat.GPUStatCollection.new_query()
     gpu_usage = gpu_stats.gpus[0].utilization
-    return str(gpu_usage) + "%"
+    gpu_usage_text = font.render("GPU Usage: " + str(gpu_usage) + "%", 1, pygame.Color("green"))
+    return gpu_usage_text
 
 
-pygame.init()
-height = 700
-width = 150
-screen = pygame.display.set_mode((height, width))
-# screen = pygame.display.set_mode((height,width),pygame.RESIZABLE)
-clock = pygame.time.Clock()
-font = pygame.font.SysFont("Century Gothic", 16)
+def get_gpu_name():
+    gpu_stats = gpustat.GPUStatCollection.new_query()
+    gpu_name = gpu_stats.gpus[0].name
+    gpu_name_text = font.render("GPU Name: " + gpu_name, 1, pygame.Color("green"))
+    return gpu_name_text
+
 
-gpu_usage_text = font.render(get_gpu_usage(), 1, pygame.Color("white"))
-screen.blit(gpu_usage_text, (60, 50))
-cpu_usage_text = font.render(get_cpu_usage(), 1, pygame.Color("white"))
-screen.blit(cpu_usage_text, (60, 100))
-
-i = 0
-while i <= 10:
-    screen.fill((0, 0, 0))
-    gpu_usage_text = font.render("GPU: " + sys_info.gpu_name + " Usage: " + str(sys_info.gpu_usage) + "%", True, (255, 255, 255))
-    cpu_usage_text = font.render("CPU: " + sys_info.cpu_name + " Usage: " + str(sys_info.cpu_usage) + "%", True, (255, 255, 255))
-    screen.blit(fpsrun(), (60, 50))
-    screen.blit(gpu_usage_text, (60, 80))
-    screen.blit(cpu_usage_text, (60, 110))
+def get_ram_info():
+    ram_info = psutil.virtual_memory()
+    return "Total RAM: " + str(ram_info.total // (1024**2)) + "MB"
+
+
+def get_ram_usage():
+    ram_usage = psutil.virtual_memory().percent
+    return str(ram_usage) + "%"
+
+
+while True:
     for event in pygame.event.get():
         if event.type == pygame.QUIT:
+            pygame.quit()
             sys.exit()
-    clock.tick(60)
+    screen.fill(pygame.Color("black"))
+    screen.blit(fpsrun(), (20, 20))
+    screen.blit(get_cpu_name(), (20, 50))
+    screen.blit(get_cpu_usage(), (20, 70))
+    screen.blit(get_gpu_name(), (20, 100))
+    screen.blit(get_gpu_usage(), (20, 120))
+    screen.blit(font.render("RAM Info: " + get_ram_info(), 1, pygame.Color("orange")), (20, 150))
+    screen.blit(font.render("RAM Usage: " + get_ram_usage(), 1, pygame.Color("orange")), (20, 170))
+
     pygame.display.update()
+    clock.tick(60)

README.md

@@ -11,13 +11,15 @@ This is a Python script that uses the Pygame library to display the current FPS
 * Pygame
 * Psutil
 * Gpustat
+* cpuinfo
+* sys
 
 <h2>Installation :computer: </h2>
 
 
 <h3>Install via NPM packages :factory:</h3>
 
- * Install the dependencies by running `pip install pygame psutil gpustat` in the command line. <br>
+ * Install the dependencies by running `pip install pygame psutil gpustat cpuinfo` in the command line. <br>
  * Install package via NPM package manager `npm i @hoodedunicorn/python-fps-monitor` <br>
  * Run the script using `python FPS-Monitor.py`
 
@@ -33,6 +35,7 @@ To exit the script, simply close the window or press the 'X' button in the top r
 <h2>Additional Features :space_invader: </h2>
 
 You can customize the script to display additional information such as GPU memory usage or CPU temperature. You can also change the font, text color and background color of the window to match your personal preferences.
+<br>
 
 <h2>Limitations :warning: </h2>
 
@@ -42,12 +45,4 @@ This script is only compatible with NVidia GPUs. It will not work with other typ
 
 This script is a useful tool for monitoring the performance of your system while running resource-intensive applications such as games or video editing software. It is easy to install and customize, making it a valuable addition to any developer or gamer's toolbox.
 
-<h2>Versions :pizza:</h2>
-
-<h3>FPS Monitor version 1.0.1</h3>
-
-![fpsmon101](https://user-images.githubusercontent.com/68126304/215294225-68794013-7587-4482-b29c-59bf37cabce5.PNG)
-
-<h3>FPS Monitor version 1.0.0</h3>
-
-![fpsmon100](https://user-images.githubusercontent.com/68126304/215294191-982f19c5-c9e5-441d-8929-cf3a4285fc5f.PNG)
+[<h2>Versions :pizza:</h2>](Versions.md)