3 Commits

Author SHA1 Message Date
cuddle-please
00667fef7c chore(release): 0.0.5
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2025-07-26 19:46:04 +00:00
18411bc52c feat: actually copy files
All checks were successful
continuous-integration/drone/push Build is passing
2025-07-26 21:44:51 +02:00
6ce8f3e9b4 chore(release): v0.0.4 (#7)
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
chore(release): 0.0.4

Co-authored-by: cuddle-please <bot@cuddle.sh>
Reviewed-on: #7
2025-07-26 21:08:34 +02:00
5 changed files with 46 additions and 10 deletions

View File

@@ -6,6 +6,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
## [0.0.5] - 2025-07-26
### Added
- actually copy files
## [0.0.4] - 2025-07-26
### Added
- can now do file operations
### Other
- test
- replace url
## [0.0.3] - 2025-07-26 ## [0.0.3] - 2025-07-26
### Added ### Added

View File

@@ -3,7 +3,7 @@ members = ["crates/*"]
resolver = "2" resolver = "2"
[workspace.package] [workspace.package]
version = "0.0.3" version = "0.0.5"
[workspace.dependencies] [workspace.dependencies]
noil = { path = "crates/noil" } noil = { path = "crates/noil" }

View File

@@ -6,7 +6,10 @@ use crate::{
}; };
#[derive(clap::Parser)] #[derive(clap::Parser)]
pub struct ApplyCommand {} pub struct ApplyCommand {
#[arg(long = "commit")]
commit: bool,
}
impl ApplyCommand { impl ApplyCommand {
pub async fn execute(&self) -> anyhow::Result<()> { pub async fn execute(&self) -> anyhow::Result<()> {
@@ -17,11 +20,15 @@ impl ApplyCommand {
let input = String::from_utf8_lossy(&buffer); let input = String::from_utf8_lossy(&buffer);
let action = print_changes(&input).await?; if !self.commit {
match action { let action = print_changes(&input, !self.commit).await?;
Action::Quit => Ok(()), match action {
Action::Apply { original } => apply(&original).await, Action::Quit => Ok(()),
Action::Edit => todo!(), Action::Apply { original } => apply(&original).await,
Action::Edit => todo!(),
}
} else {
apply(&input).await
} }
} }
} }

View File

@@ -17,6 +17,8 @@ use crate::{
parse, parse,
}; };
const PREVIEW: bool = false;
#[derive(Parser)] #[derive(Parser)]
pub struct EditCommand { pub struct EditCommand {
#[arg()] #[arg()]
@@ -68,7 +70,7 @@ impl EditCommand {
.await .await
.context("read noil file")?; .context("read noil file")?;
let res = print_changes(&noil_content).await; let res = print_changes(&noil_content, PREVIEW).await;
let action = match res { let action = match res {
Ok(a) => a, Ok(a) => a,
@@ -175,6 +177,7 @@ pub async fn apply(input: &str) -> anyhow::Result<()> {
if existing.path.is_dir() { if existing.path.is_dir() {
tracing::debug!("copying dir"); tracing::debug!("copying dir");
copy(&existing.path, path).await?; copy(&existing.path, path).await?;
continue;
} }
tokio::fs::copy(&existing.path, &path) tokio::fs::copy(&existing.path, &path)
@@ -235,6 +238,9 @@ async fn copy(source: &Path, dest: &Path) -> anyhow::Result<()> {
for entry in walkdir::WalkDir::new(source) { for entry in walkdir::WalkDir::new(source) {
let entry = entry?; let entry = entry?;
tracing::debug!("copying path: {}", entry.path().display());
paths.push(entry.path().strip_prefix(source)?.to_path_buf()); paths.push(entry.path().strip_prefix(source)?.to_path_buf());
} }
@@ -260,10 +266,12 @@ async fn copy_path(src: &Path, dest: &Path) -> anyhow::Result<()> {
} }
if src.is_dir() { if src.is_dir() {
tracing::info!("copying dir: {}", dest.display());
tokio::fs::create_dir_all(&dest).await.context("copy dir")?; tokio::fs::create_dir_all(&dest).await.context("copy dir")?;
} }
if dest.is_file() { if src.is_file() {
tracing::info!("copying file: {}", dest.display());
tokio::fs::copy(&src, &dest).await.context("copy file")?; tokio::fs::copy(&src, &dest).await.context("copy file")?;
} }

View File

@@ -14,7 +14,7 @@ pub enum Action {
Edit, Edit,
} }
pub async fn print_changes(input: &str) -> anyhow::Result<Action> { pub async fn print_changes(input: &str, preview: bool) -> anyhow::Result<Action> {
let noil_index = parse_input(input).context("parse input")?; let noil_index = parse_input(input).context("parse input")?;
fn print_op(key: &str, index: Option<&str>, path: Option<&Path>) { fn print_op(key: &str, index: Option<&str>, path: Option<&Path>) {
@@ -64,6 +64,11 @@ pub async fn print_changes(input: &str) -> anyhow::Result<Action> {
_ => {} _ => {}
} }
} }
if preview {
return Ok(Action::Quit);
}
eprint!("\nApply changes? (y (yes) / n (abort) / E (edit)): "); eprint!("\nApply changes? (y (yes) / n (abort) / E (edit)): ");
let mut stderr = std::io::stderr(); let mut stderr = std::io::stderr();
stderr.flush()?; stderr.flush()?;