Remove duplicate environments (#42)

Author: DonJayamanne

crates/pet-reporter/src/cache.rs

@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+use crate::environment::get_environment_key;
+use pet_core::{manager::EnvManager, python_environment::PythonEnvironment, reporter::Reporter};
+use std::{
+    collections::HashMap,
+    path::PathBuf,
+    sync::{Arc, Mutex},
+};
+
+pub struct CacheReporter {
+    reporter: Arc<dyn Reporter>,
+    reported_managers: Arc<Mutex<HashMap<PathBuf, EnvManager>>>,
+    reported_environments: Arc<Mutex<HashMap<PathBuf, PythonEnvironment>>>,
+}
+
+impl CacheReporter {
+    pub fn new(reporter: Arc<dyn Reporter>) -> Self {
+        Self {
+            reporter,
+            reported_managers: Arc::new(Mutex::new(HashMap::new())),
+            reported_environments: Arc::new(Mutex::new(HashMap::new())),
+        }
+    }
+}
+impl Reporter for CacheReporter {
+    fn report_manager(&self, manager: &EnvManager) {
+        let mut reported_managers = self.reported_managers.lock().unwrap();
+        if !reported_managers.contains_key(&manager.executable) {
+            reported_managers.insert(manager.executable.clone(), manager.clone());
+            self.reporter.report_manager(manager);
+        }
+    }
+
+    fn report_environment(&self, env: &PythonEnvironment) {
+        if let Some(key) = get_environment_key(env) {
+            let mut reported_environments = self.reported_environments.lock().unwrap();
+            if !reported_environments.contains_key(&key) {
+                reported_environments.insert(key.clone(), env.clone());
+                self.reporter.report_environment(env);
+            }
+        }
+    }
+}

crates/pet-reporter/src/lib.rs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+pub mod cache;
 pub mod environment;
 pub mod jsonrpc;
 pub mod manager;

crates/pet/src/jsonrpc.rs

@@ -12,7 +12,7 @@ use pet_jsonrpc::{
     send_error, send_reply,
     server::{start_server, HandlersKeyedByMethodName},
 };
-use pet_reporter::{environment::Environment, jsonrpc};
+use pet_reporter::{cache::CacheReporter, environment::Environment, jsonrpc};
 use pet_telemetry::report_inaccuracies_identified_after_resolving;
 use serde::{Deserialize, Serialize};
 use serde_json::{self, Value};
@@ -39,9 +39,10 @@ pub fn start_jsonrpc_server() {
     // Hence passed around as Arcs via the context.
     let environment = EnvironmentApi::new();
     let jsonrpc_reporter = Arc::new(jsonrpc::create_reporter());
+    let reporter = Arc::new(CacheReporter::new(jsonrpc_reporter.clone()));
     let conda_locator = Arc::new(Conda::from(&environment));
     let context = Context {
-        reporter: jsonrpc_reporter,
+        reporter,
         locators: create_locators(conda_locator.clone()),
         conda_locator,
         configuration: RwLock::new(Configuration::default()),

crates/pet/src/lib.rs

@@ -5,7 +5,7 @@ use find::find_and_report_envs;
 use locators::create_locators;
 use pet_conda::Conda;
 use pet_core::{os_environment::EnvironmentApi, Configuration};
-use pet_reporter::{self, stdio};
+use pet_reporter::{self, cache::CacheReporter, stdio};
 use std::{collections::BTreeMap, env, sync::Arc, time::SystemTime};
 
 pub mod find;
@@ -16,7 +16,8 @@ pub fn find_and_report_envs_stdio(print_list: bool, print_summary: bool) {
     stdio::initialize_logger(log::LevelFilter::Info);
     let now = SystemTime::now();
 
-    let reporter = stdio::create_reporter(print_list);
+    let stdio_reporter = Arc::new(stdio::create_reporter(print_list));
+    let reporter = CacheReporter::new(stdio_reporter.clone());
     let environment = EnvironmentApi::new();
     let conda_locator = Arc::new(Conda::from(&environment));
 
@@ -33,7 +34,7 @@ pub fn find_and_report_envs_stdio(print_list: bool, print_summary: bool) {
     );
 
     if print_summary {
-        let summary = reporter.get_summary();
+        let summary = stdio_reporter.get_summary();
         if !summary.managers.is_empty() {
             println!("Managers:");
             println!("---------");