feat: content addressable storage

Cargo.toml

@@ -61,6 +61,7 @@ url = { version = "2.5.2", features = ["serde"] }
 # TODO: reevaluate whether to use this
 # secrecy = "0.8.0"
 chrono = { version = "0.4.38", features = ["serde"] }
+sha2 = "0.10.8"
 
 # TODO: remove this when gitoxide adds support for: committing, pushing, adding
 git2 = { version = "0.19.0", optional = true }

src/cli/auth.rs

@@ -2,16 +2,15 @@ use crate::cli::config::{read_config, write_config};
 use anyhow::Context;
 use keyring::Entry;
 use serde::Deserialize;
-use std::path::Path;
 
-pub fn get_token<P: AsRef<Path>>(data_dir: P) -> anyhow::Result<Option<String>> {
+pub fn get_token() -> anyhow::Result<Option<String>> {
     match std::env::var("PESDE_TOKEN") {
         Ok(token) => return Ok(Some(token)),
         Err(std::env::VarError::NotPresent) => {}
         Err(e) => return Err(e.into()),
     }
 
-    let config = read_config(data_dir)?;
+    let config = read_config()?;
     if let Some(token) = config.token {
         return Ok(Some(token));
     }
@@ -29,7 +28,7 @@ pub fn get_token<P: AsRef<Path>>(data_dir: P) -> anyhow::Result<Option<String>>
     Ok(None)
 }
 
-pub fn set_token<P: AsRef<Path>>(data_dir: P, token: Option<&str>) -> anyhow::Result<()> {
+pub fn set_token(token: Option<&str>) -> anyhow::Result<()> {
     let entry = match Entry::new("token", env!("CARGO_PKG_NAME")) {
         Ok(entry) => entry,
         Err(e) => return Err(e.into()),
@@ -47,9 +46,9 @@ pub fn set_token<P: AsRef<Path>>(data_dir: P, token: Option<&str>) -> anyhow::Re
         Err(e) => return Err(e.into()),
     }
 
-    let mut config = read_config(&data_dir)?;
+    let mut config = read_config()?;
     config.token = token.map(|s| s.to_string());
-    write_config(data_dir, &config)?;
+    write_config(&config)?;
 
     Ok(())
 }

src/cli/commands/auth/login.rs

@@ -7,7 +7,7 @@ use clap::Args;
 use colored::Colorize;
 use pesde::{
     errors::ManifestReadError,
-    source::{pesde::PesdePackageSource, PackageSource},
+    source::{pesde::PesdePackageSource, traits::PackageSource},
     Project,
 };
 use serde::Deserialize;
@@ -71,7 +71,7 @@ impl LoginCommand {
             },
             None => match manifest {
                 Some(_) => None,
-                None => Some(read_config(project.data_dir())?.default_index),
+                None => Some(read_config()?.default_index),
             },
         };
 
@@ -182,7 +182,7 @@ impl LoginCommand {
 
         println!("logged in as {}", get_token_login(&reqwest, &token)?.bold());
 
-        set_token(project.data_dir(), Some(&token))?;
+        set_token(Some(&token))?;
 
         Ok(())
     }

src/cli/commands/auth/logout.rs

@@ -1,13 +1,12 @@
 use crate::cli::auth::set_token;
 use clap::Args;
-use pesde::Project;
 
 #[derive(Debug, Args)]
 pub struct LogoutCommand {}
 
 impl LogoutCommand {
-    pub fn run(self, project: Project) -> anyhow::Result<()> {
-        set_token(project.data_dir(), None)?;
+    pub fn run(self) -> anyhow::Result<()> {
+        set_token(None)?;
 
         println!("logged out");
 

src/cli/commands/auth/mod.rs

@@ -20,8 +20,8 @@ impl AuthCommands {
     pub fn run(self, project: Project, reqwest: reqwest::blocking::Client) -> anyhow::Result<()> {
         match self {
             AuthCommands::Login(login) => login.run(project, reqwest),
-            AuthCommands::Logout(logout) => logout.run(project),
-            AuthCommands::WhoAmI(whoami) => whoami.run(project, reqwest),
+            AuthCommands::Logout(logout) => logout.run(),
+            AuthCommands::WhoAmI(whoami) => whoami.run(reqwest),
         }
     }
 }

src/cli/commands/auth/whoami.rs

@@ -1,14 +1,13 @@
 use crate::cli::{auth::get_token_login, get_token};
 use clap::Args;
 use colored::Colorize;
-use pesde::Project;
 
 #[derive(Debug, Args)]
 pub struct WhoAmICommand {}
 
 impl WhoAmICommand {
-    pub fn run(self, project: Project, reqwest: reqwest::blocking::Client) -> anyhow::Result<()> {
-        let token = match get_token(project.data_dir())? {
+    pub fn run(self, reqwest: reqwest::blocking::Client) -> anyhow::Result<()> {
+        let token = match get_token()? {
             Some(token) => token,
             None => {
                 println!("not logged in");

src/cli/commands/config/default_index.rs

@@ -1,6 +1,5 @@
 use crate::cli::config::{read_config, write_config, CliConfig};
 use clap::Args;
-use pesde::Project;
 
 #[derive(Debug, Args)]
 pub struct DefaultIndexCommand {
@@ -14,8 +13,8 @@ pub struct DefaultIndexCommand {
 }
 
 impl DefaultIndexCommand {
-    pub fn run(self, project: Project) -> anyhow::Result<()> {
-        let mut config = read_config(project.data_dir())?;
+    pub fn run(self) -> anyhow::Result<()> {
+        let mut config = read_config()?;
 
         let index = if self.reset {
             Some(CliConfig::default().default_index)
@@ -26,7 +25,7 @@ impl DefaultIndexCommand {
         match index {
             Some(index) => {
                 config.default_index = index.clone();
-                write_config(project.data_dir(), &config)?;
+                write_config(&config)?;
                 println!("default index set to: {index}");
             }
             None => {

src/cli/commands/config/mod.rs

@@ -1,5 +1,4 @@
 use clap::Subcommand;
-use pesde::Project;
 
 mod default_index;
 mod scripts_repo;
@@ -14,10 +13,10 @@ pub enum ConfigCommands {
 }
 
 impl ConfigCommands {
-    pub fn run(self, project: Project) -> anyhow::Result<()> {
+    pub fn run(self) -> anyhow::Result<()> {
         match self {
-            ConfigCommands::DefaultIndex(default_index) => default_index.run(project),
-            ConfigCommands::ScriptsRepo(scripts_repo) => scripts_repo.run(project),
+            ConfigCommands::DefaultIndex(default_index) => default_index.run(),
+            ConfigCommands::ScriptsRepo(scripts_repo) => scripts_repo.run(),
         }
     }
 }

src/cli/commands/config/scripts_repo.rs

@@ -1,6 +1,5 @@
 use crate::cli::config::{read_config, write_config, CliConfig};
 use clap::Args;
-use pesde::Project;
 
 #[derive(Debug, Args)]
 pub struct ScriptsRepoCommand {
@@ -14,8 +13,8 @@ pub struct ScriptsRepoCommand {
 }
 
 impl ScriptsRepoCommand {
-    pub fn run(self, project: Project) -> anyhow::Result<()> {
-        let mut config = read_config(project.data_dir())?;
+    pub fn run(self) -> anyhow::Result<()> {
+        let mut config = read_config()?;
 
         let repo = if self.reset {
             Some(CliConfig::default().scripts_repo)
@@ -26,7 +25,7 @@ impl ScriptsRepoCommand {
         match repo {
             Some(repo) => {
                 config.scripts_repo = repo.clone();
-                write_config(project.data_dir(), &config)?;
+                write_config(&config)?;
                 println!("scripts repo set to: {repo}");
             }
             None => {

src/cli/commands/init.rs

@@ -144,12 +144,8 @@ impl InitCommand {
                 ));
         }
 
-        manifest["indices"][DEFAULT_INDEX_NAME] = toml_edit::value(
-            read_config(project.data_dir())?
-                .default_index
-                .to_bstring()
-                .to_string(),
-        );
+        manifest["indices"][DEFAULT_INDEX_NAME] =
+            toml_edit::value(read_config()?.default_index.to_bstring().to_string());
 
         project.write_manifest(manifest.to_string())?;
 

src/cli/commands/install.rs

@@ -33,9 +33,9 @@ fn bin_link_file(alias: &str) -> String {
         .collect::<Vec<_>>()
         .join(", ");
 
-    #[cfg(windows)]
+    #[cfg(not(unix))]
     let prefix = String::new();
-    #[cfg(not(windows))]
+    #[cfg(unix)]
     let prefix = "#!/usr/bin/env -S lune run\n";
 
     format!(

src/cli/commands/mod.rs

@@ -60,7 +60,7 @@ impl Subcommand {
     ) -> anyhow::Result<()> {
         match self {
             Subcommand::Auth(auth) => auth.run(project, reqwest),
-            Subcommand::Config(config) => config.run(project),
+            Subcommand::Config(config) => config.run(),
             Subcommand::Init(init) => init.run(project),
             Subcommand::Run(run) => run.run(project),
             Subcommand::Install(install) => install.run(project, multi, reqwest),
@@ -70,7 +70,7 @@ impl Subcommand {
             Subcommand::Patch(patch) => patch.run(project, reqwest),
             #[cfg(feature = "patches")]
             Subcommand::PatchCommit(patch_commit) => patch_commit.run(project),
-            Subcommand::SelfUpgrade(self_upgrade) => self_upgrade.run(project, reqwest),
+            Subcommand::SelfUpgrade(self_upgrade) => self_upgrade.run(reqwest),
         }
     }
 }

src/cli/commands/patch.rs

@@ -4,7 +4,7 @@ use clap::Args;
 use colored::Colorize;
 use pesde::{
     patches::setup_patches_repo,
-    source::{PackageRef, PackageSource},
+    source::traits::{PackageRef, PackageSource},
     Project, MANIFEST_FILE_NAME,
 };
 
@@ -39,7 +39,11 @@ impl PatchCommand {
             .join(chrono::Utc::now().timestamp().to_string());
         std::fs::create_dir_all(&directory)?;
 
-        source.download(&node.node.pkg_ref, &directory, &project, &reqwest)?;
+        source
+            .download(&node.node.pkg_ref, &project, &reqwest)?
+            .0
+            .write_to(&directory, project.cas_dir(), false)
+            .context("failed to write package contents")?;
 
         // TODO: if MANIFEST_FILE_NAME does not exist, try to convert it
 

src/cli/commands/patch_commit.rs

@@ -2,8 +2,8 @@ use crate::cli::IsUpToDate;
 use anyhow::Context;
 use clap::Args;
 use pesde::{
-    manifest::Manifest, names::PackageNames, patches::create_patch, source::VersionId, Project,
-    MANIFEST_FILE_NAME,
+    manifest::Manifest, names::PackageNames, patches::create_patch, source::version_id::VersionId,
+    Project, MANIFEST_FILE_NAME,
 };
 use std::{path::PathBuf, str::FromStr};
 

src/cli/commands/self_upgrade.rs

@@ -1,6 +1,5 @@
 use crate::cli::{config::read_config, version::get_or_download_version};
 use clap::Args;
-use pesde::Project;
 
 #[derive(Debug, Args)]
 pub struct SelfUpgradeCommand {
@@ -10,8 +9,8 @@ pub struct SelfUpgradeCommand {
 }
 
 impl SelfUpgradeCommand {
-    pub fn run(self, project: Project, reqwest: reqwest::blocking::Client) -> anyhow::Result<()> {
-        let config = read_config(project.data_dir())?;
+    pub fn run(self, reqwest: reqwest::blocking::Client) -> anyhow::Result<()> {
+        let config = read_config()?;
 
         get_or_download_version(&reqwest, &config.last_checked_updates.unwrap().1)?;
 

src/cli/config.rs

@@ -1,6 +1,7 @@
 use anyhow::Context;
 use serde::{Deserialize, Serialize};
-use std::path::Path;
+
+use crate::cli::home_dir;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct CliConfig {
@@ -37,8 +38,8 @@ impl Default for CliConfig {
     }
 }
 
-pub fn read_config<P: AsRef<Path>>(data_dir: P) -> anyhow::Result<CliConfig> {
-    let config_string = match std::fs::read_to_string(data_dir.as_ref().join("config.toml")) {
+pub fn read_config() -> anyhow::Result<CliConfig> {
+    let config_string = match std::fs::read_to_string(home_dir()?.join("config.toml")) {
         Ok(config_string) => config_string,
         Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
             return Ok(CliConfig::default());
@@ -51,9 +52,9 @@ pub fn read_config<P: AsRef<Path>>(data_dir: P) -> anyhow::Result<CliConfig> {
     Ok(config)
 }
 
-pub fn write_config<P: AsRef<Path>>(data_dir: P, config: &CliConfig) -> anyhow::Result<()> {
+pub fn write_config(config: &CliConfig) -> anyhow::Result<()> {
     let config_string = toml::to_string(config).context("failed to serialize config")?;
-    std::fs::write(data_dir.as_ref().join("config.toml"), config_string)
+    std::fs::write(home_dir()?.join("config.toml"), config_string)
         .context("failed to write config file")?;
 
     Ok(())

src/cli/mod.rs

@@ -7,7 +7,9 @@ pub mod version;
 
 use crate::cli::auth::get_token;
 use anyhow::Context;
-use pesde::{lockfile::DownloadedGraph, names::PackageNames, source::VersionId, Project};
+use pesde::{
+    lockfile::DownloadedGraph, names::PackageNames, source::version_id::VersionId, Project,
+};
 use std::{collections::HashSet, str::FromStr};
 
 pub const HOME_DIR: &str = concat!(".", env!("CARGO_PKG_NAME"));

src/cli/scripts.rs

@@ -79,7 +79,7 @@ pub fn update_scripts_folder(project: &Project) -> anyhow::Result<()> {
     } else {
         std::fs::create_dir_all(&scripts_dir).context("failed to create scripts directory")?;
 
-        let cli_config = read_config(project.data_dir())?;
+        let cli_config = read_config()?;
 
         gix::prepare_clone(cli_config.scripts_repo, &scripts_dir)
             .context("failed to prepare scripts repository clone")?

src/cli/version.rs

@@ -1,8 +1,4 @@
-use std::{
-    fs::create_dir_all,
-    io::Read,
-    path::{Path, PathBuf},
-};
+use std::{fs::create_dir_all, io::Read, path::PathBuf};
 
 use anyhow::Context;
 use colored::Colorize;
@@ -42,13 +38,10 @@ fn get_repo() -> (String, String) {
 
 const CHECK_INTERVAL: chrono::Duration = chrono::Duration::seconds(30);
 
-pub fn check_for_updates<P: AsRef<Path>>(
-    reqwest: &reqwest::blocking::Client,
-    data_dir: P,
-) -> anyhow::Result<()> {
+pub fn check_for_updates(reqwest: &reqwest::blocking::Client) -> anyhow::Result<()> {
     let (owner, repo) = get_repo();
 
-    let config = read_config(&data_dir)?;
+    let config = read_config()?;
 
     let version = if let Some((_, version)) = config
         .last_checked_updates
@@ -71,13 +64,10 @@ pub fn check_for_updates<P: AsRef<Path>>(
             .max()
             .context("failed to find latest version")?;
 
-        write_config(
-            &data_dir,
-            &CliConfig {
-                last_checked_updates: Some((chrono::Utc::now(), version.clone())),
-                ..config
-            },
-        )?;
+        write_config(&CliConfig {
+            last_checked_updates: Some((chrono::Utc::now(), version.clone())),
+            ..config
+        })?;
 
         version
     };