updated rule based logic for finding and outputting files
All checks were successful
Version Check / check-version (pull_request) Successful in 4s

This commit is contained in:
2026-03-18 11:26:40 +01:00
parent 1d9342186a
commit 184386a96b
4 changed files with 200 additions and 142 deletions

View File

@@ -5,6 +5,7 @@ mod error;
mod format;
mod runner;
mod ui;
mod resolver;
use app::App;
use config::load_config;
@@ -13,7 +14,6 @@ use format::{detect_format, get_handler};
use log::{error, info, warn};
use runner::AppRunner;
use std::io;
use std::path::{Path, PathBuf};
use crossterm::{
event::{DisableMouseCapture, EnableMouseCapture},
@@ -22,114 +22,6 @@ use crossterm::{
};
use ratatui::{Terminal, backend::CrosstermBackend};
/// Helper to automatically determine the output file path based on common naming conventions.
fn determine_output_path(input: &Path) -> PathBuf {
let file_name = input.file_name().unwrap_or_default().to_string_lossy();
// Standard mappings
if file_name == ".env.example" || file_name == ".env.template" {
return input.with_file_name(".env");
}
if file_name == "docker-compose.yml" || file_name == "compose.yml" {
return input.with_file_name("compose.override.yml");
}
if file_name == "docker-compose.yaml" || file_name == "compose.yaml" {
return input.with_file_name("compose.override.yaml");
}
// Pattern-based mappings
if let Some(base) = file_name.strip_suffix(".env.example") {
return input.with_file_name(format!("{}.env", base));
}
if let Some(base) = file_name.strip_suffix(".env.template") {
return input.with_file_name(format!("{}.env", base));
}
if let Some(base) = file_name.strip_suffix(".example.json") {
return input.with_file_name(format!("{}.json", base));
}
if let Some(base) = file_name.strip_suffix(".template.json") {
return input.with_file_name(format!("{}.json", base));
}
if let Some(base) = file_name.strip_suffix(".example.yml") {
return input.with_file_name(format!("{}.yml", base));
}
if let Some(base) = file_name.strip_suffix(".template.yml") {
return input.with_file_name(format!("{}.yml", base));
}
if let Some(base) = file_name.strip_suffix(".example.yaml") {
return input.with_file_name(format!("{}.yaml", base));
}
if let Some(base) = file_name.strip_suffix(".template.yaml") {
return input.with_file_name(format!("{}.yaml", base));
}
if let Some(base) = file_name.strip_suffix(".example.toml") {
return input.with_file_name(format!("{}.toml", base));
}
if let Some(base) = file_name.strip_suffix(".template.toml") {
return input.with_file_name(format!("{}.toml", base));
}
input.with_extension(format!(
"{}.out",
input.extension().unwrap_or_default().to_string_lossy()
))
}
/// Discovers common configuration template files in the current directory.
fn find_input_file() -> Option<PathBuf> {
let candidates = [
".env.example",
"compose.yml",
"docker-compose.yml",
".env.template",
"compose.yaml",
"docker-compose.yaml",
];
// Priority 1: Exact matches for well-known defaults
for name in &candidates {
let path = PathBuf::from(name);
if path.exists() {
return Some(path);
}
}
// Priority 2: Pattern matches
if let Ok(entries) = std::fs::read_dir(".") {
let mut fallback = None;
for entry in entries.flatten() {
let name = entry.file_name();
let name_str = name.to_string_lossy();
if name_str.ends_with(".env.example")
|| name_str.ends_with(".env.template")
|| name_str.ends_with(".example.json")
|| name_str.ends_with(".template.json")
|| name_str.ends_with(".example.yml")
|| name_str.ends_with(".template.yml")
|| name_str.ends_with(".example.yaml")
|| name_str.ends_with(".template.yaml")
|| name_str.ends_with(".example.toml")
|| name_str.ends_with(".template.toml")
{
// Prefer .env.* or compose.* if multiple matches
if name_str.contains(".env") || name_str.contains("compose") {
return Some(entry.path());
}
if fallback.is_none() {
fallback = Some(entry.path());
}
}
}
if let Some(path) = fallback {
return Some(path);
}
}
None
}
fn main() -> anyhow::Result<()> {
let args = cli::parse();
@@ -152,7 +44,7 @@ fn main() -> anyhow::Result<()> {
}
path
}
None => match find_input_file() {
None => match resolver::find_input_file() {
Some(path) => {
info!("Discovered template: {}", path.display());
path
@@ -172,38 +64,11 @@ fn main() -> anyhow::Result<()> {
let handler = get_handler(format_type);
// Smart Comparison Logic
let input_name = input_path.file_name().unwrap_or_default().to_string_lossy();
let is_template_input = input_name.contains(".example") || input_name.contains(".template") || input_name == "compose.yml" || input_name == "docker-compose.yml";
let mut template_path = None;
let mut active_path = None;
if is_template_input {
template_path = Some(input_path.clone());
let expected_active = determine_output_path(&input_path);
if expected_active.exists() {
active_path = Some(expected_active);
}
} else {
// Input is likely an active config (e.g., .env)
active_path = Some(input_path.clone());
// Try to find a template
let possible_templates = [
format!("{}.example", input_name),
format!("{}.template", input_name),
];
for t in possible_templates {
let p = input_path.with_file_name(t);
if p.exists() {
template_path = Some(p);
break;
}
}
}
let (active_path, template_path) = resolver::resolve_paths(&input_path);
let output_path = args
.output
.unwrap_or_else(|| active_path.clone().unwrap_or_else(|| determine_output_path(&input_path)));
.unwrap_or_else(|| active_path.clone().unwrap_or_else(|| resolver::determine_output_path(&input_path)));
info!("Output: {}", output_path.display());
@@ -283,4 +148,4 @@ fn main() -> anyhow::Result<()> {
Err(e.into())
}
}
}
}