parent
3ae7c26213
commit
70286c0a9a
SSH Key Fingerprint:
SHA256:vdAo4Qg/MlIkxR5BRTABqMRJ1sGSVlUcIciriaE3cNU
@ -0,0 +1,73 @@ |
||||
use crate::{ |
||||
context::Context, |
||||
utils::{get_tree_files, remove_dir_if_empty}, |
||||
}; |
||||
|
||||
pub fn apply(context: &Context, filter: &Option<String>, link: bool) -> anyhow::Result<()> { |
||||
std::fs::create_dir_all(&context.install_dir)?; |
||||
let mut built_files = get_tree_files(context, &context.build_dir)?; |
||||
let mut installed_files = get_tree_files(context, &context.install_dir)?; |
||||
if let Some(filter) = filter { |
||||
log::debug!("Using filter: {}", filter); |
||||
built_files = built_files |
||||
.into_iter() |
||||
.filter(|path| path.starts_with(filter)) |
||||
.collect(); |
||||
installed_files = installed_files |
||||
.into_iter() |
||||
.filter(|path| path.starts_with(filter)) |
||||
.collect(); |
||||
} |
||||
log::debug!("Built files: {:#?}", built_files); |
||||
log::debug!("Installed files: {:#?}", installed_files); |
||||
|
||||
for file_path in built_files.iter() { |
||||
if let Some(folder_path) = file_path.parent() { |
||||
let dir = context.install_dir.join(folder_path); |
||||
std::fs::create_dir_all(dir)?; |
||||
} |
||||
|
||||
let from = context.build_dir.join(file_path); |
||||
let to = context.install_dir.join(file_path); |
||||
std::fs::copy(from, to)?; |
||||
|
||||
if link { |
||||
// Make sure symlink doesn't exist before attempting to symlink
|
||||
let link_target = context.link_dir.join(&file_path); |
||||
let link_target_exists = link_target.exists(); |
||||
if link_target_exists && !link_target.is_symlink() { |
||||
log::warn!( |
||||
"Could not link {:?}, link target already exists and is not a symlink", |
||||
file_path |
||||
); |
||||
} else { |
||||
if link_target_exists { |
||||
match std::fs::remove_file(&link_target) { |
||||
Ok(_) => {} |
||||
Err(e) => anyhow::bail!(e), |
||||
}; |
||||
} |
||||
|
||||
if let Some(folder_path) = file_path.parent() { |
||||
let dir = context.link_dir.join(folder_path); |
||||
std::fs::create_dir_all(dir)?; |
||||
} |
||||
|
||||
std::os::unix::fs::symlink(context.install_dir.join(&file_path), link_target)?; |
||||
} |
||||
} |
||||
} |
||||
|
||||
for file_path in installed_files { |
||||
if !built_files.contains(&file_path) { |
||||
let installed_file = context.install_dir.join(&file_path); |
||||
let linked_file = context.link_dir.join(&file_path); |
||||
std::fs::remove_file(linked_file.clone())?; |
||||
remove_dir_if_empty(linked_file.parent().unwrap())?; |
||||
std::fs::remove_file(installed_file.clone())?; |
||||
remove_dir_if_empty(installed_file.parent().unwrap())?; |
||||
} |
||||
} |
||||
|
||||
Ok(()) |
||||
} |
||||
@ -1,7 +1,7 @@ |
||||
use std::path::PathBuf; |
||||
|
||||
#[derive(Debug)] |
||||
pub struct Config { |
||||
pub struct Context { |
||||
pub source_dir: PathBuf, |
||||
pub build_dir: PathBuf, |
||||
pub install_dir: PathBuf, |
||||
@ -1,48 +0,0 @@ |
||||
use crate::{ |
||||
config::Config, |
||||
utils::{get_tree_files, remove_dir_if_empty}, |
||||
}; |
||||
|
||||
pub async fn install(config: &Config) -> anyhow::Result<()> { |
||||
tokio::fs::create_dir_all(&config.install_dir).await?; |
||||
let built_files = get_tree_files(config, &config.build_dir).await?; |
||||
let installed_files = get_tree_files(config, &config.install_dir).await?; |
||||
|
||||
for file_path in built_files.iter() { |
||||
if let Some(folder_path) = file_path.parent() { |
||||
let dir = config.install_dir.join(folder_path); |
||||
tokio::fs::create_dir_all(dir).await?; |
||||
} |
||||
|
||||
let from = config.build_dir.join(file_path); |
||||
let to = config.install_dir.join(file_path); |
||||
tokio::fs::copy(from, to).await?; |
||||
|
||||
if let Some(folder_path) = file_path.parent() { |
||||
let dir = config.link_dir.join(folder_path); |
||||
tokio::fs::create_dir_all(dir).await?; |
||||
} |
||||
|
||||
// Make sure symlink doesn't exist before attempting to symlink
|
||||
let link_target = config.link_dir.join(&file_path); |
||||
match tokio::fs::remove_file(&link_target).await { |
||||
Ok(_) => {} |
||||
Err(e) if e.kind() == std::io::ErrorKind::NotFound => {} |
||||
Err(e) => anyhow::bail!(e), |
||||
}; |
||||
tokio::fs::symlink(config.install_dir.join(&file_path), link_target).await?; |
||||
} |
||||
|
||||
for file_path in installed_files { |
||||
if !built_files.contains(&file_path) { |
||||
let installed_file = config.install_dir.join(&file_path); |
||||
let linked_file = config.link_dir.join(&file_path); |
||||
tokio::fs::remove_file(linked_file.clone()).await?; |
||||
remove_dir_if_empty(linked_file.parent().unwrap()).await?; |
||||
tokio::fs::remove_file(installed_file.clone()).await?; |
||||
remove_dir_if_empty(installed_file.parent().unwrap()).await?; |
||||
} |
||||
} |
||||
|
||||
Ok(()) |
||||
} |
||||
@ -1,64 +1,72 @@ |
||||
mod apply; |
||||
mod build; |
||||
mod config; |
||||
mod context; |
||||
mod diff; |
||||
mod install; |
||||
mod opts; |
||||
mod utils; |
||||
|
||||
use std::path::PathBuf; |
||||
|
||||
use clap::{IntoApp, Parser}; |
||||
use clap::{CommandFactory, Parser}; |
||||
use clap_complete::generate; |
||||
use directories::{ProjectDirs, UserDirs}; |
||||
use utils::command_exists; |
||||
|
||||
use crate::{build::build, config::Config, diff::diff, install::install, opts::Opts}; |
||||
use crate::{ |
||||
apply::apply, build::build, context::Context, diff::diff, opts::Opts, utils::command_exists, |
||||
}; |
||||
|
||||
#[tokio::main] |
||||
async fn main() -> anyhow::Result<()> { |
||||
let opts = Opts::parse(); |
||||
fn main() -> anyhow::Result<()> { |
||||
pretty_env_logger::init(); |
||||
|
||||
if let Some(generator) = opts.generate { |
||||
generate( |
||||
generator, |
||||
&mut Opts::into_app(), |
||||
"dfm", |
||||
&mut std::io::stdout(), |
||||
); |
||||
return Ok(()); |
||||
let opts = Opts::parse(); |
||||
log::debug!("Command line options: {:#?}", opts); |
||||
match opts.command { |
||||
opts::Commands::Apply { |
||||
repo_path, |
||||
filter, |
||||
link, |
||||
} => { |
||||
if !command_exists("difft") { |
||||
println!("'difft' is not installed"); |
||||
} else { |
||||
let context = build_context(repo_path); |
||||
log::debug!("Context: {:#?}", context); |
||||
build(&context).expect("Failed to build"); |
||||
apply(&context, &filter, link).expect("Failed to apply"); |
||||
} |
||||
} |
||||
opts::Commands::Diff { repo_path } => { |
||||
let context = build_context(repo_path); |
||||
log::debug!("Context: {:#?}", context); |
||||
build(&context).expect("Failed to build"); |
||||
diff(&context).expect("Failed to diff"); |
||||
} |
||||
opts::Commands::GenerateCompletions { shell } => { |
||||
generate(shell, &mut Opts::command(), "dfm", &mut std::io::stdout()); |
||||
} |
||||
} |
||||
|
||||
Ok(()) |
||||
} |
||||
|
||||
fn build_context(repo_path: PathBuf) -> Context { |
||||
let user_dirs = UserDirs::new().expect("Could not find user directories"); |
||||
let project_dirs = |
||||
ProjectDirs::from("se", "rsrp", "dfm").expect("Could not find project directories"); |
||||
|
||||
let repo_path = if opts.repo_path.is_relative() { |
||||
let mut repo_path = PathBuf::from(user_dirs.home_dir()); |
||||
repo_path.push(opts.repo_path); |
||||
repo_path |
||||
let repo_path = if repo_path.is_relative() { |
||||
let mut absolute_repo_path = PathBuf::from(user_dirs.home_dir()); |
||||
absolute_repo_path.push(repo_path); |
||||
absolute_repo_path |
||||
} else { |
||||
opts.repo_path |
||||
repo_path |
||||
}; |
||||
|
||||
let config = Config { |
||||
Context { |
||||
source_dir: repo_path, |
||||
build_dir: project_dirs.cache_dir().to_path_buf().join("tree"), |
||||
install_dir: project_dirs.config_dir().to_path_buf().join("tree"), |
||||
link_dir: user_dirs.home_dir().to_path_buf(), |
||||
ignored_dirs: vec![".git".to_string()], |
||||
}; |
||||
|
||||
build(&config).await?; |
||||
if opts.install { |
||||
install(&config).await?; |
||||
} else { |
||||
if !command_exists("delta").await { |
||||
println!("'delta' is not installed"); |
||||
return Ok(()); |
||||
} |
||||
|
||||
diff(&config).await?; |
||||
} |
||||
|
||||
Ok(()) |
||||
} |
||||
|
||||
@ -1,29 +1,51 @@ |
||||
use std::path::PathBuf; |
||||
|
||||
use clap::Parser; |
||||
use clap::{Parser, Subcommand}; |
||||
use clap_complete::Shell; |
||||
|
||||
use crate::utils::APP_VERSION; |
||||
|
||||
#[derive(Debug, Parser)] |
||||
#[clap(
|
||||
name = "dfm", |
||||
version = APP_VERSION, |
||||
version = env!("CARGO_PKG_VERSION"), |
||||
author = "Rasmus Rosengren <rasmus.rosengren@protonmail.com>", |
||||
about = "Utility to manage dotfiles" |
||||
)] |
||||
pub struct Opts { |
||||
#[clap(short, long)] |
||||
pub install: bool, |
||||
#[command(subcommand)] |
||||
pub command: Commands, |
||||
} |
||||
|
||||
#[derive(Debug, Subcommand)] |
||||
pub enum Commands { |
||||
#[clap(about = "Apply changes")] |
||||
Apply { |
||||
#[clap(
|
||||
short, |
||||
long, |
||||
default_value = ".df", |
||||
help = "Path to source repo, absolute path or path relative to $HOME" |
||||
)] |
||||
repo_path: PathBuf, |
||||
|
||||
#[clap(
|
||||
short, |
||||
long, |
||||
default_value = ".df", |
||||
help = "Absolute path or relative path to $HOME" |
||||
)] |
||||
pub repo_path: PathBuf, |
||||
#[clap(help = "Filter which files should be installed, checks for substring")] |
||||
filter: Option<String>, |
||||
|
||||
#[clap(long, value_name = "SHELL", help = "Generate shell completions")] |
||||
pub generate: Option<Shell>, |
||||
#[clap(short, long, default_value = "true", help = "Symlink the built files")] |
||||
link: bool, |
||||
}, |
||||
#[clap(about = "Display diff between repo and installed files")] |
||||
Diff { |
||||
#[clap(
|
||||
short, |
||||
long, |
||||
default_value = ".df", |
||||
help = "Path to source repo, absolute path or path relative to $HOME" |
||||
)] |
||||
repo_path: PathBuf, |
||||
}, |
||||
#[clap(about = "Generate shell completions")] |
||||
GenerateCompletions { |
||||
#[clap(long, value_name = "SHELL", help = "Generate shell completions")] |
||||
shell: Shell, |
||||
}, |
||||
} |
||||
|
||||
Loading…
Reference in new issue