From ecf37f71c0d403ab11c4df569f3164aa46ae572c Mon Sep 17 00:00:00 2001
From: messense <messense@icloud.com>
Date: Fri, 27 May 2022 22:35:54 +0800
Subject: [PATCH] Auto-detect Python Installs from Microsoft Store

---
 src/python_interpreter/mod.rs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/python_interpreter/mod.rs b/src/python_interpreter/mod.rs
index 1825cff89..d97251af0 100644
--- a/src/python_interpreter/mod.rs
+++ b/src/python_interpreter/mod.rs
@@ -226,6 +226,15 @@ fn find_all_windows(target: &Target, min_python_minor: usize) -> Result<Vec<Stri
             }
         }
     }
+
+    // Fallback to pythonX.Y for Microsoft Store versions
+    for minor in min_python_minor..MAXIMUM_PYTHON_MINOR {
+        if !versions_found.contains(&(3, minor)) {
+            interpreter.push(format!("python3.{}", minor));
+            versions_found.insert((3, minor));
+        }
+    }
+
     if interpreter.is_empty() {
         bail!(
             "Could not find any interpreters, are you sure you have python installed on your PATH?"
@@ -501,8 +510,11 @@ impl PythonInterpreter {
                             let output = Command::new("py")
                                 .arg(format!("-{}", ver))
                                 .args(&["-c", GET_INTERPRETER_METADATA])
-                                .output()?;
-                            output
+                                .output();
+                            match output {
+                                Ok(output) if output.status.success() => output,
+                                _ => return Ok(None),
+                            }
                         } else {
                             return Ok(None);
                         }