Work in progress

Author: ComputerDaddyGuy

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/ConsoleOutput.java

@@ -31,14 +31,13 @@ private void printErr(String msg, Object... args) {
 	}
 
 	private void printfln(PrintStream dest, String msg, Object... args) {
-		dest.printf(msg, args);
-		dest.println(); // Because "printf" does not print line return
+		dest.printf(msg + "\n", args);// Because "printf" does not print line return
 	}
 
 	public void printDebug(String msg, Object... args) {
 		// Could not (yet) make Logger level work within native image, so fallback to plain console output (for now)
 		if (debug) {
-			printOut(msg, args);
+			printOut("[DEBUG] " + msg, args);
 		}
 	}
 
@@ -47,7 +46,7 @@ public void print(String msg, Object... args) {
 	}
 
 	public void printError(String msg, Object... args) {
-		printErr(msg, args);
+		printErr("[ERROR] " + msg, args);
 	}
 
 }

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/FileTreePrettyPrinterCommandLine.java

@@ -1,13 +1,22 @@
 package io.github.computerdaddyguy.jfiletreeprettyprinter.cli;
 
+import io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options.ExternalOptionsMapper;
+import io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options.ExternalOptionsReader;
 import picocli.CommandLine;
 
 class FileTreePrettyPrinterCommandLine {
 
 	public static void main(String[] args) {
-		var cmd = new CommandLine(new PrettyPrintCommand());
-		int exitCode = cmd.execute(args);
-		System.exit(exitCode);
+		System.exit(executeCommand(args));
+	}
+
+	static int executeCommand(String[] args) {
+		var reader = ExternalOptionsReader.createDefault();
+		var mapper = ExternalOptionsMapper.createDefault();
+
+		var cmd = new CommandLine(new PrettyPrintCommand(reader, mapper));
+
+		return cmd.execute(args);
 	}
 
 }

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/PrettyPrintCommand.java

@@ -1,11 +1,14 @@
 package io.github.computerdaddyguy.jfiletreeprettyprinter.cli;
 
 import io.github.computerdaddyguy.jfiletreeprettyprinter.FileTreePrettyPrinter;
+import io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options.ExternalOptionsException;
+import io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options.ExternalOptionsMapper;
 import io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options.ExternalOptionsReader;
 import io.github.computerdaddyguy.jfiletreeprettyprinter.options.PrettyPrintOptions;
+import jakarta.validation.ConstraintViolationException;
 import java.io.File;
 import java.nio.file.Path;
-import java.util.ArrayList;
+import java.util.Objects;
 import java.util.concurrent.Callable;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
@@ -24,7 +27,15 @@
 @NullMarked
 class PrettyPrintCommand implements Callable<Integer> {
 
-	private static final String DEFAULT_OPTION_FILENAME = ".prettyprint";
+	private final ExternalOptionsReader reader;
+	private final ExternalOptionsMapper mapper;
+
+	public PrettyPrintCommand(ExternalOptionsReader reader, ExternalOptionsMapper mapper) {
+		this.reader = Objects.requireNonNull(reader, "reader is null");
+		this.mapper = Objects.requireNonNull(mapper, "mapper is null");
+	}
+
+	// ---------- CLI args ----------
 
 	@Nullable
 	@Parameters(index = "0", description = "The path to pretty print", arity = "0..1")
@@ -37,6 +48,8 @@ class PrettyPrintCommand implements Callable<Integer> {
 	@Option(names = { "-d", "--debug" }, description = "debug mode")
 	private boolean debug;
 
+	// ---------- Command ----------
+
 	@Override
 	public Integer call() throws Exception {
 
@@ -48,7 +61,18 @@ public Integer call() throws Exception {
 			return 1;
 		}
 
-		var options = detectOptions(targetPath, output);
+		PrettyPrintOptions options;
+		try {
+			Path optionsPath = optionsFile == null ? null : optionsFile.toPath().toAbsolutePath().normalize();
+			var externalOptions = reader.readExternalOptions(output, targetPath, optionsPath);
+			options = mapper.mapToOptions(targetPath, externalOptions);
+		} catch (ExternalOptionsException e) {
+			output.printError(e.getMessage() + ": " + optionsFile.toString());
+			return 1;
+		} catch (ConstraintViolationException e) {
+			output.printError(e.getMessage() + ": " + optionsFile.toString());
+			return 1;
+		}
 
 		try {
 			var printer = FileTreePrettyPrinter.builder().withOptions(options).build();
@@ -74,29 +98,4 @@ private Path detectTargetPath(ConsoleOutput output) {
 		return path;
 	}
 
-	private PrettyPrintOptions detectOptions(Path targetPath, ConsoleOutput output) {
-
-		var reader = new ExternalOptionsReader(output);
-		if (optionsFile != null) {
-			var path = optionsFile.toPath().toAbsolutePath().normalize();
-			var options = reader.readOptions(targetPath, path);
-			if (options == null) {
-				System.exit(1);
-			}
-			return options;
-		} else {
-			var potentialOptions = new ArrayList<Path>();
-			potentialOptions.add(targetPath.resolve(DEFAULT_OPTION_FILENAME));
-			potentialOptions.add(Path.of(".").resolve(DEFAULT_OPTION_FILENAME));
-			potentialOptions.add(Path.of(System.getProperty("user.home")).resolve(DEFAULT_OPTION_FILENAME));
-			var options = reader.readOptions(targetPath, potentialOptions);
-			if (options != null) {
-				return options;
-			}
-			output.printDebug("No options file provided/found!");
-			return PrettyPrintOptions.createDefault();
-		}
-
-	}
-
 }

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/options/DefaultExternalOptionsMapper.java

@@ -0,0 +1,58 @@
+package io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options;
+
+import io.github.computerdaddyguy.jfiletreeprettyprinter.options.ChildLimits;
+import io.github.computerdaddyguy.jfiletreeprettyprinter.options.PathMatchers;
+import io.github.computerdaddyguy.jfiletreeprettyprinter.options.PrettyPrintOptions;
+import java.nio.file.Path;
+import java.nio.file.PathMatcher;
+import org.jspecify.annotations.Nullable;
+
+class DefaultExternalOptionsMapper implements ExternalOptionsMapper {
+
+	@Override
+	public PrettyPrintOptions mapToOptions(Path targetPath, @Nullable ExternalOptions externalOptions) {
+		var options = PrettyPrintOptions.createDefault();
+		if (externalOptions != null) {
+			options = mapEmojis(options, externalOptions);
+			options = mapChildLimit(options, externalOptions, targetPath);
+		}
+		return options;
+	}
+
+	private PrettyPrintOptions mapEmojis(PrettyPrintOptions options, ExternalOptions externalOptions) {
+		if (Boolean.TRUE.equals(externalOptions.emojis())) {
+			return options.withDefaultEmojis();
+		}
+		return options;
+	}
+
+	private PrettyPrintOptions mapChildLimit(PrettyPrintOptions options, ExternalOptions externalOptions, Path targetPath) {
+		if (externalOptions.childLimit() == null) {
+			return options;
+		}
+		return switch (externalOptions.childLimit()) {
+			case ChildLimit.StaticLimit(var limit) -> options.withChildLimit(limit);
+			case ChildLimit.DynamicLimit(var limits) -> {
+				var limitBuilder = ChildLimits.builder();
+				for (var limit : limits) {
+					limitBuilder.add(mapMatcher(limit.matcher(), targetPath), limit.limit());
+				}
+				options.withChildLimit(limitBuilder.build());
+				yield options;
+			}
+		};
+	}
+
+	private PathMatcher mapMatcher(Matcher matcher, Path targetPath) {
+		return switch (matcher) {
+			case Matcher.AlwaysTrue() -> (p) -> true;
+			case Matcher.AlwaysFalse() -> (p) -> false;
+			case Matcher.AllOf(var matchers) -> PathMatchers.allOf(matchers.stream().map(subMatcher -> mapMatcher(subMatcher, targetPath)).toList());
+			case Matcher.AnyOf(var matchers) -> PathMatchers.anyOf(matchers.stream().map(subMatcher -> mapMatcher(subMatcher, targetPath)).toList());
+			case Matcher.NoneOf(var matchers) -> PathMatchers.noneOf(matchers.stream().map(subMatcher -> mapMatcher(subMatcher, targetPath)).toList());
+			case Matcher.NameGlob(var glob) -> PathMatchers.hasNameMatchingGlob(glob);
+			case Matcher.PathGlob(var glob) -> PathMatchers.hasRelativePathMatchingGlob(targetPath, glob);
+		};
+	}
+
+}

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/options/ExternalOptionsException.java

@@ -0,0 +1,25 @@
+package io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options;
+
+import java.nio.file.Path;
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+public class ExternalOptionsException extends RuntimeException {
+
+	private final Path optionsPath;
+
+	public ExternalOptionsException(Path optionsPath, String message, Throwable cause) {
+		super(message, cause);
+		this.optionsPath = optionsPath;
+	}
+
+	public ExternalOptionsException(Path optionsPath, String message) {
+		super(message);
+		this.optionsPath = optionsPath;
+	}
+
+	public Path getOptionsPath() {
+		return optionsPath;
+	}
+
+}

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/options/ExternalOptionsMapper.java

@@ -0,0 +1,17 @@
+package io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options;
+
+import io.github.computerdaddyguy.jfiletreeprettyprinter.options.PrettyPrintOptions;
+import java.nio.file.Path;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+@NullMarked
+public interface ExternalOptionsMapper {
+
+	PrettyPrintOptions mapToOptions(Path targetPath, @Nullable ExternalOptions externalOptions);
+
+	static ExternalOptionsMapper createDefault() {
+		return new DefaultExternalOptionsMapper();
+	}
+
+}