From 639ccf254bd4d072f33333abb1ada3d08aaab470 Mon Sep 17 00:00:00 2001
From: illtellyoulater <3078931+illtellyoulater@users.noreply.github.com>
Date: Mon, 4 Dec 2023 02:35:35 +0000
Subject: [PATCH 1/2] Update launch_utils.py to fix wrong dep. checks and
 reinstalls

Fixes failing dependency checks for extensions having a different package name and import name (for example ffmpeg-python / ffmpeg), which currently is causing the unneeded reinstall of packages at runtime.

In fact with current code, the same string is used when installing a package and when checking for its presence, as you can see in the following example:

> launch_utils.run_pip("install ffmpeg-python", "required package")
[ Installing required package: "ffmpeg-python" ... ]
[ Installed ]

> launch_utils.is_installed("ffmpeg-python")
False

... which would actually return true with:

> launch_utils.is_installed("ffmpeg")
True
---
 modules/launch_utils.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/launch_utils.py b/modules/launch_utils.py
index 6e54d0636..6664c5e04 100644
--- a/modules/launch_utils.py
+++ b/modules/launch_utils.py
@@ -6,6 +6,7 @@ import os
 import shutil
 import sys
 import importlib.util
+import importlib.metadata
 import platform
 import json
 from functools import lru_cache
@@ -119,11 +120,16 @@ def run(command, desc=None, errdesc=None, custom_env=None, live: bool = default_
 
 def is_installed(package):
     try:
-        spec = importlib.util.find_spec(package)
-    except ModuleNotFoundError:
-        return False
+    	dist = importlib.metadata.distribution(package)
+    except importlib.metadata.PackageNotFoundError:
+        try: 
+            spec = importlib.util.find_spec(package)
+        except ModuleNotFoundError:
+    	    return False
 
-    return spec is not None
+        return spec is not None
+
+    return dist is not None
 
 
 def repo_dir(name):

From 06725af40b94a146c56e693a47cbec6d0af55396 Mon Sep 17 00:00:00 2001
From: missionfloyd <missionfloyd@users.noreply.github.com>
Date: Sun, 3 Dec 2023 21:26:12 -0700
Subject: [PATCH 2/2] Lint

---
 modules/launch_utils.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/launch_utils.py b/modules/launch_utils.py
index 6664c5e04..e71edd01d 100644
--- a/modules/launch_utils.py
+++ b/modules/launch_utils.py
@@ -120,12 +120,12 @@ def run(command, desc=None, errdesc=None, custom_env=None, live: bool = default_
 
 def is_installed(package):
     try:
-    	dist = importlib.metadata.distribution(package)
+        dist = importlib.metadata.distribution(package)
     except importlib.metadata.PackageNotFoundError:
-        try: 
+        try:
             spec = importlib.util.find_spec(package)
         except ModuleNotFoundError:
-    	    return False
+            return False
 
         return spec is not None