Merge pull request #47 from RatzzFatzz/dev

Fix OFF for subtitles

README.md

@@ -1,59 +1,55 @@
-### Table of content
+## Introduction
- - Introduction
- - Requirements
- - Running
- - Configuration
- - Additional parameters
 
-### Introduction
+This program helps to change audio and subtitle tracks of mkv files without rewriting the file. Only track properties will be updated.
+![](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/blob/master/example.gif)
 
-This program helps to change audio and subtitle lines of mkv files.
+## Requirements
-
-### Requirements
 
  - Java 11 or higher
  - mkvtoolnix installation
  
-### Running
+## Execution
+**Minimal usage:**
+`java -jar mkvaudiosubtitlechanger.jar --library "X:/Files" --attribute-config eng:ger eng:OFF`
 
-1. Extract downloaded archive
+**Safe usage (best for testing before applying to whole library):**
-2. Copy `config-template.yaml` to `config.yaml`
+`java -jar mkvaudiosubtitlechanger.jar --library "X:/Files" --attribute-config eng:ger eng:OFF --safe-mode`
-3. Update `config.yaml` to fit your needs
-4. Open terminal / cmd in the directory of the jar and the config file 
-5. Execute following commands:
-   1. (Optional) `java -jar mkvaudiosubtitleschanger.jar -l [path to mkv or dir with mkv] --safe-mode`
-   2. To permanently apply changes: `java -jar mkvaudiosubtitleschanger.jar -l [path to mkv or dir with mkv]`
 
-### Configuration
+Attribute-config must be entered in pairs: `audio:subtitle`; Example: `jpn:eng`. More about this topic
+[here](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/wiki/Attribute-Config).
 
-Config file needs to be placed in the same directory as the jar or path to config has to be passed via command line
+## Available parameters
-argument.
-
-The list of language configurations can be expanded. Use `OFF` if you want to turn of the audio or subtitle lane. 
-Players probably will display forced subtitles nonetheless.
-```yaml
-config:
-  1:
-    audio: ger
-    subtitle: OFF
-  2:
-    audio: eng
-    subtitle: ger
 ```
-Subtitle lanes recognized as forced will be set as one. Already existing ones will not be overwritten or changed.
+ -l,--library-path <arg>           Path to library
-
+ -a,--attribute-config <arg>       Attribute config to decide which tracks to choose when
-
+ -p,--config-path <arg>            Path to config file
-### Additional arameters
-These properties overwrite already existing values in the config file.
-```properties
- -c,--config <arg>                Path to config file
- -e,--exclude-directories <arg>   Directories to be excluded, combines with config file
- -h,--help                        "for help this is" - Yoda
- -i,--include-pattern <arg>       Include files matching pattern
- -k,--forcedKeywords <arg>        Additional keywords to identify forced tracks, combines with config file
- -l,--library <arg>               Path to library
  -m,--mkvtoolnix <arg>             Path to mkv tool nix installation
  -s,--safe-mode                    Test run (no files will be changes)
- -t,--threads <arg>               thread count (default: 2)
+ -c,--coherent <arg>               Try to match all files in dir of depth with the same config
+ -cf,--force-coherent              Force coherent and don't update anything if config fits not whole config (default: false)
+ -n,--only-new-files               Sets filter-date to last successful execution (Overwrites input of filter-date)
+ -d,--filter-date <arg>            Only consider files created newer than entered date (format: "dd.MM.yyyy-HH:mm:ss")
+ -t,--threads <arg>                Thread count (default: 2)
+ -i,--include-pattern <arg>        Include files matching pattern (default: ".*")
+ -e,--excluded-directories <arg>   Directories to be excluded, combines with config file
+ -fk,--forced-keywords <arg>       Additional keywords to identify forced tracks
+ -ck,--commentary-keywords <arg>   Additional keywords to identify commentary tracks
+ -ps,--preferred-subtitles <arg>   Additional keywords to prefer specific subtitle tracks
  -v,--version                      Display version
+ -h,--help                         "For help this is" - Yoda
+```
+If you need more information about how each parameter works, check out [this wiki page](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/wiki/Parameters).
+
+All parameters can also be defined in a [config file](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/wiki/How-to-config-file).
+
+## Build requirements
+- JDK 11 or higher
+- Maven 3
+- Git
+
+## Build from source
+```shell
+git clone https://github.com/RatzzFatzz/MKVAudioSubtitleChanger.git
+cd MKVAudioSubtitleChanger
+mvn package
 ```

config-template.yaml

@@ -1,6 +1,7 @@
 mkvtoolnix: C:\Program Files\MKVToolNix
+library: X:/Files
 
-config:
+attribute-config:
   1:
     audio: ger
     subtitle: OFF
@@ -10,9 +11,24 @@ config:
 
 # Recommendations for data stored on HDDs, increase when using SSDs
 #threads: 2
-#forcedKeywords: ["forced", "signs"]
+
+#forced-keywords: ["forced", "signs"]
+#commentary-keywords: ["commentary", "director"]
+#preferred-subtitles: ["unstyled"]
+
 #exclude-directories:
 #  - "D:/Path/To/File.mkv"
 #  - "D:/Path/To/Directory"
+
+# If pattern is negated, can be used to exclude files
 #include-pattern: "regex"
 
+# Only files newer than
+#filter-date: 20.03.2021-10:11:12
+
+safe-mode:
+#coherent:
+#force-coherent:
+#only-new-files:
+
+

pom.xml

@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>MKVAudioSubtileChanger</groupId>
+    <groupId>at.pcgamingfreaks</groupId>
     <artifactId>MKVAudioSubtitleChanger</artifactId>
-    <version>2.1</version>
+    <version>3.0</version>
 
     <build>
         <defaultGoal>clean package</defaultGoal>
@@ -20,7 +20,7 @@
                 <directory>./</directory>
                 <includes>
                     <include>language-codes</include>
-                    <include>version.properties</include>
+                    <include>project.properties</include>
                 </includes>
                 <filtering>true</filtering>
             </resource>
@@ -35,7 +35,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.2.2</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -47,7 +47,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -62,6 +62,13 @@
                                     <include>*:*</include>
                                 </includes>
                             </artifactSet>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <manifestEntries>
+                                        <Multi-Release>true</Multi-Release>
+                                    </manifestEntries>
+                                </transformer>
+                            </transformers>
                         </configuration>
                     </execution>
                 </executions>
@@ -117,50 +124,35 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.8</version>
+            <version>1.18.24</version>
             <scope>provided</scope>
         </dependency>
         <!-- region logging -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.17.1</version>
+            <version>2.18.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.17.1</version>
+            <version>2.18.0</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j18-impl -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <artifactId>log4j-slf4j18-impl</artifactId>
-            <version>2.17.1</version>
+            <version>2.18.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.28</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.7.28</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jul-to-slf4j</artifactId>
-            <version>1.7.28</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.13.1</version>
+            <version>2.13.4</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.2.1</version>
+            <version>2.13.4.2</version>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
@@ -175,27 +167,33 @@
         <dependency>
             <groupId>me.tongfei</groupId>
             <artifactId>progressbar</artifactId>
-            <version>0.9.3</version>
+            <version>0.9.5</version>
         </dependency>
         <!-- endregion -->
         <!-- region unit-tests -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.4.2</version>
+            <version>5.9.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.4.2</version>
+            <version>5.9.0</version>
             <scope>test</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.9.5</version>
+            <version>1.10.19</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>5.9.0</version>
             <scope>test</scope>
         </dependency>
         <!-- endregion -->
@@ -204,6 +202,12 @@
             <artifactId>YAML-Parser</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/net.harawata/appdirs -->
+        <dependency>
+            <groupId>net.harawata</groupId>
+            <artifactId>appdirs</artifactId>
+            <version>1.2.1</version>
+        </dependency>
     </dependencies>
 
 </project>

project.properties

@@ -0,0 +1,2 @@
+version=${project.version}
+project_name=${project.artifactId}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/AttributeUpdaterKernel.java

@@ -1,92 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger;
-
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.FileCollector;
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.FileProcessor;
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute;
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfoDto;
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ResultStatistic;
-import lombok.SneakyThrows;
-import lombok.extern.log4j.Log4j2;
-import me.tongfei.progressbar.ProgressBar;
-import me.tongfei.progressbar.ProgressBarBuilder;
-import me.tongfei.progressbar.ProgressBarStyle;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-@Log4j2
-public class AttributeUpdaterKernel {
-
-    private final ExecutorService executor = Executors.newFixedThreadPool(Config.getInstance().getThreadCount());
-    private final FileCollector collector;
-    private final FileProcessor processor;
-    private final ResultStatistic statistic = new ResultStatistic();
-
-    public AttributeUpdaterKernel(FileCollector collector, FileProcessor processor) {
-        this.collector = collector;
-        this.processor = processor;
-    }
-
-    @SneakyThrows
-    public void execute() {
-        statistic.startTimer();
-
-        try (ProgressBar progressBar = pbBuilder().build()) {
-            List<File> excludedFiles = Config.getInstance().getExcludedDirectories().stream()
-                    .map(collector::loadFiles)
-                    .flatMap(Collection::stream)
-                    .collect(Collectors.toList());
-            List<File> files = collector.loadFiles(Config.getInstance().getLibraryPath()).stream()
-                    .filter(file -> !excludedFiles.contains(file))
-                    .collect(Collectors.toList());
-            progressBar.maxHint(files.size());
-            files.forEach(file -> executor.submit(() -> process(file, progressBar)));
-            executor.shutdown();
-            executor.awaitTermination(1, TimeUnit.DAYS);
-        }
-
-        statistic.stopTimer();
-        System.out.println(statistic);
-        log.info(statistic);
-    }
-
-    private void process(File file, ProgressBar progressBar) {
-        List<FileAttribute> attributes = processor.loadAttributes(file);
-        FileInfoDto fileInfo = processor.filterAttributes(attributes);
-        statistic.total();
-        if (fileInfo.isChangeNecessary()) {
-            statistic.shouldChange();
-            if (!Config.getInstance().isSafeMode()) {
-                try {
-                    processor.update(file, fileInfo);
-                    statistic.success();
-                    log.info("Updated {}", file.getAbsolutePath());
-                } catch (IOException e) {
-                    statistic.failedChanging();
-                    log.warn("File couldn't be updated: {}", file.getAbsoluteFile());
-                }
-            }
-        } else if (fileInfo.isUnableToApplyConfig()) {
-            statistic.noSuitableConfigFound();
-        } else if (fileInfo.isAlreadySuitable()){
-            statistic.alreadyFits();
-        } else {
-            statistic.failure();
-        }
-        progressBar.step();
-    }
-
-    private static ProgressBarBuilder pbBuilder() {
-        return new ProgressBarBuilder()
-                .setStyle(ProgressBarStyle.ASCII)
-                .setUpdateIntervalMillis(250)
-                .setMaxRenderedLength(75);
-    }
-}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java

@@ -1,15 +1,21 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger;
 
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ConfigLoader;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.CachedMkvFileProcessor;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.kernel.AttributeUpdaterKernel;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.kernel.CoherentAttributeUpdaterKernel;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.kernel.DefaultAttributeUpdaterKernel;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.MkvFileCollector;
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.MkvFileProcessor;
+import lombok.extern.slf4j.Slf4j;
-import lombok.extern.log4j.Log4j2;
 
-@Log4j2
+@Slf4j
 public class Main {
     public static void main(String[] args) {
-        Config.getInstance().initConfig(args);
+        ConfigLoader.initConfig(args);
-        AttributeUpdaterKernel kernel = new AttributeUpdaterKernel(new MkvFileCollector(), new MkvFileProcessor());
+        AttributeUpdaterKernel kernel = Config.getInstance().getCoherent() != null
+                ? new CoherentAttributeUpdaterKernel(new MkvFileCollector(), new CachedMkvFileProcessor())
+                : new DefaultAttributeUpdaterKernel(new MkvFileCollector(), new CachedMkvFileProcessor());
         kernel.execute();
     }
 }

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java

@@ -2,223 +2,98 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
 
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix;
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.VersionUtil;
-import at.pcgamingfreaks.yaml.YAML;
-import at.pcgamingfreaks.yaml.YamlInvalidContentException;
 import lombok.AccessLevel;
 import lombok.Getter;
-import lombok.SneakyThrows;
+import lombok.NoArgsConstructor;
-import lombok.extern.log4j.Log4j2;
+import lombok.Setter;
-import org.apache.commons.cli.*;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.HelpFormatter;
 
 import java.io.File;
-import java.io.IOException;
+import java.util.*;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Function;
 import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-import java.util.stream.Collectors;
 
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*;
+@Slf4j
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.LanguageValidatorUtil.isLanguageValid;
-
-@Log4j2
 @Getter
+@Setter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class Config {
+    @Getter(AccessLevel.NONE)
+    @Setter(AccessLevel.NONE)
+    private static Config config = null;
     @Getter(AccessLevel.NONE)
     CommandLineParser parser = new DefaultParser();
     @Getter(AccessLevel.NONE)
     HelpFormatter formatter = new HelpFormatter();
-
-    @Getter(AccessLevel.NONE)
-    private static Config config = null;
-
     private File configPath;
-    private String libraryPath;
+    private File libraryPath;
-    private boolean isSafeMode;
-
-    private int threadCount;
-    private Pattern includePattern;
     @Getter(AccessLevel.NONE)
-    private String mkvToolNixPath;
+    private File mkvToolNix;
 
-    private boolean isWindows;
+    private int threads;
+    private Pattern includePattern;
+    private boolean safeMode;
 
-    private final Set<String> forcedKeywords = new HashSet<>(Arrays.asList("forced", "signs"));
+    private Integer coherent;
-    private final Set<String> commentaryKeywords = new HashSet<>(Arrays.asList("commentary", "director"));
+    private boolean forceCoherent;
-    private final Set<String> excludedDirectories = new HashSet<>();
+    private boolean onlyNewFiles;
+    private Date filterDate;
+
+    private Set<String> forcedKeywords = new HashSet<>(Arrays.asList("forced", "signs", "songs"));
+    private Set<String> commentaryKeywords = new HashSet<>(Arrays.asList("commentary", "director"));
+    private Set<String> excludedDirectories = new HashSet<>();
+    private Set<String> preferredSubtitles = new HashSet<>(Arrays.asList("unstyled"));
 
     private List<AttributeConfig> attributeConfig;
 
     public static Config getInstance() {
-        if (config == null) {
+        return getInstance(false);
+    }
+
+    public static Config getInstance(boolean reset) {
+        if (config == null || reset) {
             config = new Config();
         }
         return config;
     }
 
-    public void initConfig(String[] args) throws InvalidConfigException {
+    /**
-        ConfigErrors errors = new ConfigErrors();
+     * Get path to specific mkvtoolnix application.
-        CommandLine cmd = null;
+     *
-        Options options = initOptions();
+     * @return absolute path to desired application.
-
+     */
-        try {
+    public String getPathFor(MkvToolNix application) {
-            cmd = parser.parse(options, args);
+        return mkvToolNix.getAbsolutePath().endsWith("/") ? mkvToolNix.getAbsolutePath() + application :
-            if (cmd == null) throw new NullPointerException();
+                    mkvToolNix.getAbsolutePath() + "/" + application;
-        } catch (ParseException | NullPointerException e) {
-            formatter.printHelp(106, "java -jar MKVAudioSubtitlesChanger.jar -l <path_to_library>",
-                    "\nParameters:", options,
-                    "\nFeature requests and bug reports: https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/issues");
-            System.exit(1);
     }
 
-        exitIfHelp(cmd, options);
+    public String getNormalizedLibraryPath() {
-        exitIfVersion(cmd);
+        return this.getLibraryPath().getAbsolutePath().replace("\\", "/");
+    }
 
-        configPath = loadConfigPath(cmd, errors);
+    @Override
-        libraryPath = loadLibraryPath(cmd, errors);
+    public String toString() {
-        isSafeMode = cmd.hasOption(SAFE_MODE.prop());
+        return new StringJoiner(", ", Config.class.getSimpleName() + "[", "]")
-
+                .add("parser=" + parser)
-        try (YAML config = new YAML(configPath)) {
+                .add("formatter=" + formatter)
-            threadCount = loadThreadCount(cmd, config);
+                .add("configPath=" + configPath)
-            includePattern = loadIncludePattern(cmd, config, errors);
+                .add("libraryPath=" + libraryPath)
-            mkvToolNixPath = loadMkvToolNixPath(cmd, config, errors);
+                .add("mkvToolNix=" + mkvToolNix)
-
+                .add("threads=" + threads)
-            isWindows = loadOperatingSystem();
+                .add("includePattern=" + includePattern)
-
+                .add("safeMode=" + safeMode)
-            loadForcedKeywords(cmd, config);
+                .add("coherent=" + coherent)
-            loadExcludedDirectories(cmd, config);
+                .add("forceCoherent=" + forceCoherent)
-
+                .add("onlyNewFiles=" + onlyNewFiles)
-            attributeConfig = loadAttributeConfig(config, errors);
+                .add("filterDate=" + filterDate)
-        } catch (IOException | YamlInvalidContentException ignored) {}
+                .add("forcedKeywords=" + forcedKeywords)
-
+                .add("commentaryKeywords=" + commentaryKeywords)
-        if (errors.hasErrors()) {
+                .add("excludedDirectories=" + excludedDirectories)
-            throw new InvalidConfigException(errors);
+                .add("preferredSubtitles=" + preferredSubtitles)
-        }
+                .add("attributeConfig=" + attributeConfig)
-    }
+                .toString();
-
-    private static Options initOptions() {
-        Options options = new Options();
-        options.addOption(optionOf(HELP, "h", false));
-        options.addOption(optionOf(VERSION, "v", false));
-        options.addOption(optionOf(LIBRARY, "l", true));
-        options.addOption(optionOf(MKV_TOOL_NIX, "m", true));
-        options.addOption(optionOf(CONFIG_PATH, "c", true));
-        options.addOption(optionOf(THREADS, "t", true));
-        options.addOption(optionOf(SAFE_MODE, "s", false));
-        options.addOption(optionOf(FORCED_KEYWORDS, "k", Option.UNLIMITED_VALUES, false));
-        options.addOption(optionOf(EXCLUDE_DIRECTORY, "e", Option.UNLIMITED_VALUES, false));
-        options.addOption(optionOf(INCLUDE_PATTERN, "i", true));
-        return options;
-    }
-
-    private void exitIfHelp(CommandLine cmd, Options options) {
-        if (cmd.hasOption("help")) {
-            formatter.printHelp(106, "java -jar MKVAudioSubtitlesChanger.jar -l <path_to_library>",
-                    "\nParameters:", options,
-                    "\nFeature requests and bug reports: https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/issues");
-            System.exit(0);
-        }
-    }
-
-    private void exitIfVersion(CommandLine cmd) {
-        if (cmd.hasOption(VERSION.prop())) {
-            System.out.printf("MKV Audio Subtitle Changer Version %s%n", VersionUtil.getVersion());
-            System.exit(0);
-        }
-    }
-
-    private File loadConfigPath(CommandLine cmd, ConfigErrors errors) {
-        File configPath = new File(cmd.getOptionValue(CONFIG_PATH.prop(), "config.yaml"));
-        if (configPath.isFile()) return configPath;
-
-        errors.add("invalid config path");
-        return null;
-    }
-
-    private String loadLibraryPath(CommandLine cmd, ConfigErrors errors) {
-        if (cmd.hasOption(LIBRARY.prop())) {
-            File libraryPath = new File(cmd.getOptionValue(LIBRARY.prop()));
-            if (libraryPath.isFile() || libraryPath.isDirectory()) {
-                return libraryPath.getAbsolutePath();
-            } else {
-                errors.add("invalid library path");
-            }
-        } else {
-            errors.add("missing library path");
-        }
-        return null;
-    }
-
-    private int loadThreadCount(CommandLine cmd, YAML config) {
-        return cmd.hasOption(THREADS.prop())
-                ? Integer.parseInt(cmd.getOptionValue(THREADS.prop()))
-                : config.getInt(THREADS.prop(), 2);
-    }
-
-    private Pattern loadIncludePattern(CommandLine cmd, YAML config, ConfigErrors errors) {
-        try {
-            return Pattern.compile(cmd.hasOption(INCLUDE_PATTERN.prop())
-                    ? cmd.getOptionValue(INCLUDE_PATTERN.prop())
-                    : config.getString(INCLUDE_PATTERN.prop(), ".*"));
-        } catch (PatternSyntaxException e) {
-            errors.add("invalid regex pattern");
-        }
-        return null;
-    }
-
-    @SneakyThrows
-    private String loadMkvToolNixPath(CommandLine cmd, YAML config, ConfigErrors errors){
-        if (cmd.hasOption(MKV_TOOL_NIX.prop())) return cmd.getOptionValue(MKV_TOOL_NIX.prop());
-        if (config.isSet(MKV_TOOL_NIX.prop())) return config.getString(MKV_TOOL_NIX.prop());
-        errors.add("path to mkv tool nix installation missing");
-        return null;
-    }
-
-    private boolean loadOperatingSystem() {
-        return System.getProperty("os.name").toLowerCase().contains("windows");
-    }
-
-    @SneakyThrows
-    private void loadForcedKeywords(CommandLine cmd, YAML config) {
-        if (cmd.hasOption(FORCED_KEYWORDS.prop())) forcedKeywords.addAll(List.of(cmd.getOptionValues(FORCED_KEYWORDS.prop())));
-        if (config.isSet(FORCED_KEYWORDS.prop())) forcedKeywords.addAll(config.getStringList(FORCED_KEYWORDS.prop()));
-    }
-
-    @SneakyThrows
-    private void loadExcludedDirectories(CommandLine cmd, YAML config) {
-        if (cmd.hasOption(EXCLUDE_DIRECTORY.prop())) excludedDirectories.addAll(List.of(cmd.getOptionValues(EXCLUDE_DIRECTORY.prop())));
-        if (config.isSet(EXCLUDE_DIRECTORY.prop())) excludedDirectories.addAll(config.getStringList(EXCLUDE_DIRECTORY.prop()));
-    }
-
-    private List<AttributeConfig> loadAttributeConfig(YAML config, ConfigErrors errors) {
-        Function<String, String> audio = key -> config.getString(key + ".audio", null);
-        Function<String, String> subtitle = key -> config.getString(key + ".subtitle", null);
-
-        List<AttributeConfig> attributeConfigs = config.getKeysFiltered(".*audio.*").stream()
-                .sorted()
-                .map(key -> key.replace(".audio", ""))
-                .map(key -> new AttributeConfig(audio.apply(key), subtitle.apply(key)))
-                .collect(Collectors.toList());
-
-        if (attributeConfigs.isEmpty()) {
-            errors.add("no language configuration");
-        } else {
-            for (AttributeConfig attributeConfig : attributeConfigs) {
-                isLanguageValid(attributeConfig.getAudioLanguage(), errors);
-                isLanguageValid(attributeConfig.getSubtitleLanguage(), errors);
-            }
-        }
-
-        return attributeConfigs;
-    }
-
-    public String getPathFor(MkvToolNix exe) {
-        return mkvToolNixPath.endsWith("/") ? mkvToolNixPath + exe : mkvToolNixPath + "/" + exe;
     }
 }
 

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigErrors.java

@@ -1,22 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
-
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ConfigErrors {
-    private final List<String> errors = new ArrayList<>();
-
-    public void add(String errorMessage) {
-        errors.add(errorMessage);
-    }
-
-    public boolean hasErrors() {
-        return !errors.isEmpty();
-    }
-
-    public String toString() {
-        return StringUtils.capitalize(String.join(", ", errors));
-    }
-}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigLoader.java

@@ -0,0 +1,110 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator.*;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.ProjectUtil;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.*;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+
+public class ConfigLoader {
+    private static final List<ConfigValidator<?>> VALIDATORS = Stream.of(
+            new ConfigPathValidator(CONFIG_PATH, false),
+            new PathValidator(LIBRARY, true, null),
+            new ThreadValidator(THREADS, false, 2),
+            new MkvToolNixPathValidator(MKV_TOOL_NIX, true, Path.of("C:\\Program Files\\MKVToolNix").toFile()),
+            new BooleanValidator(SAFE_MODE, false),
+            new BooleanValidator(ONLY_NEW_FILES, false),
+            new DateValidator(FILTER_DATE, false),
+            new PatternValidator(INCLUDE_PATTERN, false, Pattern.compile(".*")),
+            new SetValidator(FORCED_KEYWORDS, false, true),
+            new SetValidator(COMMENTARY_KEYWORDS, false, true),
+            new SetValidator(EXCLUDED_DIRECTORY, false, true),
+            new SetValidator(PREFERRED_SUBTITLES, false, true),
+            new AttributeConfigValidator(),
+            new CoherentConfigValidator(COHERENT, false),
+            new BooleanValidator(FORCE_COHERENT, false)
+    ).sorted(Comparator.comparing((ConfigValidator<?> validator) -> validator.getWeight()).reversed()).collect(Collectors.toList());
+
+    public static void initConfig(String[] args) {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.setOptionComparator(null);
+        YAML yamlConfig = null;
+
+        Options options = initOptions();
+        CommandLine cmd = parseCommandLineArgs(formatter, options, args);
+
+        exitIfHelp(cmd, options, formatter);
+        exitIfVersion(cmd);
+
+        List<ValidationResult> results = new ArrayList<>();
+
+        for (ConfigValidator<?> validator: VALIDATORS) {
+            results.add(validator.validate(yamlConfig, cmd));
+            if (yamlConfig == null) {
+                try {
+                    yamlConfig = Config.getInstance().getConfigPath() != null
+                            ? new YAML(Config.getInstance().getConfigPath())
+                            : new YAML("");
+                } catch (IOException | YamlInvalidContentException ignored) {}
+            }
+        }
+
+        if (results.contains(ValidationResult.INVALID) || results.contains(ValidationResult.MISSING)) System.exit(1);
+        System.out.println();
+    }
+
+    private static Options initOptions() {
+        Options options = new Options();
+        Arrays.stream(ConfigProperty.values())
+                .filter(prop -> prop.abrv() != null)
+                .map(prop -> optionOf(prop, prop.abrv(), prop.args()))
+                .forEach(options::addOption);
+        return options;
+    }
+
+    private static CommandLine parseCommandLineArgs(HelpFormatter formatter, Options options, String[] args) {
+        CommandLineParser parser = new DefaultParser();
+
+        try {
+            CommandLine cmd = parser.parse(options, args);
+            if (cmd == null) throw new NullPointerException();
+            return cmd;
+        } catch (ParseException | NullPointerException e) {
+            formatter.printHelp(130, "java -jar MKVAudioSubtitlesChanger.jar -l <path_to_library>",
+                    "\nParameters:", options,
+                    "\nFeature requests and bug reports: https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/issues");
+            System.exit(1);
+        }
+        return null; // can't be reached
+    }
+
+    private static void exitIfHelp(CommandLine cmd, Options options, HelpFormatter formatter) {
+        if (cmd.hasOption("help")) {
+            formatter.printHelp(130, "java -jar MKVAudioSubtitlesChanger.jar -l <path_to_library>",
+                    "\nParameters:", options,
+                    "\nFeature requests and bug reports: https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/issues");
+            System.exit(0);
+        }
+    }
+
+    private static void exitIfVersion(CommandLine cmd) {
+        if (cmd.hasOption(VERSION.prop())) {
+            System.out.printf("MKV Audio Subtitle Changer Version %s%n", ProjectUtil.getVersion());
+            System.exit(0);
+        }
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/InvalidConfigException.java

@@ -1,7 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
-
-public class InvalidConfigException extends RuntimeException{
-    public InvalidConfigException(ConfigErrors errors) {
-        super("Errors in config: " + errors);
-    }
-}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ValidationResult.java

@@ -0,0 +1,9 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
+
+public enum ValidationResult {
+    VALID,
+    DEFAULT,
+    NOT_PRESENT,
+    MISSING,
+    INVALID;
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/AttributeConfigValidator.java

@@ -0,0 +1,88 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import org.apache.commons.cli.CommandLine;
+
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.LanguageValidatorUtil.isAudioLanguageValid;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.LanguageValidatorUtil.isLanguageValid;
+
+public class AttributeConfigValidator extends ConfigValidator<List<AttributeConfig>> {
+    private static final String SEPARATOR = ":";
+
+    public AttributeConfigValidator() {
+        super(ConfigProperty.ATTRIBUTE_CONFIG, true, null);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public ValidationResult validate(YAML yaml, CommandLine cmd) {
+        System.out.printf("%s: ", property.prop());
+        List<AttributeConfig> result;
+
+
+        if (cmd.hasOption(property.prop())) {
+            List<String> values = List.of(cmd.getOptionValues(property.prop()));
+            result = values.stream().anyMatch(pair -> !pair.contains(SEPARATOR))
+                    ? List.of()
+                    : values.stream().map(pair -> pair.split(SEPARATOR))
+                    .map(split -> new AttributeConfig(split[0], split[1]))
+                    .collect(Collectors.toList());
+        } else if(yaml.getKeysFiltered(property.prop() + ".*").size() > 0) {
+            Function<String, String> audio = key -> yaml.getString(key + ".audio", null);
+            Function<String, String> subtitle = key -> yaml.getString(key + ".subtitle", null);
+
+            result = yaml.getKeysFiltered(".*audio.*").stream()
+                    .sorted()
+                    .map(key -> key.replace(".audio", ""))
+                    .map(key -> new AttributeConfig(audio.apply(key), subtitle.apply(key)))
+                    .collect(Collectors.toList());
+        } else if (required) {
+            System.out.println("missing");
+            return ValidationResult.MISSING;
+        } else {
+            System.out.println("ok");
+            return ValidationResult.NOT_PRESENT;
+        }
+
+        if (!isValid(result) || !setValue(result)) {
+            System.out.println("invalid");
+            return ValidationResult.INVALID;
+        }
+
+        System.out.println("ok");
+        return ValidationResult.VALID;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    List<AttributeConfig> parse(String value) {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    boolean isValid(List<AttributeConfig> result) {
+        if (result.isEmpty()) {
+            return false;
+        }
+        boolean isValid;
+        for (AttributeConfig attributeConfig : result) {
+            isValid = isAudioLanguageValid(attributeConfig.getAudioLanguage())
+                            && isLanguageValid(attributeConfig.getSubtitleLanguage());
+            if (!isValid) return false;
+        }
+        return true;
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/BooleanValidator.java

@@ -0,0 +1,63 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlKeyNotFoundException;
+import org.apache.commons.cli.CommandLine;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiFunction;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.ARGUMENTS;
+
+public class BooleanValidator extends ConfigValidator<Boolean> {
+
+    public BooleanValidator(ConfigProperty property, boolean required) {
+        super(property, required, null);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected BiFunction<YAML, ConfigProperty, Optional<Boolean>> provideDataYaml() {
+        return (yaml, property) -> {
+            if (yaml.isSet(ARGUMENTS.prop())
+                    && yaml.getStringList(ARGUMENTS.prop(), List.of()).contains(property.prop())) {
+                return Optional.of(true);
+            }
+            return Optional.empty();
+        };
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected BiFunction<CommandLine, ConfigProperty, Optional<Boolean>> provideDataCmd() {
+        return (cmd, property) -> {
+            if (cmd.hasOption(property.prop())) {
+                return  Optional.of(true);
+            }
+            return Optional.empty();
+        };
+    }
+
+    /**
+     * {@inheritDoc}
+     * This should not be used.
+     */
+    @Override
+    Boolean parse(String value) {
+        throw new RuntimeException("This should not be called");
+    }
+
+    /**
+     * {@inheritDoc}
+     * Validation is skipped.
+     */
+    @Override
+    boolean isValid(Boolean result) {
+        return true; // skip
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/CoherentConfigValidator.java

@@ -0,0 +1,22 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import org.apache.commons.lang3.math.NumberUtils;
+
+public class CoherentConfigValidator extends ConfigValidator<Integer> {
+    private static final Integer DISABLED = -1;
+
+    public CoherentConfigValidator(ConfigProperty property, boolean required) {
+        super(property, required, null);
+    }
+
+    @Override
+    Integer parse(String value) {
+        return NumberUtils.isParsable(value) ? Integer.parseInt(value) : DISABLED;
+    }
+
+    @Override
+    boolean isValid(Integer result) {
+        return result >= 0;
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/ConfigPathValidator.java

@@ -0,0 +1,35 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+
+import java.io.File;
+import java.util.Optional;
+import java.util.function.BiFunction;
+
+public class ConfigPathValidator extends PathValidator {
+    public ConfigPathValidator(ConfigProperty property, boolean required) {
+        super(property, required, null);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected BiFunction<YAML, ConfigProperty, Optional<File>> provideDataYaml() {
+        return (yaml, property) -> Optional.empty();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isValid(File result) {
+        return super.isValid(result) && (result.getAbsolutePath().endsWith(".yml") || result.getAbsolutePath().endsWith(".yaml"));
+    }
+
+    @Override
+    public int getWeight() {
+        return 100;
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/ConfigValidator.java

@@ -0,0 +1,176 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlKeyNotFoundException;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.lang3.StringUtils;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Optional;
+import java.util.StringJoiner;
+import java.util.function.BiFunction;
+import java.util.function.Predicate;
+
+@Slf4j
+@RequiredArgsConstructor
+public abstract class ConfigValidator<FieldType> {
+    protected final ConfigProperty property;
+    protected final boolean required;
+    protected final FieldType defaultValue;
+
+    /**
+     * Validate the user input. Parameters of cmd are prioritised.
+     *
+     * @param yaml config file
+     * @param cmd  command line parameters
+     * @return {@link ValidationResult} containing validity of input.
+     */
+    public ValidationResult validate(YAML yaml, CommandLine cmd) {
+        System.out.printf("%s: ", property.prop());
+        FieldType result;
+
+        Optional<FieldType> cmdResult = provideDataCmd().apply(cmd, property);
+        Optional<FieldType> yamlResult = provideDataYaml().apply(yaml, property);
+
+        if (isOverwritingNecessary()) {
+            result = overwriteValue();
+        } else if (cmdResult.isPresent()) {
+            result = cmdResult.get();
+        } else if (yamlResult.isPresent()) {
+            result = yamlResult.get();
+        } else {
+            if (defaultValue != null) {
+                if (setValue(defaultValue)) {
+                    System.out.println("default");
+                    return ValidationResult.DEFAULT;
+                } else {
+                    System.out.println("invalid");
+                    return ValidationResult.INVALID;
+                }
+            }
+            if (required) {
+                System.out.println("missing");
+                return ValidationResult.MISSING;
+            } else {
+                System.out.println("ok");
+                return ValidationResult.NOT_PRESENT;
+            }
+        }
+
+        if (!isValid(result) || !setValue(result)) {
+            System.out.println("invalid");
+            return ValidationResult.INVALID;
+        }
+
+        System.out.println("ok");
+        return ValidationResult.VALID;
+    }
+
+    /**
+     * @return parsed input of yaml config for property
+     */
+    protected BiFunction<YAML, ConfigProperty, Optional<FieldType>> provideDataYaml() {
+        return (yaml, property) -> {
+            if (yaml.isSet(property.prop())) {
+                try {
+                    return Optional.of(parse(yaml.getString(property.prop())));
+                } catch (YamlKeyNotFoundException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+            return Optional.empty();
+        };
+    }
+
+    /**
+     * @return parsed input of command line parameters config for property
+     */
+    protected BiFunction<CommandLine, ConfigProperty, Optional<FieldType>> provideDataCmd() {
+        return (cmd, property) -> {
+            if (cmd.hasOption(property.prop())) {
+                return Optional.of(parse(cmd.getOptionValue(property.prop())));
+            }
+            return Optional.empty();
+        };
+    }
+
+    /**
+     * @return true if overwriting this property is necessary.
+     */
+    protected boolean isOverwritingNecessary() {
+        return false;
+    }
+
+    /**
+     * @return {@link FieldType} to overwrite result with.
+     */
+    protected FieldType overwriteValue() {
+        return null;
+    }
+
+    /**
+     * Parse input parameter to desired format.
+     *
+     * @param value input parameter
+     * @return parsed property
+     */
+    abstract FieldType parse(String value);
+
+    /**
+     * Validate if the data has the desired and allowed format.
+     *
+     * @param result parsed property
+     * @return true if data is in desired format.
+     */
+    abstract boolean isValid(FieldType result);
+
+    /**
+     * Sets valid properties to {@link Config} via reflections.
+     *
+     * @param result parsed property
+     * @return false if method invocation failed
+     */
+    protected boolean setValue(FieldType result) {
+        for (Method method : Config.getInstance().getClass().getDeclaredMethods()) {
+            if (containsSetterOf(property).test(method)) {
+                try {
+                    method.invoke(Config.getInstance(), result);
+                    return true;
+                } catch (IllegalAccessException | InvocationTargetException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+
+        return false;
+    }
+
+    protected Predicate<Method> containsSetterOf(ConfigProperty property) {
+        return method -> StringUtils.startsWith(method.getName(), "set")
+                && StringUtils.equalsIgnoreCase(method.getName().replace("set", ""), property.prop().replace("-", ""));
+    }
+
+    protected Predicate<Method> containsGetterOf(ConfigProperty property) {
+        return method -> StringUtils.startsWith(method.getName(), "get")
+                && StringUtils.equalsIgnoreCase(method.getName().replace("get", ""), property.prop().replace("-", ""));
+    }
+
+    public int getWeight() {
+        return 50;
+    }
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", ConfigValidator.class.getSimpleName() + "[", "]")
+                .add("property=" + property)
+                .add("required=" + required)
+                .add("defaultValue=" + defaultValue)
+                .toString();
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/DateValidator.java

@@ -0,0 +1,61 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.DateUtils;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.ProjectUtil;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import lombok.extern.slf4j.Slf4j;
+import net.harawata.appdirs.AppDirsFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Date;
+
+@Slf4j
+public class DateValidator extends ConfigValidator<Date> {
+    private static final Date INVALID_DATE = new Date(0);
+    private static final Date DEFAULT_DATE = new Date(1000);
+
+    public DateValidator(ConfigProperty property, boolean required) {
+        super(property, required, null);
+    }
+
+    @Override
+    protected boolean isOverwritingNecessary() {
+        return Config.getInstance().isOnlyNewFiles();
+    }
+
+    @Override
+    protected Date overwriteValue() {
+        try {
+            String filePath = AppDirsFactory.getInstance().getUserConfigDir(ProjectUtil.getProjectName(), null, null);
+            File lastExecutionFile = Path.of(filePath + "/last-execution.yml").toFile();
+            if (!lastExecutionFile.exists()) {
+                return DEFAULT_DATE;
+            }
+            YAML yaml = new YAML(lastExecutionFile);
+            return parse(yaml.getString(Config.getInstance().getNormalizedLibraryPath(), DateUtils.convert(DEFAULT_DATE)));
+        } catch (YamlInvalidContentException | IOException e) {
+            log.error("Couldn't open last-execution.properties");
+            return INVALID_DATE;
+        }
+    }
+
+    @Override
+    Date parse(String value) {
+        return DateUtils.convert(value, INVALID_DATE);
+    }
+
+    @Override
+    boolean isValid(Date result) {
+        return !result.equals(INVALID_DATE);
+    }
+
+    @Override
+    public int getWeight() {
+        return 40;
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/MkvToolNixPathValidator.java

@@ -0,0 +1,26 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+
+import java.io.File;
+import java.nio.file.Path;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix.MKV_MERGER;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix.MKV_PROP_EDIT;
+
+public class MkvToolNixPathValidator extends PathValidator {
+    private static final String EXE = ".exe";
+
+    public MkvToolNixPathValidator(ConfigProperty property, boolean required, File defaultValue) {
+        super(property, required, defaultValue);
+    }
+
+    @Override
+    protected boolean isValid(File result) {
+        return result.isDirectory()
+                && (Path.of(result.getAbsolutePath() + "/" + MKV_MERGER + EXE).toFile().isFile()
+                && Path.of(result.getAbsolutePath() + "/" + MKV_PROP_EDIT + EXE).toFile().isFile())
+                || (Path.of(result.getAbsolutePath() + "/" + MKV_MERGER).toFile().isFile()
+                && Path.of(result.getAbsolutePath() + "/" + MKV_PROP_EDIT).toFile().isFile());
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/PathValidator.java

@@ -0,0 +1,30 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+
+import java.io.File;
+import java.nio.file.Path;
+
+public class PathValidator extends ConfigValidator<File> {
+
+    public PathValidator(ConfigProperty property, boolean required, File defaultValue) {
+        super(property, required, defaultValue);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected File parse(String value) {
+        return Path.of(value).toFile();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isValid(File result) {
+        return result.isDirectory() || result.isFile();
+    }
+
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/PatternValidator.java

@@ -0,0 +1,34 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+public class PatternValidator extends ConfigValidator<Pattern> {
+    private static final Pattern EMPTY_PATTERN = Pattern.compile("");
+
+    public PatternValidator(ConfigProperty property, boolean required, Pattern defaultValue) {
+        super(property, required, defaultValue);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    Pattern parse(String value) {
+        try {
+            return Pattern.compile(value);
+        } catch (PatternSyntaxException e) {
+            return EMPTY_PATTERN;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    boolean isValid(Pattern result) {
+        return !result.equals(EMPTY_PATTERN);
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/SetValidator.java

@@ -0,0 +1,111 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlKeyNotFoundException;
+import org.apache.commons.cli.CommandLine;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.function.BiFunction;
+import java.util.stream.Collectors;
+
+public class SetValidator extends ConfigValidator<Set<String>> {
+    private final boolean append;
+
+    public SetValidator(ConfigProperty property, boolean required, boolean append) {
+        super(property, required, null);
+        this.append = append;
+    }
+
+    public ValidationResult validate(YAML yaml, CommandLine cmd) {
+        System.out.printf("%s: ", property.prop());
+        List<String> resultList = null;
+
+        if (cmd.hasOption(property.prop())) {
+            resultList = List.of(cmd.getOptionValues(property.prop()));
+        } else if (yaml.isSet(property.prop())) {
+            try {
+                resultList = yaml.getStringList(property.prop());
+            } catch (YamlKeyNotFoundException ignored) {}
+        } else if (required) {
+            System.out.println("missing");
+            return ValidationResult.MISSING;
+        } else {
+            System.out.println("ok");
+            return ValidationResult.NOT_PRESENT;
+        }
+
+        Set<String> result = parse(resultList);
+
+        if (!isValid(result) || !setValue(result)) {
+            System.out.println("invalid");
+            return ValidationResult.INVALID;
+        }
+
+        System.out.println("ok");
+        return ValidationResult.VALID;
+    }
+
+    protected BiFunction<YAML, ConfigProperty, Optional<Set<String>>> provideDataYaml() {
+        return (yaml, property) -> {
+            if (yaml.isSet(property.prop())) {
+                try {
+                    return Optional.of(parse(yaml.getStringList(property.prop())));
+                } catch (YamlKeyNotFoundException ignored) {
+                }
+            }
+            return Optional.empty();
+        };
+    }
+
+    protected BiFunction<CommandLine, ConfigProperty, Optional<Set<String>>> provideDataCmd() {
+        return (cmd, property) -> {
+            if (cmd.hasOption(property.prop())) {
+                return Optional.of(parse(List.of(cmd.getOptionValues(property.prop()))));
+            }
+            return Optional.empty();
+        };
+    }
+
+    @Override
+    Set<String> parse(String value) {
+        throw new RuntimeException("This should not be called");
+    }
+
+    protected Set<String> parse(List<String> value) {
+        return new HashSet<>(value);
+    }
+
+    @Override
+    boolean isValid(Set<String> result) {
+        return true;
+    }
+
+    @SuppressWarnings("unchecked")
+    protected boolean setValue(Set<String> result) {
+        List<Method> methods = append
+                ? Arrays.stream(Config.getInstance().getClass().getDeclaredMethods())
+                    .filter(containsGetterOf(property))
+                    .collect(Collectors.toList())
+                : Arrays.stream(Config.getInstance().getClass().getDeclaredMethods())
+                    .filter(containsSetterOf(property))
+                    .collect(Collectors.toList());
+        if (methods.size() != 1) {
+            return false;
+        }
+        try {
+            if (append) {
+                ((Set<String>) methods.get(0).invoke(Config.getInstance())).addAll(result);
+            } else {
+                methods.get(0).invoke(Config.getInstance(), result);
+            }
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            throw new RuntimeException(e);
+        }
+        return true;
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/ThreadValidator.java

@@ -0,0 +1,26 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import org.apache.commons.lang3.math.NumberUtils;
+
+public class ThreadValidator extends ConfigValidator<Integer>{
+    public ThreadValidator(ConfigProperty property, boolean required, Integer defaultValue) {
+        super(property, required, defaultValue);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    Integer parse(String value) {
+        return NumberUtils.isParsable(value) ? Integer.parseInt(value) : defaultValue;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    boolean isValid(Integer result) {
+        return result > 0;
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/exceptions/MkvToolNixException.java

@@ -0,0 +1,13 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.exceptions;
+
+public class MkvToolNixException extends RuntimeException{
+
+    public MkvToolNixException(String message) {
+        super(message);
+    }
+
+    @Override
+    public String getMessage() {
+        return super.getMessage().replaceAll("\\r|\\n", " ");
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/Cache.java

@@ -0,0 +1,19 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+
+public class Cache<Key, Value> {
+    private final Map<Key, Value> cache = new HashMap<>();
+
+    /**
+     * Retrieve {@link Value} from Cache or run creationFunction and return its value.
+     * @param key key of cache map
+     * @param creationFunction function to create missing values
+     * @return {@link  Value} from Cache, or if missing result from creationFunction.
+     */
+    public synchronized Value retrieve(Key key, Function<Key, Value> creationFunction) {
+        return cache.computeIfAbsent(key, creationFunction::apply);
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/CachedMkvFileProcessor.java

@@ -0,0 +1,15 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute;
+
+import java.io.File;
+import java.util.List;
+
+public class CachedMkvFileProcessor extends MkvFileProcessor {
+    Cache<File, List<FileAttribute>> cache = new Cache<>();
+
+    @Override
+    public List<FileAttribute> loadAttributes(File file) {
+        return cache.retrieve(file, super::loadAttributes);
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileCollector.java

@@ -10,4 +10,13 @@ public interface FileCollector {
      * @return list of all files within the directory
      */
     List<File> loadFiles(String path);
+
+    /**
+     * Load all directories from path, but only until depth is reached.
+     *
+     * @param path leads to a directory which will be loaded recursively until depth
+     * @param depth limit directory crawling
+     * @return list of directory until depth
+     */
+    List<File> loadDirectories(String path, int depth);
 }

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileFilter.java

@@ -1,13 +1,52 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl;
 
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ResultStatistic;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.DateUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Date;
 
+@Slf4j
 public class FileFilter {
     static boolean accept(File pathName, String[] fileExtensions) {
-        return StringUtils.endsWithAny(pathName.getAbsolutePath().toLowerCase(), fileExtensions)
+        if (hasProperFileExtension(pathName, fileExtensions)
-                && Config.getInstance().getIncludePattern().matcher(pathName.getName()).matches();
+                && hasMatchingPattern(pathName)
+                && isNewer(pathName)) {
+            return true;
+        }
+
+        ResultStatistic.getInstance().total();
+        ResultStatistic.getInstance().excluded();
+        return false;
+    }
+
+    private static boolean hasProperFileExtension(File pathName, String[] fileExtensions) {
+        return StringUtils.endsWithAny(pathName.getAbsolutePath().toLowerCase(), fileExtensions);
+    }
+
+    private static boolean hasMatchingPattern(File pathName) {
+        return Config.getInstance().getIncludePattern().matcher(pathName.getName()).matches();
+    }
+
+    private static boolean isNewer(File pathName) {
+        Config config = Config.getInstance();
+        if (config.getFilterDate() == null) return true;
+        try {
+            BasicFileAttributes attributes = Files.readAttributes(pathName.toPath(), BasicFileAttributes.class);
+            return isNewer(DateUtils.convert(attributes.creationTime().toMillis()));
+        } catch (IOException e) {
+            log.warn("File attributes could not be read.", e);
+        }
+        return true;
+    }
+
+    private static boolean isNewer(Date creationDate) {
+        return creationDate.toInstant().isAfter(Config.getInstance().getFilterDate().toInstant());
     }
 }

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/FileProcessor.java

@@ -1,5 +1,7 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl;
 
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.exceptions.MkvToolNixException;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfoDto;
 
@@ -10,12 +12,40 @@ import java.util.List;
 public interface FileProcessor {
 
     /**
+     * Load track information from file.
+     *
      * @param file Takes the file from which the attributes will be returned
      * @return list of all important attributes
      */
     List<FileAttribute> loadAttributes(File file);
 
-    FileInfoDto filterAttributes(List<FileAttribute> attributes);
+    /**
+     * Populate FileInfoDto with the currently set default tracks.
+     * @param info to be populated
+     * @param attributes Track information of FileInfoDto
+     * @param nonForcedTracks List of all not forced tracks
+     */
+    void detectDefaultTracks(FileInfoDto info, List<FileAttribute> attributes, List<FileAttribute> nonForcedTracks);
 
-    void update(File file, FileInfoDto fileInfo) throws IOException;
+    /**
+     * Populate FileInfoDto with the desired tracks, based on AttributeConfig.
+     * @param info to be populated
+     * @param nonForcedTracks List of all non-forced tracks
+     * @param nonCommentaryTracks  List of all non-commentary tracks
+     */
+    void detectDesiredTracks(FileInfoDto info, List<FileAttribute> nonForcedTracks, List<FileAttribute> nonCommentaryTracks,
+                             AttributeConfig... configs);
+
+    List<FileAttribute> retrieveNonForcedTracks(List<FileAttribute> attributes);
+
+    List<FileAttribute> retrieveNonCommentaryTracks(List<FileAttribute> attributes);
+
+    /**
+     * Update the file.
+     * @param file to be updated
+     * @param fileInfo information to update file
+     * @throws IOException when error occurs accessing file retrieving information
+     * @throws MkvToolNixException when error occurs while sending query to mkvpropedit
+     */
+    void update(File file, FileInfoDto fileInfo) throws IOException, MkvToolNixException;
 }

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileCollector.java

@@ -1,6 +1,6 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl;
 
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,10 +12,13 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-@Log4j2
+@Slf4j
 public class MkvFileCollector implements FileCollector {
     private static final String[] fileExtensions = new String[]{".mkv", ".mka", ".mks", ".mk3d"};
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public List<File> loadFiles(String path) {
         try (Stream<Path> paths = Files.walk(Paths.get(path))) {
@@ -28,4 +31,19 @@ public class MkvFileCollector implements FileCollector {
             return new ArrayList<>();
         }
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public List<File> loadDirectories(String path, int depth) {
+        try (Stream<Path> paths = Files.walk(Paths.get(path), depth)) {
+            return paths.map(Path::toFile)
+                    .filter(File::isDirectory)
+                    .collect(Collectors.toList());
+        } catch (IOException e) {
+            log.error("Couldn't find file or directory!", e);
+            return new ArrayList<>();
+        }
+    }
 }

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java

@@ -1,10 +1,11 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl;
 
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.exceptions.MkvToolNixException;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.*;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.SetUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.core.util.IOUtils;
 
@@ -14,20 +15,24 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.LaneType.AUDIO;
 import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.LaneType.SUBTITLES;
 import static java.lang.String.format;
 
-@Log4j2
+@Slf4j
 public class MkvFileProcessor implements FileProcessor {
     private final ObjectMapper mapper = new ObjectMapper();
-    private final String[] forcedKeywords = new String[]{"forced", "signs"};
+
+    private static final SubtitleTrackComparator subtitleTrackComparator =
+            new SubtitleTrackComparator(Config.getInstance().getPreferredSubtitles().toArray(new String[0]));
+
     private static final String DISABLE_DEFAULT_TRACK = "--edit track:%s --set flag-default=0 ";
     private static final String ENABLE_DEFAULT_TRACK = "--edit track:%s --set flag-default=1 ";
     private static final String ENABLE_FORCED_TRACK = "--edit track:%s --set flag-forced=1 ";
 
-
+    @SuppressWarnings("unchecked")
     @Override
     public List<FileAttribute> loadAttributes(File file) {
         Map<String, Object> jsonMap;
@@ -62,7 +67,7 @@ public class MkvFileProcessor implements FileProcessor {
                 }
             }
 
-            log.debug(fileAttributes);
+            log.debug(fileAttributes.toString());
         } catch (IOException e) {
             e.printStackTrace();
             log.error("File could not be found or loaded!");
@@ -70,27 +75,11 @@ public class MkvFileProcessor implements FileProcessor {
         return fileAttributes;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
-    public FileInfoDto filterAttributes(List<FileAttribute> attributes) {
+    public void detectDefaultTracks(FileInfoDto info, List<FileAttribute> attributes, List<FileAttribute> nonForcedTracks) {
-        FileInfoDto info = new FileInfoDto();
-        List<FileAttribute> nonForcedTracks = attributes.stream()
-                .filter(elem -> !StringUtils.containsAnyIgnoreCase(elem.getTrackName(),
-                        Config.getInstance().getForcedKeywords().toArray(new CharSequence[0])))
-                .filter(elem -> !elem.isForcedTrack())
-                .collect(Collectors.toList());
-        List<FileAttribute> nonCommentaryTracks = attributes.stream()
-                .filter(elem -> !StringUtils.containsAnyIgnoreCase(elem.getTrackName(),
-                        Config.getInstance().getCommentaryKeywords().toArray(new CharSequence[0])))
-                .collect(Collectors.toList());
-
-        detectDefaultTracks(info, attributes, nonForcedTracks);
-        detectDesiredTracks(info, nonForcedTracks, nonCommentaryTracks);
-        log.debug(info);
-
-        return info;
-    }
-
-    private void detectDefaultTracks(FileInfoDto info, List<FileAttribute> attributes, List<FileAttribute> nonForcedTracks) {
         Set<FileAttribute> detectedForcedSubtitleLanes = new HashSet<>();
         for (FileAttribute attribute : attributes) {
             if (attribute.isDefaultTrack() && AUDIO.equals(attribute.getType()))
@@ -108,29 +97,64 @@ public class MkvFileProcessor implements FileProcessor {
         );
     }
 
-    private void detectDesiredTracks(FileInfoDto info, List<FileAttribute> nonForcedTracks, List<FileAttribute> nonCommentaryTracks) {
+    /**
-        for (AttributeConfig config : Config.getInstance().getAttributeConfig()) {
+     * {@inheritDoc}
-            FileAttribute desiredAudio = null;
+     */
-            FileAttribute desiredSubtitle = null;
+    @Override
-            for (FileAttribute attribute : SetUtils.retainOf(nonForcedTracks, nonCommentaryTracks)) {
+    public void detectDesiredTracks(FileInfoDto info, List<FileAttribute> nonForcedTracks, List<FileAttribute> nonCommentaryTracks,
-                if (attribute.getLanguage().equals(config.getAudioLanguage())
+                                    AttributeConfig... configs) {
-                        && AUDIO.equals(attribute.getType())) desiredAudio = attribute;
+        Set<FileAttribute> tracks = SetUtils.retainOf(nonForcedTracks, nonCommentaryTracks);
-                if (attribute.getLanguage().equals(config.getSubtitleLanguage())
+        Set<FileAttribute> audioTracks = tracks.stream().filter(a -> AUDIO.equals(a.getType())).collect(Collectors.toSet());
-                        && SUBTITLES.equals(attribute.getType())) desiredSubtitle = attribute;
+        Set<FileAttribute> subtitleTracks = tracks.stream().filter(a -> SUBTITLES.equals(a.getType())).collect(Collectors.toSet());
-            }
+
-            if (desiredAudio != null && desiredSubtitle != null) {
+        for (AttributeConfig config : configs) {
-                info.setDesiredAudioLane(desiredAudio);
+            Optional<FileAttribute> desiredAudio = detectDesiredTrack(config.getAudioLanguage(), audioTracks).findFirst();
-                info.setDesiredSubtitleLane(desiredSubtitle);
+            Optional<FileAttribute> desiredSubtitle = detectDesiredSubtitleTrack(config.getSubtitleLanguage(), subtitleTracks).findFirst();
+
+            if (desiredAudio.isPresent() && ("OFF".equals(config.getSubtitleLanguage()) || desiredSubtitle.isPresent())) {
+                info.setMatchedConfig(config);
+                info.setDesiredAudioLane(desiredAudio.get());
+                info.setDesiredSubtitleLane(desiredSubtitle.orElse(null));
                 break;
             }
         }
     }
 
+    private Stream<FileAttribute> detectDesiredTrack(String language, Set<FileAttribute> tracks) {
+        return tracks.stream().filter(track -> language.equals(track.getLanguage()));
+    }
+
+    private Stream<FileAttribute> detectDesiredSubtitleTrack(String language, Set<FileAttribute> tracks) {
+        return detectDesiredTrack(language, tracks)
+                .sorted(subtitleTrackComparator.reversed());
+    }
+
     @Override
-    public void update(File file, FileInfoDto fileInfo) throws IOException {
+    public List<FileAttribute> retrieveNonForcedTracks(List<FileAttribute> attributes) {
+        return attributes.stream()
+                .filter(elem -> !StringUtils.containsAnyIgnoreCase(elem.getTrackName(),
+                        Config.getInstance().getForcedKeywords().toArray(new CharSequence[0])))
+                .filter(elem -> !elem.isForcedTrack())
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<FileAttribute> retrieveNonCommentaryTracks(List<FileAttribute> attributes) {
+        return attributes.stream()
+                .filter(elem -> !StringUtils.containsAnyIgnoreCase(elem.getTrackName(),
+                        Config.getInstance().getCommentaryKeywords().toArray(new CharSequence[0])))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void update(File file, FileInfoDto fileInfo) throws IOException, MkvToolNixException {
         StringBuilder sb = new StringBuilder();
         sb.append(format("\"%s\" ", Config.getInstance().getPathFor(MkvToolNix.MKV_PROP_EDIT)));
         sb.append(format("\"%s\" ", file.getAbsolutePath()));
+
         if (fileInfo.isAudioDifferent()) {
             if (fileInfo.getDefaultAudioLanes() != null && !fileInfo.getDefaultSubtitleLanes().isEmpty()) {
                 for (FileAttribute track: fileInfo.getDefaultAudioLanes()) {
@@ -139,21 +163,28 @@ public class MkvFileProcessor implements FileProcessor {
             }
             sb.append(format(ENABLE_DEFAULT_TRACK, fileInfo.getDesiredAudioLane().getId()));
         }
+
         if (fileInfo.isSubtitleDifferent()) {
             if (fileInfo.getDefaultSubtitleLanes() != null && !fileInfo.getDefaultSubtitleLanes().isEmpty()) {
                 for (FileAttribute track: fileInfo.getDefaultSubtitleLanes()) {
                     sb.append(format(DISABLE_DEFAULT_TRACK, track.getId()));
                 }
             }
+            if (fileInfo.getDesiredSubtitleLane() != null) {
                 sb.append(format(ENABLE_DEFAULT_TRACK, fileInfo.getDesiredSubtitleLane().getId()));
             }
+        }
+
         if (fileInfo.areForcedTracksDifferent()) {
             for (FileAttribute attribute : fileInfo.getDesiredForcedSubtitleLanes()) {
                 sb.append(format(ENABLE_FORCED_TRACK, attribute.getId()));
             }
         }
 
+        log.info(sb.toString());
         InputStream inputstream = Runtime.getRuntime().exec(sb.toString()).getInputStream();
-        log.debug(IOUtils.toString(new InputStreamReader(inputstream)));
+        String output = IOUtils.toString(new InputStreamReader(inputstream));
+        log.debug(output);
+        if (output.contains("Error")) throw new MkvToolNixException(output);
     }
 }

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/SubtitleTrackComparator.java

@@ -0,0 +1,34 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Comparator;
+
+@RequiredArgsConstructor
+public class SubtitleTrackComparator implements Comparator<FileAttribute> {
+    private final String[] preferredSubtitles;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int compare(FileAttribute track1, FileAttribute track2) {
+        int result = 0;
+
+        if (StringUtils.containsAnyIgnoreCase(track1.getTrackName(), preferredSubtitles)) {
+            result++;
+        }
+        if (StringUtils.containsAnyIgnoreCase(track2.getTrackName(), preferredSubtitles)) {
+            result--;
+        }
+
+        if (result == 0) {
+            if (track1.isDefaultTrack()) result++;
+            if (track2.isDefaultTrack()) result--;
+        }
+
+        return result;
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/kernel/AttributeUpdaterKernel.java

@@ -0,0 +1,173 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.kernel;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.exceptions.MkvToolNixException;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.FileCollector;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.FileProcessor;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfoDto;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ResultStatistic;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.DateUtils;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.ProjectUtil;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import me.tongfei.progressbar.ProgressBar;
+import me.tongfei.progressbar.ProgressBarBuilder;
+import me.tongfei.progressbar.ProgressBarStyle;
+import net.harawata.appdirs.AppDirsFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+@Slf4j
+@RequiredArgsConstructor
+public abstract class AttributeUpdaterKernel {
+
+    protected final FileCollector collector;
+    protected final FileProcessor processor;
+    protected final ResultStatistic statistic = ResultStatistic.getInstance();
+    private final ExecutorService executor = Executors.newFixedThreadPool(Config.getInstance().getThreads());
+
+    protected ProgressBarBuilder pbBuilder() {
+        return new ProgressBarBuilder()
+                .setStyle(ProgressBarStyle.ASCII)
+                .setUpdateIntervalMillis(250)
+                .setMaxRenderedLength(75);
+    }
+
+    @SneakyThrows
+    public void execute() {
+        statistic.startTimer();
+
+        try (ProgressBar progressBar = pbBuilder().build()) {
+            List<File> files = loadFiles(Config.getInstance().getLibraryPath().getAbsolutePath());
+            progressBar.maxHint(files.size());
+
+            files.forEach(file -> executor.submit(() -> {
+                process(file);
+                progressBar.step();
+            }));
+
+            executor.shutdown();
+            executor.awaitTermination(1, TimeUnit.DAYS);
+        }
+
+        endProcess();
+
+        statistic.stopTimer();
+        statistic.printResult();
+    }
+
+    protected List<File> loadExcludedFiles() {
+        List<File> excludedFiles = Config.getInstance().getExcludedDirectories().stream()
+                .map(collector::loadFiles)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toList());
+        statistic.increaseTotalBy(excludedFiles.size());
+        statistic.increaseExcludedBy(excludedFiles.size());
+        return excludedFiles;
+    }
+
+    /**
+     * Load files or directories to update.
+     * Remove excluded directories.
+     *
+     * @param path Path to library
+     * @return List of files to update.
+     */
+    abstract List<File> loadFiles(String path);
+
+    /**
+     * Start of the file updating process.
+     * This method is called by the executor and its contents are executed in parallel.
+     *
+     * @param file file or directory to update
+     */
+    void process(File file) {
+        FileInfoDto fileInfo = new FileInfoDto(file);
+        List<FileAttribute> attributes = processor.loadAttributes(file);
+
+        List<FileAttribute> nonForcedTracks = processor.retrieveNonForcedTracks(attributes);
+        List<FileAttribute> nonCommentaryTracks = processor.retrieveNonCommentaryTracks(attributes);
+
+        processor.detectDefaultTracks(fileInfo, attributes, nonForcedTracks);
+        processor.detectDesiredTracks(fileInfo, nonForcedTracks, nonCommentaryTracks,
+                Config.getInstance().getAttributeConfig().toArray(new AttributeConfig[]{}));
+
+        updateFile(fileInfo);
+    }
+
+    /**
+     * Persist file changes.
+     *
+     * @param fileInfoDto contains information about file and desired configuration.
+     */
+    protected void updateFile(FileInfoDto fileInfoDto) {
+        statistic.total();
+        switch (fileInfoDto.getStatus()) {
+            case CHANGE_NECESSARY:
+                statistic.shouldChange();
+                commitChange(fileInfoDto);
+                break;
+            case UNABLE_TO_APPLY:
+                statistic.noSuitableConfigFound();
+                break;
+            case ALREADY_SUITED:
+                statistic.alreadyFits();
+                break;
+            case UNKNOWN:
+            default:
+                statistic.failure();
+                break;
+        }
+    }
+
+    private void commitChange(FileInfoDto fileInfo) {
+        if (Config.getInstance().isSafeMode()) {
+            return;
+        }
+
+        try {
+            processor.update(fileInfo.getFile(), fileInfo);
+            statistic.success();
+            log.info("Updated {}", fileInfo.getFile().getAbsolutePath());
+        } catch (IOException | MkvToolNixException e) {
+            statistic.failedChanging();
+            log.warn("File couldn't be updated: '{}', Error: {}", fileInfo.getFile().getAbsoluteFile(), e.getMessage());
+        }
+    }
+
+    protected void endProcess() {
+        if (Config.getInstance().isSafeMode()) {
+            return;
+        }
+
+        try {
+            String filePath = AppDirsFactory.getInstance().getUserConfigDir(ProjectUtil.getProjectName(), null, null);
+
+            File configDir = Path.of(filePath).toFile();
+            if (!configDir.exists()) configDir.mkdirs();
+
+            File lastExecutionFile = Path.of(filePath + "/last-execution.yml").toFile();
+            if (!lastExecutionFile.exists()) lastExecutionFile.createNewFile();
+
+            YAML yaml = new YAML(lastExecutionFile);
+            yaml.set(Config.getInstance().getNormalizedLibraryPath(), DateUtils.convert(new Date()));
+            yaml.save(lastExecutionFile);
+        } catch (IOException | YamlInvalidContentException e) {
+            log.error("last-execution.yml could not be created or read.", e);
+        }
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/kernel/CoherentAttributeUpdaterKernel.java

@@ -0,0 +1,111 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.kernel;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.FileCollector;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.FileProcessor;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfoDto;
+import lombok.extern.slf4j.Slf4j;
+import me.tongfei.progressbar.ProgressBarBuilder;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+public class CoherentAttributeUpdaterKernel extends AttributeUpdaterKernel {
+
+    public CoherentAttributeUpdaterKernel(FileCollector collector, FileProcessor processor) {
+        super(collector, processor);
+    }
+
+    @Override
+    protected ProgressBarBuilder pbBuilder() {
+        return super.pbBuilder()
+                .setUnit(" directories", 1);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    List<File> loadFiles(String path) {
+        return loadFiles(path, Config.getInstance().getCoherent());
+    }
+
+    List<File> loadFiles(String path, int depth) {
+        List<File> excludedFiles = loadExcludedFiles();
+        List<File> directories = collector.loadDirectories(path, depth)
+                .stream().filter(file -> !excludedFiles.contains(file))
+                .collect(Collectors.toList());
+        return directories.stream()
+                .filter(dir -> isParentDirectory(dir, directories))
+                .collect(Collectors.toList());
+    }
+
+    private boolean isParentDirectory(File directory, List<File> directories) {
+        String path = directory.getAbsolutePath();
+        return directories.stream()
+                .noneMatch(dir -> dir.getAbsolutePath().contains(path) && !StringUtils.equals(path, dir.getAbsolutePath()));
+    }
+
+    /**
+     * Update files in directory, if possible, with the same {@link AttributeConfig}.
+     * If {@link Config#isForceCoherent()} then there will be no changes to the file if they don't match the same config.
+     * Otherwise, the default behaviour is executed.
+     * This method is called by the executor and is run in parallel.
+     *
+     * @param file directory containing files
+     */
+    @Override
+    void process(File file) {
+        process(file, Config.getInstance().getCoherent());
+    }
+
+    void process(File file, int depth) {
+        // TODO: Implement level crawl if coherence is not possible on user entered depth
+        // IMPL idea: recursive method call, cache needs to be implemented
+        List<FileInfoDto> fileInfos = collector.loadFiles(file.getAbsolutePath()).stream()
+                .map(FileInfoDto::new)
+                .collect(Collectors.toList());
+
+        for (AttributeConfig config : Config.getInstance().getAttributeConfig()) {
+
+            for (FileInfoDto fileInfo : fileInfos) {
+                List<FileAttribute> attributes = processor.loadAttributes(fileInfo.getFile());
+
+                List<FileAttribute> nonForcedTracks = processor.retrieveNonForcedTracks(attributes);
+                List<FileAttribute> nonCommentaryTracks = processor.retrieveNonCommentaryTracks(attributes);
+
+                processor.detectDefaultTracks(fileInfo, attributes, nonForcedTracks);
+                processor.detectDesiredTracks(fileInfo, nonForcedTracks, nonCommentaryTracks, config);
+            }
+
+            if (fileInfos.stream().allMatch(elem -> ("OFF".equals(config.getSubtitleLanguage()) || elem.getDesiredSubtitleLane() != null)
+                    && elem.getDesiredAudioLane() != null)) {
+                log.info("Found {}/{} match for {}", config.getAudioLanguage(), config.getSubtitleLanguage(), file.getAbsolutePath());
+                fileInfos.forEach(this::updateFile);
+                return; // match found, end process here
+            }
+
+            fileInfos.forEach(f -> {
+                f.setDesiredAudioLane(null);
+                f.setDesiredSubtitleLane(null);
+            });
+        }
+
+        log.info("No coherent match found for {}", file.getAbsoluteFile());
+
+        for (FileInfoDto fileInfo : fileInfos) {
+            if (!Config.getInstance().isForceCoherent()) {
+                super.process(fileInfo.getFile());
+            } else {
+                statistic.excluded();
+            }
+        }
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/kernel/DefaultAttributeUpdaterKernel.java

@@ -0,0 +1,36 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.kernel;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.FileCollector;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.FileProcessor;
+import lombok.extern.slf4j.Slf4j;
+import me.tongfei.progressbar.ProgressBarBuilder;
+
+import java.io.File;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+public class DefaultAttributeUpdaterKernel extends AttributeUpdaterKernel {
+
+    public DefaultAttributeUpdaterKernel(FileCollector collector, FileProcessor processor) {
+        super(collector, processor);
+    }
+
+    @Override
+    protected ProgressBarBuilder pbBuilder() {
+        return super.pbBuilder()
+                .setUnit(" files", 1);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    List<File> loadFiles(String path) {
+        List<File> excludedFiles = loadExcludedFiles();
+        return collector.loadFiles(Config.getInstance().getLibraryPath().getAbsolutePath()).stream()
+                .filter(file -> !excludedFiles.contains(file))
+                .collect(Collectors.toList());
+    }
+}

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

@@ -2,15 +2,30 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 
-@Log4j2
+import java.util.Objects;
+
+@Slf4j
 @Getter
 @AllArgsConstructor
 public class AttributeConfig {
     private final String audioLanguage;
     private final String subtitleLanguage;
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        AttributeConfig that = (AttributeConfig) o;
+        return Objects.equals(audioLanguage, that.audioLanguage) && Objects.equals(subtitleLanguage, that.subtitleLanguage);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(audioLanguage, subtitleLanguage);
+    }
+
     @Override
     public String toString() {
         return "AttributeConfig{"

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

@@ -1,28 +1,68 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
 
 import lombok.AllArgsConstructor;
+import org.apache.commons.cli.Option;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 @AllArgsConstructor
 public enum ConfigProperty {
-    CONFIG_PATH("config", "Path to config file"),
+    LIBRARY("library-path", "Path to library", "l", 1),
-    LIBRARY("library", "Path to library"),
+    ATTRIBUTE_CONFIG("attribute-config", "Attribute config to decide which tracks to choose when", "a", Option.UNLIMITED_VALUES),
-    SAFE_MODE("safe-mode", "Test run (no files will be changes)"),
+    CONFIG_PATH("config-path", "Path to config file", "p", 1),
-    THREADS("threads", "thread count (default: 2)"),
+    MKV_TOOL_NIX("mkvtoolnix", "Path to mkv tool nix installation", "m", 1),
-    INCLUDE_PATTERN("include-pattern", "Include files matching pattern"),
+    SAFE_MODE("safe-mode", "Test run (no files will be changes)", "s", 0),
-    MKV_TOOL_NIX("mkvtoolnix", "Path to mkv tool nix installation"),
+    COHERENT("coherent", "Try to match all files in dir of depth with the same config", "c", 1),
-    FORCED_KEYWORDS("forcedKeywords", "Additional keywords to identify forced tracks, combines with config file"),
+    FORCE_COHERENT("force-coherent", "Force coherent and don't update anything if config fits not whole config (default: false)", "cf", 0),
-    EXCLUDE_DIRECTORY("exclude-directories", "Directories to be excluded, combines with config file"),
+    WINDOWS("windows", "Is operating system windows", null, 0),
-    HELP("help", "\"for help this is\" - Yoda"),
+    ONLY_NEW_FILES("only-new-files", "Sets filter-date to last successful execution (Overwrites input of filter-date)", "n", 0),
-    VERSION("version", "Display version");
+    FILTER_DATE("filter-date", "Only consider files created newer than entered date (format: \"dd.MM.yyyy-HH:mm:ss\")", "d", 1),
+    THREADS("threads", "Thread count (default: 2)", "t", 1),
+    INCLUDE_PATTERN("include-pattern", "Include files matching pattern (default: \".*\")", "i", 1),
+    EXCLUDED_DIRECTORY("excluded-directories", "Directories to be excluded, combines with config file", "e", Option.UNLIMITED_VALUES),
+    FORCED_KEYWORDS("forced-keywords", "Additional keywords to identify forced tracks", "fk", Option.UNLIMITED_VALUES),
+    COMMENTARY_KEYWORDS("commentary-keywords", "Additional keywords to identify commentary tracks", "ck", Option.UNLIMITED_VALUES),
+    PREFERRED_SUBTITLES("preferred-subtitles", "Additional keywords to prefer specific subtitle tracks", "ps", Option.UNLIMITED_VALUES),
+    ARGUMENTS("arguments", "List of arguments", null, 0),
+    VERSION("version", "Display version", "v", 0),
+    HELP("help", "\"For help this is\" - Yoda", "h", 0);
+
+    /*
+     * Verify at startup that there are no duplicated shortParameters.
+     */
+    static {
+        Set<String> shortParameters = new HashSet<>();
+        for (String param : Arrays.stream(ConfigProperty.values()).map(ConfigProperty::abrv).collect(Collectors.toList())) {
+            if (shortParameters.contains(param)) {
+                throw new IllegalStateException("It is not allowed to have multiple properties with the same abbreviation!");
+            }
+            if (param != null) {
+                shortParameters.add(param);
+            }
+        }
+    }
 
     private final String property;
     private final String description;
+    private final String shortParameter;
+    private final int args;
+
+    public String prop() {
+        return property;
+    }
 
     public String desc() {
         return description;
     }
 
-    public String prop() {
+    public String abrv() {
-        return property;
+        return shortParameter;
+    }
+
+    public int args() {
+        return args;
     }
 }

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

@@ -2,9 +2,11 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 
-@Log4j2
+import java.util.Objects;
+
+@Slf4j
 @Getter
 @AllArgsConstructor
 public class FileAttribute {
@@ -15,6 +17,24 @@ public class FileAttribute {
     private final boolean forcedTrack;
     private final LaneType type;
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        FileAttribute attribute = (FileAttribute) o;
+        return id == attribute.id
+                && defaultTrack == attribute.defaultTrack
+                && forcedTrack == attribute.forcedTrack
+                && Objects.equals(language, attribute.language)
+                && Objects.equals(trackName, attribute.trackName)
+                && type == attribute.type;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, language, trackName, defaultTrack, forcedTrack, type);
+    }
+
     @Override
     public String toString() {
         return "[" + "id=" + id +

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

@@ -1,46 +1,67 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
 
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 
+import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
 
 @Getter
 @Setter
+@RequiredArgsConstructor
 public class FileInfoDto {
+    private final File file;
     private Set<FileAttribute> defaultAudioLanes = new HashSet<>();
     private Set<FileAttribute> defaultSubtitleLanes = new HashSet<>();
     private Set<FileAttribute> desiredForcedSubtitleLanes;
     private FileAttribute desiredAudioLane;
     private FileAttribute desiredSubtitleLane;
-
+    private AttributeConfig matchedConfig;
-    public boolean isUnableToApplyConfig() {
-        return desiredAudioLane == null && desiredSubtitleLane == null;
-    }
-
-    public boolean isAlreadySuitable() {
-        return defaultAudioLanes.contains(desiredAudioLane) && defaultSubtitleLanes.contains(desiredSubtitleLane);
-    }
-
-    public boolean isChangeNecessary() {
-        return isAudioDifferent() || isSubtitleDifferent() || areForcedTracksDifferent();
-    }
 
     public boolean isAudioDifferent() {
         return desiredAudioLane != null &&
-                (defaultAudioLanes == null || !defaultAudioLanes.contains(desiredAudioLane));
+                (defaultAudioLanes == null || !defaultAudioLanes.contains(desiredAudioLane) || defaultAudioLanes.size() > 1);
     }
 
     public boolean isSubtitleDifferent() {
-        return desiredSubtitleLane != null &&
+        return isSubtitleMatchDifferent() || isSubtitleOFF();
-                (defaultSubtitleLanes == null || !defaultSubtitleLanes.contains(desiredSubtitleLane));
+    }
+
+    private boolean isSubtitleMatchDifferent() {
+        return desiredSubtitleLane != null
+                && (defaultSubtitleLanes == null || !defaultSubtitleLanes.contains(desiredSubtitleLane) || defaultAudioLanes.size() > 1);
+    }
+
+    private boolean isSubtitleOFF() {
+        return desiredSubtitleLane == null && "OFF".equals(matchedConfig.getSubtitleLanguage()) &&
+                (defaultAudioLanes != null || !defaultAudioLanes.isEmpty());
     }
 
     public boolean areForcedTracksDifferent() {
         return desiredForcedSubtitleLanes.size() > 0;
     }
 
+    public FileStatus getStatus() {
+        if (isChangeNecessary()) return FileStatus.CHANGE_NECESSARY;
+        if (isUnableToApplyConfig()) return FileStatus.UNABLE_TO_APPLY;
+        if (isAlreadySuitable()) return FileStatus.ALREADY_SUITED;
+        return FileStatus.UNKNOWN;
+    }
+
+    private boolean isUnableToApplyConfig() {
+        return desiredAudioLane == null && desiredSubtitleLane == null;
+    }
+
+    private boolean isAlreadySuitable() {
+        return defaultAudioLanes.contains(desiredAudioLane) && defaultSubtitleLanes.contains(desiredSubtitleLane);
+    }
+
+    private boolean isChangeNecessary() {
+        return isAudioDifferent() || isSubtitleDifferent() || areForcedTracksDifferent();
+    }
+
     @Override
     public String toString() {
         return "[" + "defaultAudioLanes=" + defaultAudioLanes +

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

@@ -0,0 +1,8 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
+
+public enum FileStatus {
+    CHANGE_NECESSARY,
+    UNABLE_TO_APPLY,
+    ALREADY_SUITED,
+    UNKNOWN;
+}

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

@@ -4,8 +4,8 @@ import lombok.AllArgsConstructor;
 
 @AllArgsConstructor
 public enum MkvToolNix {
-    MKV_MERGER("mkvmerge.exe"),
+    MKV_MERGER("mkvmerge"),
-    MKV_PROP_EDIT("mkvpropedit.exe");
+    MKV_PROP_EDIT("mkvpropedit");
 
     private final String file;
 

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

@@ -2,19 +2,23 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
 
 import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 
 @Getter
+@Slf4j
 public class ResultStatistic {
     private static final String result = "Total files: %s%n" +
+            "├─ Excluded: %s%n" +
             "├─ Should change: %s%n" +
             "│  ├─ Failed changing: %s%n" +
             "│  └─ Successfully changed: %s%n" +
             "├─ No suitable config found: %s%n" +
             "├─ Already fit config: %s%n" +
             "└─ Failed: %s%n" +
-            "Runtime: %ss";
+            "Runtime: %s";
-
+    private static ResultStatistic instance;
     private int filesTotal = 0;
+    private int excluded = 0;
 
     private int shouldChange = 0;
     private int failedChanging = 0;
@@ -28,10 +32,29 @@ public class ResultStatistic {
     private long startTime = 0;
     private long runtime = 0;
 
+    public static ResultStatistic getInstance() {
+        if (instance == null) {
+            instance = new ResultStatistic();
+        }
+        return instance;
+    }
+
+    public void increaseTotalBy(int amount) {
+        filesTotal += amount;
+    }
+
     public synchronized void total() {
         filesTotal++;
     }
 
+    public void increaseExcludedBy(int amount) {
+        excluded += amount;
+    }
+
+    public synchronized void excluded() {
+        excluded++;
+    }
+
     public synchronized void shouldChange() {
         shouldChange++;
     }
@@ -64,9 +87,43 @@ public class ResultStatistic {
         runtime = System.currentTimeMillis() - startTime;
     }
 
+    public void printResult() {
+        System.out.println(prettyPrint());
+        log.info(this.toString());
+    }
+
+    private String formatTimer() {
+        int seconds = (int) (runtime / 1000);
+        int minutes = seconds / 60;
+        int hours = minutes / 60;
+        int days = hours / 24;
+
+        if (days >= 1) {
+            return String.format("%sd %sh %sm %ss", days, hours % 24, minutes % 60, seconds % 60);
+        } else if (hours >= 1) {
+            return String.format("%sh %sm %ss", hours, minutes % 60, seconds % 60);
+        } else if (minutes >= 1) {
+            return String.format("%sm %ss", minutes, seconds % 60);
+        } else {
+            return String.format("%ss", seconds % 60);
+        }
+    }
+
+    public String prettyPrint() {
+        return String.format(result, filesTotal, excluded, shouldChange, failedChanging, successfullyChanged,
+                noSuitableConfigFound, alreadyFits, failed, formatTimer());
+    }
+
     @Override
     public String toString() {
-        return String.format(result, filesTotal, shouldChange, failedChanging, successfullyChanged,
+        return "ResultStatistic: " + "filesTotal=" + filesTotal +
-                noSuitableConfigFound, alreadyFits, failed, runtime / 1000);
+                ", excluded=" + excluded +
+                ", shouldChange=" + shouldChange +
+                " (failedChanging=" + failedChanging +
+                ", successfullyChanged=" + successfullyChanged +
+                "), noSuitableConfigFound=" + noSuitableConfigFound +
+                ", alreadyFits=" + alreadyFits +
+                ", failed=" + failed +
+                ", runtime=" + formatTimer();
     }
 }

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/CommandLineOptionsUtil.java

@@ -4,8 +4,8 @@ import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
 import org.apache.commons.cli.Option;
 
 public class CommandLineOptionsUtil {
-    public static Option optionOf(ConfigProperty property, String opt, boolean hasArg) {
+    public static Option optionOf(ConfigProperty property, String opt, int args) {
-        return optionOf(property, opt, hasArg ? 1 : 0, false);
+        return optionOf(property, opt, args, false);
     }
 
     public static Option optionOf(ConfigProperty property, String opt, boolean hasArg, boolean required) {

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/DateUtils.java

@@ -0,0 +1,29 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class DateUtils {
+    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy-HH:mm:ss");
+
+    public static Date convert(long millis) {
+        return new Date(millis);
+    }
+
+    /**
+     * Convert String to date.
+     * @return parsed date, defaultDate if exception occurs
+     */
+    public static Date convert(String date, Date defaultDate) {
+        try {
+            return dateFormat.parse(date);
+        } catch (ParseException e) {
+            return defaultDate;
+        }
+    }
+
+    public static String convert(Date date) {
+        return dateFormat.format(date);
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LanguageValidatorUtil.java

@@ -1,7 +1,5 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
 
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ConfigErrors;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -25,13 +23,11 @@ public class LanguageValidatorUtil {
         }
     }
 
+    public static boolean isAudioLanguageValid(String language) {
+        return !language.equals("OFF") && ISO3_LANGUAGES.contains(language);
+    }
+
     public static boolean isLanguageValid(String language) {
         return ISO3_LANGUAGES.contains(language);
     }
-
-    public static void isLanguageValid(String language, ConfigErrors errors) {
-        if (!isLanguageValid(language)) {
-            errors.add(String.format("%s is not a valid language", language));
-        }
-    }
 }

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ProjectUtil.java

@@ -0,0 +1,25 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+public class ProjectUtil {
+    private static final Properties PROJECT_PROPERTIES = new Properties();
+
+    static {
+        try (InputStream propertiesStream = ProjectUtil.class.getClassLoader().getResourceAsStream("project.properties")) {
+            PROJECT_PROPERTIES.load(propertiesStream);
+        } catch (IOException e) {
+            throw new RuntimeException(e.getMessage());
+        }
+    }
+
+    public static String getVersion() {
+        return PROJECT_PROPERTIES.getProperty("version");
+    }
+
+    public static String getProjectName() {
+        return  PROJECT_PROPERTIES.getProperty("project_name");
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/VersionUtil.java

@@ -1,18 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-public class VersionUtil {
-    public static String getVersion() {
-        try (InputStream propertiesStream = VersionUtil.class.getClassLoader().getResourceAsStream("version.properties")) {
-            Properties properties = new Properties();
-            properties.load(propertiesStream);
-
-            return properties.getProperty("version");
-        } catch (IOException e) {
-            throw new RuntimeException(e.getMessage());
-        }
-    }
-}

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/AttributeConfigValidatorTest.java

@@ -0,0 +1,85 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+import static org.junit.jupiter.api.Assertions.*;
+
+class AttributeConfigValidatorTest {
+    private static CommandLineParser parser;
+    private static Options options;
+
+    @BeforeAll
+    static void before() {
+        parser = new DefaultParser();
+        options = new Options();
+        options.addOption(optionOf(ATTRIBUTE_CONFIG, ATTRIBUTE_CONFIG.abrv(), ATTRIBUTE_CONFIG.args()));
+    }
+
+    @BeforeEach
+    void beforeEach() {
+        Config.getInstance(true);
+    }
+
+    private static Stream<Arguments> provideTestCases() {
+        return Stream.of(
+                Arguments.of(attrConfYaml("jpn", "ger"), new String[]{}, VALID, attrConf("jpn", "ger")),
+                Arguments.of("", new String[]{"-a", "jpn:ger"}, VALID, attrConf("jpn", "ger")),
+                Arguments.of(attrConfYaml("jpn", "ger", "jpn", "eng"), new String[]{}, VALID, attrConf("jpn", "ger", "jpn", "eng")),
+                Arguments.of("", new String[]{"-a", "jpn:ger", "jpn:eng"}, VALID, attrConf("jpn", "ger", "jpn", "eng")),
+                Arguments.of(attrConfYaml("jpn", "ger", "jpn", "OFF"), new String[]{}, VALID, attrConf("jpn", "ger", "jpn", "OFF")),
+                Arguments.of("", new String[]{"-a", "jpn:ger", "jpn:OFF"}, VALID, attrConf("jpn", "ger", "jpn", "OFF")),
+                Arguments.of(attrConfYaml("jpn", "invalid"), new String[]{}, INVALID, null),
+                Arguments.of("", new String[]{}, MISSING, null)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(String yamlArgs, String[] cmdArgs, ValidationResult expectedResult, List<AttributeConfig> expectedConfig)
+            throws ParseException, YamlInvalidContentException {
+        AttributeConfigValidator underTest = new AttributeConfigValidator();
+
+        ValidationResult result = underTest.validate(new YAML(yamlArgs), parser.parse(options, cmdArgs));
+
+        assertEquals(expectedResult, result);
+        assertIterableEquals(expectedConfig, Config.getInstance().getAttributeConfig());
+    }
+
+    private static String attrConfYaml(String... languages) {
+        StringBuilder yaml = new StringBuilder("attribute-config: ");
+        int counter = 0;
+        for (int i = 0; i < languages.length; i += 2) {
+            counter++;
+            yaml.append(String.format("\n %s:\n  audio: %s\n  subtitle: %s", counter, languages[i], languages[i+1]));
+        }
+        return yaml.toString();
+    }
+
+    private static List<AttributeConfig> attrConf(String... languages) {
+        List<AttributeConfig> conf = new ArrayList<>();
+        for (int i = 0; i < languages.length; i += 2) {
+            conf.add(new AttributeConfig(languages[i], languages[i+1]));
+        }
+        return conf;
+    }
+}

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/BooleanValidatorTest.java

@@ -0,0 +1,58 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.yamlList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class BooleanValidatorTest {
+    private static CommandLineParser parser;
+    private static Options options;
+
+    @BeforeAll
+    static void before() {
+        parser = new DefaultParser();
+        options = new Options();
+        options.addOption(optionOf(SAFE_MODE, SAFE_MODE.abrv(), SAFE_MODE.args()));
+    }
+
+    private static Stream<Arguments> provideTestCases() {
+        return Stream.of(
+                Arguments.of(SAFE_MODE, false, "", new String[]{"-safe-mode"}, VALID),
+                Arguments.of(SAFE_MODE, true, "", new String[]{"-safe-mode"}, VALID),
+                Arguments.of(SAFE_MODE, false, "", new String[]{""}, NOT_PRESENT),
+                Arguments.of(SAFE_MODE, true, "", new String[]{""}, MISSING),
+                Arguments.of(SAFE_MODE, false, yamlList(ARGUMENTS, SAFE_MODE), new String[]{""}, VALID),
+                Arguments.of(SAFE_MODE, true, yamlList(ARGUMENTS, SAFE_MODE), new String[]{""}, VALID),
+                Arguments.of(SAFE_MODE, false, yamlList(ARGUMENTS, WINDOWS), new String[]{""}, NOT_PRESENT),
+                Arguments.of(SAFE_MODE, true, yamlList(ARGUMENTS, WINDOWS), new String[]{""}, MISSING)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(ConfigProperty property, boolean required, String yamlArgs, String[] cmdArgs,
+                  ValidationResult expectedResult) throws ParseException, YamlInvalidContentException {
+        BooleanValidator underTest = new BooleanValidator(property, required);
+
+        ValidationResult result = underTest.validate(new YAML(yamlArgs), parser.parse(options, cmdArgs));
+
+        assertEquals(expectedResult, result);
+    }
+}

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/ConfigPathValidatorTest.java

@@ -0,0 +1,57 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.INVALID;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.CONFIG_PATH;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+import static org.junit.jupiter.api.Assertions.*;
+
+class ConfigPathValidatorTest {
+    private static final String TEST_FILE = "src/test/resources/test-dir/test-file.mkv";
+    private static final String TEST_CONFIG = "src/test/resources/test-dir/test-config.yaml";
+
+    private static CommandLineParser parser;
+    private static Options options;
+
+    @BeforeAll
+    static void before() {
+        parser = new DefaultParser();
+        options = new Options();
+        options.addOption(optionOf(CONFIG_PATH, CONFIG_PATH.abrv(), CONFIG_PATH.args()));
+    }
+
+    private static Stream<Arguments> provideTestCases() {
+        return Stream.of(
+                Arguments.of(CONFIG_PATH, true, "", new String[]{"-p", TEST_CONFIG}, VALID),
+                Arguments.of(CONFIG_PATH, true, "config-path: " + TEST_CONFIG, new String[]{}, MISSING),
+                Arguments.of(CONFIG_PATH, false, "config-path: " + TEST_CONFIG, new String[]{}, NOT_PRESENT),
+                Arguments.of(CONFIG_PATH, true, "", new String[]{"-p", TEST_FILE}, INVALID)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(ConfigProperty property, boolean required, String yamlArgs, String[] cmdArgs,
+                  ValidationResult expectedResult) throws ParseException, YamlInvalidContentException {
+        ConfigPathValidator underTest = new ConfigPathValidator(property, required);
+
+        ValidationResult result = underTest.validate(new YAML(yamlArgs), parser.parse(options, cmdArgs));
+
+        assertEquals(expectedResult, result);
+    }
+}

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/MkvToolNixPathValidatorTest.java

@@ -0,0 +1,65 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.MISSING;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+import static org.junit.jupiter.api.Assertions.*;
+
+class MkvToolNixPathValidatorTest {
+    private static final String TEST_INVALID_DIR = "src/test/resources/test-dir";
+    private static final String TEST_MKVTOOLNIX_DIR = "src/test/resources/mkvtoolnix";
+    private static final String TEST_MKVTOOLNIX_EXE_DIR = "src/test/resources/mkvtoolnix_exe";
+
+    private static CommandLineParser parser;
+    private static Options options;
+
+    @BeforeAll
+    static void before() {
+        parser = new DefaultParser();
+        options = new Options();
+        options.addOption(optionOf(MKV_TOOL_NIX, MKV_TOOL_NIX.abrv(), MKV_TOOL_NIX.args()));
+    }
+
+    private static Stream<Arguments> provideTestCases() {
+        return Stream.of(
+                Arguments.of(MKV_TOOL_NIX, false, null, "", new String[]{"-m", TEST_MKVTOOLNIX_DIR}, VALID),
+                Arguments.of(MKV_TOOL_NIX, true, null, "", new String[]{"-m", TEST_MKVTOOLNIX_EXE_DIR}, VALID),
+                Arguments.of(MKV_TOOL_NIX, false, null, "mkvtoolnix: " + TEST_MKVTOOLNIX_EXE_DIR, new String[]{}, VALID),
+                Arguments.of(MKV_TOOL_NIX, true, null, "mkvtoolnix: " + TEST_MKVTOOLNIX_DIR, new String[]{}, VALID),
+                Arguments.of(MKV_TOOL_NIX, false, Path.of(TEST_MKVTOOLNIX_EXE_DIR).toFile(), "", new String[]{}, DEFAULT),
+                Arguments.of(MKV_TOOL_NIX, false, null, "", new String[]{}, NOT_PRESENT),
+                Arguments.of(MKV_TOOL_NIX, true, null, "", new String[]{}, MISSING),
+                Arguments.of(MKV_TOOL_NIX, true, null, "", new String[]{"-m", TEST_INVALID_DIR}, INVALID)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(ConfigProperty property, boolean required, File defaultValue, String yamlArgs, String[] cmdArgs,
+                  ValidationResult expectedResult) throws ParseException, YamlInvalidContentException {
+        MkvToolNixPathValidator underTest = new MkvToolNixPathValidator(property, required, defaultValue);
+
+        ValidationResult result = underTest.validate(new YAML(yamlArgs), parser.parse(options, cmdArgs));
+
+        assertEquals(expectedResult, result);
+    }
+
+}

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/PathValidatorTest.java

@@ -0,0 +1,66 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.File;
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.INVALID;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.LIBRARY;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.argumentsOf;
+import static org.junit.jupiter.api.Assertions.*;
+
+class PathValidatorTest {
+    private static final String TEST_DIR = "src/test/resources/test-dir";
+    private static final String TEST_FILE = "src/test/resources/test-dir/test-file.mkv";
+
+    private static CommandLineParser parser;
+    private static Options options;
+
+    @BeforeAll
+    static void before() {
+        parser = new DefaultParser();
+        options = new Options();
+        options.addOption(optionOf(LIBRARY, LIBRARY.abrv(), LIBRARY.args()));
+    }
+
+    private static Stream<Arguments> provideTestCases() {
+        return Stream.of(
+                argumentsOf(LIBRARY, false, null, "library-path: " + TEST_DIR, new String[]{}, VALID),
+                argumentsOf(LIBRARY, true, null, "", new String[]{"-l", TEST_FILE}, VALID),
+
+                argumentsOf(LIBRARY, false, TEST_DIR, "", new String[]{}, DEFAULT),
+                argumentsOf(LIBRARY, true, TEST_FILE, "", new String[]{}, DEFAULT),
+                argumentsOf(LIBRARY, true, null, "", new String[]{}, MISSING),
+                argumentsOf(LIBRARY, false, null, "", new String[]{}, NOT_PRESENT),
+
+                argumentsOf(LIBRARY, true, null, "", new String[]{"-l", TEST_DIR + "/invalid"}, INVALID),
+                argumentsOf(LIBRARY, false, null, "library-path: " + TEST_DIR + "/invalid", new String[]{}, INVALID),
+                argumentsOf(LIBRARY, true, TEST_DIR, "", new String[]{"-l", TEST_DIR + "/invalid"}, INVALID)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(ConfigProperty property, boolean required, File defaultValue, String yamlArgs, String[] cmdArgs,
+                  ValidationResult expectedResult) throws ParseException, YamlInvalidContentException {
+        PathValidator underTest = new PathValidator(property, required, defaultValue);
+
+        ValidationResult result = underTest.validate(new YAML(yamlArgs), parser.parse(options, cmdArgs));
+
+        assertEquals(expectedResult, result);
+    }
+}

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/PatternValidatorTest.java

@@ -0,0 +1,64 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.INVALID;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.INCLUDE_PATTERN;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.argumentsOf;
+import static org.junit.jupiter.api.Assertions.*;
+
+class PatternValidatorTest {
+    private static CommandLineParser parser;
+    private static Options options;
+
+    @BeforeAll
+    static void before() {
+        parser = new DefaultParser();
+        options = new Options();
+        options.addOption(optionOf(INCLUDE_PATTERN, INCLUDE_PATTERN.abrv(), INCLUDE_PATTERN.args()));
+    }
+
+    private static Stream<Arguments> provideTestCases() {
+        return Stream.of(
+                argumentsOf(INCLUDE_PATTERN, false, null, "include-pattern: \"[abd]?.*\"", new String[]{}, VALID),
+                argumentsOf(INCLUDE_PATTERN, true, null, "", new String[]{"-i", "[abd]?.*"}, VALID),
+
+                argumentsOf(INCLUDE_PATTERN, false, Pattern.compile(".*"), "", new String[]{}, DEFAULT),
+                argumentsOf(INCLUDE_PATTERN, true, Pattern.compile(".*"), "", new String[]{}, DEFAULT),
+
+                argumentsOf(INCLUDE_PATTERN, true, null, "", new String[]{}, MISSING),
+                argumentsOf(INCLUDE_PATTERN, false, null, "", new String[]{}, NOT_PRESENT),
+
+                argumentsOf(INCLUDE_PATTERN, true, null, "", new String[]{"-i", "?."}, INVALID),
+                argumentsOf(INCLUDE_PATTERN, false, null, "include-pattern: \"[arst*\"", new String[]{}, INVALID),
+                argumentsOf(INCLUDE_PATTERN, true, Pattern.compile(".?"), "", new String[]{"-i", "?."}, INVALID)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(ConfigProperty property, boolean required, Pattern defaultValue, String yamlArgs, String[] cmdArgs,
+                  ValidationResult expectedResult) throws ParseException, YamlInvalidContentException {
+        PatternValidator underTest = new PatternValidator(property, required, defaultValue);
+
+        ValidationResult result = underTest.validate(new YAML(yamlArgs), parser.parse(options, cmdArgs));
+
+        assertEquals(expectedResult, result);
+    }
+}

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/SetValidatorTest.java

@@ -0,0 +1,68 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.COMMENTARY_KEYWORDS;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.argumentsOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class SetValidatorTest {
+
+    private static CommandLineParser parser;
+    private static Options options;
+
+    @BeforeAll
+    static void before() {
+        parser = new DefaultParser();
+        options = new Options();
+        options.addOption(optionOf(COMMENTARY_KEYWORDS, COMMENTARY_KEYWORDS.abrv(), COMMENTARY_KEYWORDS.args()));
+    }
+
+    @BeforeEach
+    void beforeEach() {
+        Config.getInstance(true);
+    }
+
+    private static Stream<Arguments> provideTestCases() {
+        return Stream.of(
+                argumentsOf(COMMENTARY_KEYWORDS, true, true, "", new String[]{"-ck", "test"}, VALID, 3),
+                argumentsOf(COMMENTARY_KEYWORDS, true, false, COMMENTARY_KEYWORDS.prop() + ": [test]", new String[]{}, VALID, 1),
+                argumentsOf(COMMENTARY_KEYWORDS, true, false, COMMENTARY_KEYWORDS.prop() + ":\n - test\n - test2", new String[]{}, VALID, 2),
+                argumentsOf(COMMENTARY_KEYWORDS, false, true, COMMENTARY_KEYWORDS.prop() + ": [test]", new String[]{}, VALID, 3),
+                argumentsOf(COMMENTARY_KEYWORDS, false, false, "", new String[]{"-ck", "test"}, VALID, 1),
+                argumentsOf(COMMENTARY_KEYWORDS, true, true, COMMENTARY_KEYWORDS.prop() + ": [commentary]", new String[]{}, VALID, 2),
+
+                argumentsOf(COMMENTARY_KEYWORDS, true, true, "", new String[]{}, MISSING, 2),
+                argumentsOf(COMMENTARY_KEYWORDS, false, true, "", new String[]{}, NOT_PRESENT, 2)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(ConfigProperty property, boolean required, boolean append, String yamlArgs, String[] cmdArgs,
+                  ValidationResult expectedResult, int expectedSize) throws ParseException, YamlInvalidContentException {
+        SetValidator underTest = new SetValidator(property, required, append);
+
+        ValidationResult result = underTest.validate(new YAML(yamlArgs), parser.parse(options, cmdArgs));
+
+        assertEquals(expectedResult, result);
+        assertEquals(expectedSize, Config.getInstance().getCommentaryKeywords().size());
+    }
+}

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/ThreadValidatorTest.java

@@ -0,0 +1,61 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.THREADS;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.argumentsOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class ThreadValidatorTest {
+
+    private static CommandLineParser parser;
+    private static Options options;
+
+    @BeforeAll
+    static void before() {
+        parser = new DefaultParser();
+        options = new Options();
+        options.addOption(optionOf(THREADS, "t", THREADS.args()));
+    }
+
+    private static Stream<Arguments> provideTestCases() {
+        return Stream.of(
+                argumentsOf(THREADS, false, null, "", new String[]{"-t", "10"}, VALID),
+                argumentsOf(THREADS, true, null, "", new String[]{"-t", "10"}, VALID),
+                argumentsOf(THREADS, false, null, "threads: 10", new String[]{}, VALID),
+                argumentsOf(THREADS, true, null, "threads: 10", new String[]{}, VALID),
+                argumentsOf(THREADS, false, 2, "", new String[]{}, DEFAULT),
+                argumentsOf(THREADS, true, null, "", new String[]{}, MISSING),
+                argumentsOf(THREADS, false, null, "", new String[]{}, NOT_PRESENT),
+                argumentsOf(THREADS, true, null, "", new String[]{"-t", "-1"}, INVALID),
+                argumentsOf(THREADS, true, null, "threads: 0", new String[]{}, INVALID),
+                argumentsOf(THREADS, true, 2, "", new String[]{"-t", "0"}, INVALID)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(ConfigProperty property, boolean required, Integer defaultValue, String yamlArgs, String[] cmdArgs,
+                  ValidationResult expectedResult) throws ParseException, YamlInvalidContentException {
+        ThreadValidator underTest = new ThreadValidator(property, required, defaultValue);
+
+        ValidationResult result = underTest.validate(new YAML(yamlArgs), parser.parse(options, cmdArgs));
+
+        assertEquals(expectedResult, result);
+    }
+}

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/SubtitleTrackComparatorTest.java

@@ -0,0 +1,46 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.LaneType;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class SubtitleTrackComparatorTest {
+    private static final SubtitleTrackComparator comparator = new SubtitleTrackComparator(new String[]{"unstyled"});
+
+    private static Stream<Arguments> compareArguments() {
+        return Stream.of(
+                Arguments.of(List.of(attr("unstyled sub", false), attr("styled sub", false)),
+                        List.of(attr("unstyled sub", false), attr("styled sub", false))),
+                Arguments.of(List.of(attr("styled sub", false), attr("unstyled sub", false)),
+                        List.of(attr("unstyled sub", false), attr("styled sub", false))),
+
+                Arguments.of(List.of(attr("unstyled sub", true), attr("styled sub", false)),
+                        List.of(attr("unstyled sub", true), attr("styled sub", false))),
+                Arguments.of(List.of(attr("styled sub", true), attr("unstyled sub", false)),
+                        List.of(attr("unstyled sub", false), attr("styled sub", true))),
+
+                Arguments.of(List.of(attr("unstyled sub", true), attr("unstyled sub", false)),
+                        List.of(attr("unstyled sub", true), attr("unstyled sub", false)))
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("compareArguments")
+    void compare(List<FileAttribute> input, List<FileAttribute> expected) {
+        List<FileAttribute> result = input.stream().sorted(comparator.reversed()).collect(Collectors.toList());
+
+        assertArrayEquals(expected.toArray(new FileAttribute[0]), result.toArray(new FileAttribute[0]));
+    }
+
+    private static FileAttribute attr(String trackName, boolean defaultTrack) {
+        return new FileAttribute(0, "", trackName, defaultTrack, false, LaneType.SUBTITLES);
+    }
+}

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/TestUtil.java

@@ -0,0 +1,28 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import org.junit.jupiter.params.provider.Arguments;
+
+import java.util.Arrays;
+
+import static java.util.stream.Collectors.joining;
+
+public class TestUtil {
+    public static String yamlList(ConfigProperty main, ConfigProperty... child) {
+        return main.prop() + ":\n" + Arrays.stream(child)
+                .map(ConfigProperty::prop)
+                .collect(joining("\n", "  - ", ""));
+    }
+
+    public static <T> Arguments argumentsOf(ConfigProperty property, boolean required, T defaultValue, String yaml, String[] cmd,
+                                           ValidationResult result) {
+        return Arguments.of(property, required, defaultValue, yaml, cmd, result);
+    }
+
+    public static Arguments argumentsOf(ConfigProperty property, boolean required, boolean append, String yaml, String[] cmd,
+                                            ValidationResult result, int expectedSize) {
+        return Arguments.of(property, required, append, yaml, cmd, result, expectedSize);
+    }
+
+}

version.properties

@@ -1 +0,0 @@
-version=${project.version}