feat: keep index and overrides in separate folders

Author: helton

src/commands.rs

@@ -1,5 +1,4 @@
 use crate::files::versions::{remove, upsert};
-use crate::packages;
 use crate::packages::Package;
 use crate::runner::run;
 use crate::shims::{add_shim, remove_shim};
@@ -29,7 +28,7 @@ pub fn show_info() -> Result<(), Box<dyn Error>> {
 
 pub fn list_packages(name: Option<&str>, verbose: bool) -> Result<(), Box<dyn Error>> {
     if let Some(name) = name {
-        if let Some(package) = packages::Package::load(name)? {
+        if let Some(package) = Package::load(name)? {
             package.print(verbose);
             Ok(())
         } else {
@@ -40,7 +39,7 @@ pub fn list_packages(name: Option<&str>, verbose: bool) -> Result<(), Box<dyn Er
             .into())
         }
     } else {
-        let packages = packages::Package::load_all()?;
+        let packages = Package::load_all()?;
         if !packages.is_empty() {
             for package in &packages {
                 package.print(verbose);
@@ -118,7 +117,7 @@ pub fn set_package_version(name: String, version: String) -> Result<(), Box<dyn
         if package.versions.versions.contains(&version) {
             package.versions.current = version.clone();
             upsert(&name, package)?;
-            info!("'{}' set to version '{}'", name, version);
+            info!("Package '{}' set to version '{}'", name, version);
             Ok(())
         } else {
             Err(format!(

src/files/index.rs

@@ -1,8 +1,10 @@
 use crate::files::variables::AppConfig;
 use crate::serialization::parse_json;
+use log::debug;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::error::Error;
+use std::path::Path;
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Root {
@@ -51,7 +53,33 @@ pub struct EnvironmentVariable {
     pub value: String,
 }
 
-pub fn parse() -> Result<Root, Box<dyn Error>> {
+fn load_package(
+    name: &str,
+    index_path: &Path,
+    overrides_path: &Path,
+) -> Result<Package, Box<dyn Error>> {
+    let index_file = index_path.join(format!("{}.json", name));
+    let override_file = overrides_path.join(format!("{}.json", name));
+
+    if override_file.exists() {
+        debug!("Using override config at {:?}", &override_file);
+        parse_json(&override_file)
+    } else {
+        debug!("Using normal config at {:?}", &index_file);
+        parse_json(&index_file)
+    }
+}
+
+pub fn parse(name: String) -> Result<Root, Box<dyn Error>> {
     let config = AppConfig::new();
-    parse_json(&config.index_path())
+    let index_path = config.index_path().to_owned();
+    let package_dir = Path::new(&index_path);
+    let overrides_path = config.overrides_path().to_owned();
+    let overrides_dir = Path::new(&overrides_path);
+    let mut packages = HashMap::new();
+
+    let package = load_package(&name, package_dir, overrides_dir)?;
+    packages.insert(name, package);
+
+    Ok(Root { packages })
 }

src/files/variables.rs

@@ -28,7 +28,11 @@ impl AppConfig {
     }
 
     pub fn index_path(&self) -> PathBuf {
-        self.base_dir.join("index.json")
+        self.base_dir.join("index")
+    }
+
+    pub fn overrides_path(&self) -> PathBuf {
+        self.base_dir.join("overrides")
     }
 
     pub fn versions_path(&self) -> PathBuf {

src/packages.rs

@@ -13,7 +13,7 @@ pub struct Package {
 // Public API
 impl Package {
     pub fn new(name: &str, versions_package: VersionsPackage) -> Result<Self, Box<dyn Error>> {
-        let index_packages = crate::files::index::parse()?;
+        let index_packages = crate::files::index::parse(name.to_owned())?;
         let index_package = index_packages
             .packages
             .get(name)
@@ -27,7 +27,9 @@ impl Package {
     }
 
     pub fn load(name: &str) -> Result<Option<Self>, Box<dyn Error>> {
-        let index_package = crate::files::index::parse()?.packages.remove(name);
+        let index_package = crate::files::index::parse(name.to_owned())?
+            .packages
+            .remove(name);
         let versions_package = crate::files::versions::parse()?.packages.remove(name);
         Self::make_from(name, index_package, versions_package)
     }