Use enum for category (#23357)

Author: DonJayamanne

native_locator/src/common_python.rs

@@ -27,7 +27,7 @@ fn report_path_python(dispatcher: &mut impl messaging::MessageDispatcher, path:
     dispatcher.send_message(messaging::PythonEnvironment::new(
         "Python".to_string(),
         vec![path.to_string()],
-        "System".to_string(),
+        messaging::PythonEnvironmentCategory::System,
         version,
         None,
         env_path,

native_locator/src/conda.rs

@@ -386,7 +386,7 @@ pub fn find_and_report(
                         Some(executable) => vec![executable.to_string_lossy().to_string()],
                         None => vec![],
                     },
-                    "conda".to_string(),
+                    messaging::PythonEnvironmentCategory::Conda,
                     get_conda_python_version(&env.path),
                     if env.named {
                         Some(vec![

native_locator/src/messaging.rs

@@ -46,12 +46,21 @@ impl EnvManagerMessage {
     }
 }
 
+#[derive(Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum PythonEnvironmentCategory {
+    System,
+    Conda,
+    Pyenv,
+    WindowsStore,
+}
+
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PythonEnvironment {
     pub name: String,
     pub python_executable_path: Vec<String>,
-    pub category: String,
+    pub category: PythonEnvironmentCategory,
     pub version: Option<String>,
     pub activated_run: Option<Vec<String>>,
     pub env_path: Option<String>,
@@ -61,7 +70,7 @@ impl PythonEnvironment {
     pub fn new(
         name: String,
         python_executable_path: Vec<String>,
-        category: String,
+        category: PythonEnvironmentCategory,
         version: Option<String>,
         activated_run: Option<Vec<String>>,
         env_path: Option<String>,

native_locator/src/pyenv.rs

@@ -97,7 +97,7 @@ pub fn find_and_report(
                     dispatcher.send_message(messaging::PythonEnvironment::new(
                         "Python".to_string(),
                         vec![executable.into_os_string().into_string().unwrap()],
-                        "Pyenv".to_string(),
+                        messaging::PythonEnvironmentCategory::Pyenv,
                         Some(version.clone()),
                         Some(vec![
                             pyenv_binary_for_activation.clone(),

native_locator/src/windows_python.rs

@@ -11,7 +11,7 @@ fn report_path_python(path: &str, dispatcher: &mut impl messaging::MessageDispat
     dispatcher.send_message(messaging::PythonEnvironment::new(
         "Python".to_string(),
         vec![path.to_string()],
-        "WindowsStore".to_string(),
+        messaging::PythonEnvironmentCategory::WindowsStore,
         version,
         None,
         None,

native_locator/tests/common_python_test.rs

@@ -27,6 +27,6 @@ fn find_python_in_path_this() {
     common_python::find_and_report(&mut dispatcher, &known);
 
     assert_eq!(dispatcher.messages.len(), 1);
-    let expected_json = json!({"name":"Python","pythonExecutablePath":[unix_python_exe.clone()],"category":"System","version":null,"activatedRun":null,"envPath":unix_python.clone()});
+    let expected_json = json!({"name":"Python","pythonExecutablePath":[unix_python_exe.clone()],"category":"system","version":null,"activatedRun":null,"envPath":unix_python.clone()});
     assert_messages(&[expected_json], &dispatcher);
 }