Update file node error handling and extension filtering (#3)

The commit improves handling of file node errors by providing different responses based on the type of error. It also adds new command-line options for including or excluding files based on their extensions. Furthermore, the commit improves the management of file collections, filtering, and handling of cyclic dependencies with additional utility functions.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "topcat"
-version = "0.1.1"
+version = "0.1.2"
 readme = "README.md"
 license = "MIT OR Apache-2.0"
 authors = ["josha@jci.dev", ]
@@ -35,6 +35,7 @@ regex = "1.10.3"
 structopt = "0.3.26"
 log = "0.4.21"
 env_logger = "0.11.3"
+graph-cycles = "0.1.0"
 
 [dev-dependencies]
-tempfile = "3.10.1"
+tempfile = "3.10.1"

pyproject.toml

@@ -12,7 +12,7 @@ build-backend = "maturin"
 
 [project]
 name = "topcat"
-version = "0.1.1"
+version = "0.1.2"
 description = "A tool for concatenating files in topological order"
 authors = [{ name = "Josha Inglis", email = "joshainglis@gmail.com" }]
 readme = "README.md"

src/config.rs

@@ -4,10 +4,13 @@ pub struct Config<'a> {
     pub input_dirs: Vec<PathBuf>,
     pub include_globs: Option<&'a [String]>,
     pub exclude_globs: Option<&'a [String]>,
+    pub include_extensions: Option<&'a [String]>,
+    pub exclude_extensions: Option<&'a [String]>,
     pub output: PathBuf,
     pub comment_str: String,
     pub file_separator_str: String,
     pub file_end_str: String,
     pub verbose: bool,
     pub dry_run: bool,
+    pub include_hidden: bool,
 }

src/exceptions.rs

@@ -1,3 +1,5 @@
+use crate::file_node::FileNode;
+use std::collections::HashSet;
 use std::error::Error;
 use std::path::PathBuf;
 use std::{fmt, io};
@@ -8,11 +10,10 @@ pub enum TopCatError {
     InvalidFileHeader(PathBuf, String),
     GraphMissing,
     NameClash(String, PathBuf, PathBuf),
-    NoNameDefined(PathBuf),
     MissingExist(String, String),
     MissingDependency(String, String),
     InvalidDependency(String, String),
-    CyclicDependency(String),
+    CyclicDependency(Vec<Vec<FileNode>>),
     UnknownError(String),
 }
 
@@ -22,11 +23,35 @@ impl fmt::Display for TopCatError {
             Self::GraphMissing => write!(f, "Graph is None"),
             Self::InvalidFileHeader(x, s) => write!(f, "Invalid file header in {}: {}", x.display(), s),
             Self::NameClash(name, f1, f2) => write!(f, "Name {} found in both {} and {}", name, f1.display(), f2.display()),
-            Self::NoNameDefined(x) => write!(f, "No name defined in {}", x.display()),
             Self::MissingExist(x, s) => write!(f, "MissingExist: {} expects {} to exist but it is not found", s, x),
             Self::MissingDependency(x, s) => write!(f, "MissingDependency: {} depends on {} bit it is missing", s, x),
             Self::InvalidDependency(x, s) => write!(f, "InvalidDependency: {} is marked as prepend so it cannot depend on {} which isn't marked as prepend", s, x),
-            Self::CyclicDependency(x) => write!(f, "CyclicDependency: {} has a cyclic dependency", x),
+            Self::CyclicDependency(x) => {
+                let mut error_message = "Cyclic dependency detected:\n".to_string();
+                for (i, cycle) in x.iter().enumerate() {
+                    error_message.push_str(&format!("  Cycle {}:\n", i + 1));
+                    let cycle_participants: HashSet<FileNode> = cycle.iter().cloned().collect();
+                    error_message.push_str("    Participants:\n");
+                    for participant in cycle_participants {
+                        error_message.push_str(&format!(
+                            "      - {} ({})\n",
+                            participant.name,
+                            participant.path.display()
+                        ));
+                    }
+                    error_message.push_str("    Edges:\n");
+                    for (i, node) in cycle.iter().enumerate() {
+                        let next_node = &cycle[(i + 1) % cycle.len()];
+                        error_message.push_str(&format!(
+                            "      - {} -> {}\n",
+                            node.name,
+                            next_node.name
+                        ));
+                    }
+                }
+
+                write!(f, "{}", error_message)
+            },
             Self::Io(err) => write!(f, "IO error: {}", err),
             Self::UnknownError(s) => write!(f, "UnknownError: {}", s),
         }
@@ -44,7 +69,6 @@ impl Error for TopCatError {}
 #[derive(Debug)]
 pub enum FileNodeError {
     TooManyNames(PathBuf, Vec<String>),
-    InvalidPath(PathBuf),
     NoNameDefined(PathBuf),
 }
 
@@ -57,7 +81,6 @@ impl fmt::Display for FileNodeError {
                 x.display(),
                 s.join(", ")
             ),
-            Self::InvalidPath(x) => write!(f, "Invalid path: {}", x.display()),
             Self::NoNameDefined(x) => write!(f, "No name defined in {}", x.display()),
         }
     }