From 1e9dec13716a0348be9166f093cad8e13c387d26 Mon Sep 17 00:00:00 2001
From: David Sangrey <rixxan@hullseals.space>
Date: Mon, 29 Jul 2024 19:32:16 -0400
Subject: [PATCH] [610] Improved process_iter

Significant speed-up. Around 20x in psutils 6.0!
---
 monitor.py       | 9 ++++-----
 requirements.txt | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/monitor.py b/monitor.py
index d0a79716..ce6b6075 100644
--- a/monitor.py
+++ b/monitor.py
@@ -2156,12 +2156,11 @@ class EDLogs(FileSystemEventHandler):
                 # Process likely expired
                 self.running_process = None
         if not self.running_process:
-            edmc_process = psutil.Process()
-            edmc_user = edmc_process.username()
             try:
-                for pid in psutil.pids():
-                    proc = psutil.Process(pid)
-                    if 'EliteDangerous' in proc.name() and proc.username() == edmc_user:
+                edmc_process = psutil.Process()
+                edmc_user = edmc_process.username()
+                for proc in psutil.process_iter(['name', 'username']):
+                    if 'EliteDangerous' in proc.info['name'] and proc.info['username'] == edmc_user:
                         self.running_process = proc
                         return True
             except psutil.NoSuchProcess:
diff --git a/requirements.txt b/requirements.txt
index 23e90a95..7aac47d1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,4 @@ simplesystray==0.1.0; sys_platform == 'win32'
 semantic-version==2.10.0
 # For manipulating folder permissions and the like.
 pywin32==306; sys_platform == 'win32'
-psutil==5.9.8
+psutil==6.0.0