Improve default value display on help

README.md

@@ -34,24 +34,29 @@ Using this parameter is not required, but it is the reason I originally started
   -m, --mkvtoolnix=<mkvToolNix>
                             path to mkvtoolnix installation
   -s, --safemode            test run (no files will be changes)
-  -t, --threads=<threads>   thread count (default: 2)
+  -t, --threads=<threads>   thread count
+                              Default: 2
   -c, --coherent=<coherent> try to match all files in dir of depth with the same attribute config. Attempting increasing deeper levels until match is found (worst case applying config on single file basis)
       -cf, --force-coherent only applies changes if a coherent match was found for the specifically entered depth
   -d, --filter-date=<filterDate>
                             only consider files created newer than entered date (format: "dd.MM.yyyy-HH:mm:ss")
   -i, --include-pattern=<includePattern>
-                            include files matching pattern (default: ".*")
+                            include files matching pattern
   -e, --exclude=<excluded>...
                             relative directories and files to be excluded (no wildcard)
   -o, -overwrite-forced     remove all forced flags
       --forced-keywords=<forcedKeywords>[, <forcedKeywords>...]...
-                            Keywords to identify forced tracks (Defaults will be overwritten; Default: forced, signs, songs)
+                            Keywords to identify forced tracks (Defaults will be overwritten)
+                              Default: forced, signs, songs
       --commentary-keywords=<commentaryKeywords>[, <commentaryKeywords>...]...
-                            Keywords to identify commentary tracks (Defaults will be overwritten; Default: comment, commentary, director)
+                            Keywords to identify commentary tracks (Defaults will be overwritten)
+                              Default: comment, commentary, director
       --hearing-impaired=<hearingImpaired>[, <hearingImpaired>...]...
-                            Keywords to identify hearing impaired tracks (Defaults will be overwritten; Default: SDH, CC
+                            Keywords to identify hearing impaired tracks (Defaults will be overwritten
+                              Default: SDH, CC
       --preferred-subtitles=<preferredSubtitles>[, <preferredSubtitles>...]...
-                            Keywords to prefer specific subtitle tracks (Defaults will be overwritten; Default: unstyled)
+                            Keywords to prefer specific subtitle tracks (Defaults will be overwritten)
+                              Default: unstyled
       --debug               Enable debug logging
   -h, --help                Show this help message and exit.
   -V, --version             Print version information and exit.

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/InputConfig.java

@@ -43,7 +43,7 @@ public class InputConfig implements CommandLine.IVersionProvider {
     private boolean safeMode;
 
     @Min(1)
-    @Option(names = {"-t", "--threads"}, defaultValue = "2", description = "thread count (default: ${DEFAULT-VALUE})")
+    @Option(names = {"-t", "--threads"}, defaultValue = "2", showDefaultValue = CommandLine.Help.Visibility.ALWAYS, description = "thread count")
     private int threads;
 
     @Min(0)
@@ -57,7 +57,7 @@ public class InputConfig implements CommandLine.IVersionProvider {
 //    private boolean onlyNewFiles;
     @Option(names = {"-d", "--filter-date"}, defaultValue = Option.NULL_VALUE, description = "only consider files created newer than entered date (format: \"dd.MM.yyyy-HH:mm:ss\")")
     private Date filterDate;
-    @Option(names = {"-i", "--include-pattern"}, defaultValue = ".*", description = "include files matching pattern (default: \".*\")")
+    @Option(names = {"-i", "--include-pattern"}, defaultValue = ".*", description = "include files matching pattern")
     private Pattern includePattern;
     @Option(names = {"-e", "--exclude"}, arity = "1..*",
             description = "relative directories and files to be excluded (no wildcard)")
@@ -66,17 +66,17 @@ public class InputConfig implements CommandLine.IVersionProvider {
 
     @Option(names =  {"-o", "-overwrite-forced"}, description = "remove all forced flags")
     private boolean overwriteForced;
-    @Option(names = {"--forced-keywords"}, arity = "1..*", defaultValue = "forced, signs, songs", split = ", ",
+    @Option(names = {"--forced-keywords"}, arity = "1..*", defaultValue = "forced, signs, songs", showDefaultValue = CommandLine.Help.Visibility.ALWAYS,
-            description = "Keywords to identify forced tracks (Defaults will be overwritten; Default: ${DEFAULT-VALUE})")
+            split = ", ", description = "Keywords to identify forced tracks (Defaults will be overwritten)")
     private Set<String> forcedKeywords;
-    @Option(names = {"--commentary-keywords"}, arity = "1..*", defaultValue = "comment, commentary, director", split = ", ",
+    @Option(names = {"--commentary-keywords"}, arity = "1..*", defaultValue = "comment, commentary, director", showDefaultValue = CommandLine.Help.Visibility.ALWAYS,
-            description = "Keywords to identify commentary tracks (Defaults will be overwritten; Default: ${DEFAULT-VALUE})")
+            split = ", ", description = "Keywords to identify commentary tracks (Defaults will be overwritten)")
     private Set<String> commentaryKeywords;
-    @Option(names = {"--hearing-impaired"}, arity = "1..*", defaultValue = "SDH, CC", split = ", ",
+    @Option(names = {"--hearing-impaired"}, arity = "1..*", defaultValue = "SDH, CC", showDefaultValue = CommandLine.Help.Visibility.ALWAYS,
-            description = "Keywords to identify hearing impaired tracks (Defaults will be overwritten; Default: ${DEFAULT-VALUE}")
+            split = ", ", description = "Keywords to identify hearing impaired tracks (Defaults will be overwritten")
     private Set<String> hearingImpaired;
-    @Option(names = {"--preferred-subtitles"}, arity = "1..*", defaultValue = "unstyled", split = ", ",
+    @Option(names = {"--preferred-subtitles"}, arity = "1..*", defaultValue = "unstyled", showDefaultValue = CommandLine.Help.Visibility.ALWAYS,
-            description = "Keywords to prefer specific subtitle tracks (Defaults will be overwritten; Default: ${DEFAULT-VALUE})")
+            split = ", ", description = "Keywords to prefer specific subtitle tracks (Defaults will be overwritten)")
     private Set<String> preferredSubtitles;
     @Option(names = {"--debug"}, description = "Enable debug logging")
     private boolean debug;