From 1dea592fb27ab5d13c5ad84f16537d0e6be9d8b1 Mon Sep 17 00:00:00 2001
From: Adam French <adam.a.french@outlook.com>
Date: Mon, 2 Mar 2026 21:55:27 +0000
Subject: [PATCH] adding commit info

---
 src/commit.rs | 51 ++++++++++++++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/commit.rs b/src/commit.rs
index 546ec1f..e7c4455 100644
--- a/src/commit.rs
+++ b/src/commit.rs
@@ -1,24 +1,37 @@
+use crate::error::CommitError;
+use crate::utils::{copy_path, is_descendant_of_current_dir, is_file_in_dir};
 use crate::TOUR_DIR;
 use std::fs;
-use std::io::Write;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
-pub fn commit(files: Vec<PathBuf>, message: String) -> Result<(), std::io::Error> {
-    // let files = files.iter().map(|p| p.as_ref()).collect();
-    //
-    // let dir = std::fs::read_dir(format!("{}/steps", TOUR_DIR))?;
-    //
-    // // USE /steps to find number of next step
-    // // let step_number =
-    //
-    // fs::create_dir_all(format!("{}/{}", TOUR_DIR, "steps/0/files"))?;
-    //
-    // // Copy files listed by command to step 0
-    // let dest = format!("{}/steps/0/files/", TOUR_DIR);
-    // crate::utils::copy_files(files, dest.as_ref())?;
-    //
-    // // Copy message
-    // let mut message_file = fs::File::create(format!("{}/steps/{}/message", TOUR_DIR, step_number))?;
-    // write!(message_file, "{}", message)?;
+pub fn commit(files: Vec<PathBuf>, message: String) -> Result<(), CommitError> {
+    let tour_dir = Path::new(TOUR_DIR);
+
+    for file in &files {
+        if !is_descendant_of_current_dir(file)? {
+            return Err(CommitError::NotADescendantOfCurrentDir(file.clone()));
+        }
+        if is_file_in_dir(file, tour_dir)? {
+            return Err(CommitError::InsideTourDir(file.clone()));
+        }
+    }
+
+    let steps_dir = tour_dir.join("steps");
+    let step_num = fs::read_dir(&steps_dir)?
+        .filter_map(|e| e.ok())
+        .filter(|e| e.path().is_dir())
+        .count();
+
+    let step_dir = steps_dir.join(step_num.to_string());
+    fs::create_dir_all(&step_dir)?;
+
+    for file in &files {
+        copy_path(file, &step_dir)?;
+    }
+
+    fs::write(step_dir.join("message"), &message)?;
+    crate::info::update_last_modified()?;
+
+    println!("Step {}: {}", step_num, message);
     Ok(())
 }