diff --git a/source/net/filebot/Logging.java b/source/net/filebot/Logging.java index da5c7a68..c28238d8 100644 --- a/source/net/filebot/Logging.java +++ b/source/net/filebot/Logging.java @@ -3,6 +3,7 @@ package net.filebot; import static java.nio.channels.Channels.*; import static java.util.Arrays.*; import static java.util.stream.Collectors.*; +import static net.filebot.util.RegularExpressions.*; import java.io.File; import java.io.FileOutputStream; @@ -96,6 +97,10 @@ public final class Logging { return () -> String.format(format, args); } + public static Supplier formatSingleLine(String format, Object... args) { + return () -> NEWLINE.splitAsStream(String.format(format, args)).map(String::trim).filter(s -> !s.isEmpty()).collect(joining(" ⏎ ")); + } + public static Supplier trace(Throwable t) { return () -> { StringBuilder s = new StringBuilder(); diff --git a/source/net/filebot/cli/CmdlineOperations.java b/source/net/filebot/cli/CmdlineOperations.java index 50230944..51153bd4 100644 --- a/source/net/filebot/cli/CmdlineOperations.java +++ b/source/net/filebot/cli/CmdlineOperations.java @@ -891,7 +891,7 @@ public class CmdlineOperations implements CmdlineInterface { return input; } - log.fine(format("Apply filter [%s] on [%d] items", filter.getExpression(), input.size())); + log.fine(formatSingleLine("Apply filter [%s] on [%d] items", filter.getExpression(), input.size())); // support context bindings Map context = new EntryList(null, input); @@ -910,7 +910,7 @@ public class CmdlineOperations implements CmdlineInterface { return episodes; } - log.fine(format("Apply mapper [%s] on [%d] items", mapper.getExpression(), episodes.size())); + log.fine(formatSingleLine("Apply mapper [%s] on [%d] items", mapper.getExpression(), episodes.size())); // support episode list context Map context = new EntryList(null, episodes);