Back out workspace registry information in pixi global config

Author: soapy1

crates/pixi_cli/src/clean.rs

@@ -1,4 +1,4 @@
-use pixi_config::{self, Config};
+use pixi_api::workspace::WorkspaceRegistry;
 use pixi_consts::consts;
 use pixi_core::WorkspaceLocator;
 use pixi_manifest::EnvironmentName;
@@ -229,37 +229,21 @@ async fn clean_cache(args: CacheArgs) -> miette::Result<()> {
     Ok(())
 }
 
-fn global_config_write_path() -> miette::Result<PathBuf> {
-    let mut global_locations = pixi_config::config_path_global();
-    let mut to = global_locations
-        .pop()
-        .expect("should have at least one global config path");
-
-    for p in global_locations {
-        if p.exists() {
-            to = p;
-            break;
-        }
-    }
-    Ok(to)
-}
-
 /// Clean disassociated workspaces from the workspace registry
 async fn clean_workspaces() -> miette::Result<()> {
-    let mut config = Config::load_global();
-    let to = global_config_write_path()?;
-    let mut workspaces = config.named_workspaces.clone();
-
-    workspaces.retain(|key, val| {
-        if val.exists() {
-            true
-        } else {
-            eprintln!("{} {}", console::style("removed workspace").green(), key);
-            false
-        }
-    });
-    config.named_workspaces = workspaces;
-    config.save(&to)?;
+    let mut workspace_registry = WorkspaceRegistry::load()?;
+    let workspace_map = workspace_registry.named_workspaces_map();
+
+    let names_to_remove: Vec<_> = workspace_map
+        .iter()
+        .filter(|(_, path)| !path.exists())
+        .map(|(name, _)| name.clone())
+        .collect();
+
+    for name in names_to_remove {
+        workspace_registry.remove_workspace(&name).await?;
+        eprintln!("{} {}", console::style("removed workspace").green(), name);
+    }
     eprintln!(
         "{} Workspace registry cleaned",
         console::style(console::Emoji("✔ ", "")).green(),

crates/pixi_cli/src/workspace/register.rs

@@ -51,9 +51,6 @@ pub enum Command {
     /// Remove a workspace from registry.
     #[clap(visible_alias = "rm")]
     Remove(RemoveArgs),
-    // Prune disassociated workspaces from registry.
-    // #[clap(visible_alias = "pr")]
-    // Prune(PruneArgs),
 }
 
 pub async fn execute(args: Args) -> miette::Result<()> {
@@ -87,24 +84,6 @@ pub async fn execute(args: Args) -> miette::Result<()> {
                 &remove_args.name
             );
         }
-        // Some(Command::Prune(_)) => {
-        //     let workspace_registry = WorkspaceRegistry::load().await?;
-        //     let workspaces = workspace_registry.named_workspaces_map();
-        //     workspaces.retain(|key, val| {
-        //         if val.exists() {
-        //             true
-        //         } else {
-        //             eprintln!("{} {}", console::style("removed workspace").green(), key);
-        //             false
-        //         }
-        //     });
-        //     config.named_workspaces = workspaces;
-        //     config.save(&to)?;
-        //     eprintln!(
-        //         "{} Workspace registry cleaned",
-        //         console::style(console::Emoji("✔ ", "")).green(),
-        //     );
-        // }
         None => {
             let workspace = WorkspaceLocator::for_cli()
                 .with_closest_package(false)

crates/pixi_config/src/lib.rs

@@ -811,11 +811,6 @@ pub struct Config {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub tool_platform: Option<Platform>,
 
-    /// Mapping of a named workspaces to the path of their manifest file.
-    #[serde(default)]
-    #[serde(skip_serializing_if = "HashMap::is_empty")]
-    pub named_workspaces: HashMap<String, PathBuf>,
-
     //////////////////////
     // Deprecated fields //
     //////////////////////
@@ -851,7 +846,6 @@ impl Default for Config {
             proxy_config: ProxyConfig::default(),
             build: BuildConfig::default(),
             tool_platform: None,
-            named_workspaces: HashMap::new(),
 
             // Deprecated fields
             change_ps1: None,
@@ -1386,7 +1380,6 @@ impl Config {
             "experimental",
             "experimental.use-environment-activation-cache",
             "mirrors",
-            "named-workspaces",
             "pinning-strategy",
             "proxy-config",
             "proxy-config.http",
@@ -1463,11 +1456,6 @@ impl Config {
             proxy_config: self.proxy_config.merge(other.proxy_config),
             build: self.build.merge(other.build),
             tool_platform: self.tool_platform.or(other.tool_platform),
-            named_workspaces: self
-                .named_workspaces
-                .into_iter()
-                .merge(other.named_workspaces)
-                .collect(),
 
             // Deprecated fields that we can ignore as we handle them inside `shell.` field
             change_ps1: None,
@@ -1591,19 +1579,6 @@ impl Config {
         Ok(result)
     }
 
-    /// Retrieve the value for the named-workspaces field.
-    pub fn named_workspaces_map(&self) -> &std::collections::HashMap<String, PathBuf> {
-        &self.named_workspaces
-    }
-
-    /// Retrieve the path to the manifest file for a named workspaces.
-    pub fn named_workspace(&self, name: &String) -> miette::Result<PathBuf> {
-        match self.named_workspaces.get(name) {
-            Some(path) => Ok(path.clone()),
-            None => Err(miette::diagnostic!("Named workspace '{}' not found", name).into()),
-        }
-    }
-
     /// Modify this config with the given key and value
     ///
     /// # Note
@@ -1679,13 +1654,6 @@ impl Config {
                     .transpose()
                     .into_diagnostic()?;
             }
-            "named-workspaces" => {
-                self.named_workspaces = value
-                    .map(|v| serde_json::de::from_str(&v))
-                    .transpose()
-                    .into_diagnostic()?
-                    .unwrap_or_default();
-            }
             key if key.starts_with("repodata-config") => {
                 if key == "repodata-config" {
                     self.repodata_config = value
@@ -2353,7 +2321,6 @@ UNUSED = "unused"
             proxy_config: ProxyConfig::default(),
             build: BuildConfig::default(),
             tool_platform: None,
-            named_workspaces: HashMap::new(),
             // Deprecated keys
             change_ps1: None,
             force_activate: None,

crates/pixi_consts/src/consts.rs

@@ -46,7 +46,6 @@ pub const CACHED_PACKAGES: &str = "pkgs";
 pub const CACHED_BUILD_BACKEND_METADATA: &str = "metadata";
 pub const CACHED_SOURCE_METADATA: &str = "source_metadata";
 pub const CACHED_SOURCE_BUILDS: &str = "pkgs";
-pub const DEFAULT_GLOBAL_WORKSPACE_DIR: &str = "workspaces";
 pub const WORKSPACES_REGISTRY: &str = "workspaces.toml";
 
 /// The directory relative to the .pixi folder that stores build related caches.