Remove unused code

Fix execution on linux

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-# This workflow will run every time a new release is created.
+# This workflow will run every time a tag starting with v is created.
 
 name: Build and release
 on:
@@ -6,24 +6,43 @@ on:
     types: [ created ]
 
 jobs:
-  build:
+  portable-build:
     runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+    permissions:
+      contents: write
+
+    steps:
+      - name: Install mkvtoolnix
+        run: sudo apt-get install -y mkvtoolnix
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.release.tag_name }}
+
+      - name: Extract version from tag
+        id: get_version
+        run: echo "VERSION=$(echo ${GITHUB_REF_NAME#v} | cut -d'-' -f1)" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Set timezone
+        uses: szenius/set-timezone@v2.0
+        with:
+          timezoneLinux: "Europe/Berlin"
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.7.0
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
 
       - name: Setup workspace
         run: mkdir artifacts
 
       - name: Build with Maven
         run: |
-          mvn clean package --file pom.xml
+          mvn clean package --file pom.xml -P portable -Drevision="${{ steps.get_version.outputs.VERSION }}"
           cp target/M*.{zip,tar} artifacts/
 
       - name: Upload artifacts
@@ -33,3 +52,93 @@ jobs:
         with:
           args: 'artifacts/M*'
 
+  debian-build:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
+    steps:
+      - name: Install mkvtoolnix
+        run: sudo apt-get install -y mkvtoolnix
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.release.tag_name }}
+
+      - name: Extract version from tag
+        id: get_version
+        run: echo "VERSION=$(echo ${GITHUB_REF_NAME#v} | cut -d'-' -f1)" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Set timezone
+        uses: szenius/set-timezone@v2.0
+        with:
+          timezoneLinux: "Europe/Berlin"
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.7.0
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Setup workspace
+        run: mkdir artifacts
+
+      - name: Build with Maven
+        run: |
+          mvn clean package --file pom.xml -P debian -Drevision="${{ steps.get_version.outputs.VERSION }}"
+          cp target/M*.deb artifacts/
+
+      - name: Upload artifacts
+        uses: skx/github-action-publish-binaries@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: 'artifacts/M*'
+
+  windows-installer-build:
+    runs-on: windows-latest
+
+    permissions:
+      contents: write
+
+    steps:
+      - name: Install mkvtoolnix
+        uses: crazy-max/ghaction-chocolatey@v3
+        with:
+          args: install mkvtoolnix -y
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.release.tag_name }}
+
+      - name: Extract version from tag
+        id: get_version
+        run: echo "VERSION=$(echo ${GITHUB_REF_NAME#v} | cut -d'-' -f1)" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Set timezone
+        uses: szenius/set-timezone@v2.0
+        with:
+          timezoneWindows: "Berlin Standard Time"
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4.7.0
+        with:
+          distribution: temurin
+          java-version: 21
+
+      - name: Setup workspace
+        run: mkdir artifacts
+
+      - name: Build with Maven
+        run: mvn clean package --file pom.xml -P windows -Drevision="${{ steps.get_version.outputs.VERSION }}"
+
+      - name: Upload artifacts
+        uses: AButler/upload-release-assets@v3.0
+        with:
+          files: 'target/installer/*'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -3,6 +3,7 @@
 
 # Log file
 *.log
+logs/
 
 # BlueJ files
 *.ctxt

README.md

@@ -1,49 +1,77 @@
 ## Introduction
 
-This program helps to change audio and subtitle tracks of mkv files without rewriting the file. Only track properties will be updated.
+A streamlined solution for managing MKV files, this program leverages MKVToolNix to modify audio and subtitle track properties without the need for time-consuming file reencoding. Users can easily set their track preferences, and the application intelligently applies the best matching configuration. The tool focuses on metadata modification rather than full file rewriting, ensuring quick operations while maintaining the original file integrity. This makes it an ideal choice for managing multilingual media collections or batch processing multiple MKV files.
+
 ![](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/blob/master/example.gif)
 
 ## Requirements
 
- - Java 11 or higher
+ - Java 21 or newer
  - mkvtoolnix installation
  
 ## Execution
-**Minimal usage:**
-`java -jar mkvaudiosubtitlechanger.jar --library "X:/Files" --attribute-config eng:ger eng:OFF`
+Portable: 
+```
+java -jar mkvaudiosubtitlechanger-<version>.jar --library "X:/Files" --attribute-config eng:ger eng:OFF
+```
+Windows & Linux (installed): 
+```
+mkvaudiosubtitlechanger --library "X:/Files" --attribute-config eng:ger eng:OFF
+```
 
-**Safe usage (best for testing before applying to whole library):**
-`java -jar mkvaudiosubtitlechanger.jar --library "X:/Files" --attribute-config eng:ger eng:OFF --safe-mode`
+Add `--safe-mode` oder `-s` to not change any files. This is recommended for the first executions.
 
 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).
 
-## Available parameters
+### Available parameters
 ```
- -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
- -m,--mkvtoolnix <arg>             Path to mkv tool nix installation
- -s,--safe-mode                    Test run (no files will be changes)
- -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
+* -a, --attribute-config=<attributeConfig>...
+                            List of audio:subtitle pairs used to match in order
+                              and update files accordingly (e.g. jpn:eng jpn:
+                              ger)
+* -l, --library=<libraryPath>
+                            path to library
+  -m, --mkvtoolnix=<mkvToolNix>
+                            path to mkvtoolnix installation
+  -s, --safemode            test run (no files will be changes)
+  -t, --threads=<threads>   thread count (default: 2)
+  -c, --coherent=<coherent> try to match all files in dir of depth with the
+                              same attribute config
+      -cf, --force-coherent changes are only applied if it's a coherent match
+  -n, --only-new-file       sets filter-date to last successful execution
+                              (overwrites input of filter-date)
+  -d, --filter-date=<filterDate>
+                            only consider files created newer than entered date
+                              (format: "dd.MM.yyyy-HH:mm:ss")
+  -i, --include-pattern=<includePattern>
+                            include files matching pattern (default: ".*")
+  -e, --excluded=<excluded>...
+                            Directories and files to be excluded (no wildcard)
+  -o, -overwrite-forced     remove all forced flags
+      --forced-keywords=<forcedKeywords>[, <forcedKeywords>...]...
+                            Keywords to identify forced tracks (Defaults will
+                              be overwritten; Default: forced, signs, songs)
+      --commentary-keywords=<commentaryKeywords>[, <commentaryKeywords>...]...
+                            Keywords to identify commentary tracks (Defaults
+                              will be overwritten; Default: comment,
+                              commentary, director)
+      --hearing-impaired=<hearingImpaired>[, <hearingImpaired>...]...
+                            Keywords to identify hearing impaired tracks
+                              (Defaults will be overwritten; Default: SDH
+      --preferred-subtitles=<preferredSubtitles>[, <preferredSubtitles>...]...
+                            Keywords to prefer specific subtitle tracks
+                              (Defaults will be overwritten; Default: unstyled)
+      --debug               Enable debug logging
+  -h, --help                Show this help message and exit.
+  -V, --version             Print version information and exit.
 ```
-If you need more information about how each parameter works, check out [this wiki page](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/wiki/Parameters).
+If you need more information how each parameter works, check out [this wiki page](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/wiki/Parameters-v4).
 
-All parameters can also be defined in a [config file](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/wiki/How-to-config-file).
+All parameters can also be defined in a [config file](https://picocli.info/#_argument_files_for_long_command_lines).
 
 ## Build requirements
-- JDK 11 or higher
+- JDK 21 or newer
 - Maven 3
 - Git
 
@@ -51,5 +79,5 @@ All parameters can also be defined in a [config file](https://github.com/RatzzFa
 ```shell
 git clone https://github.com/RatzzFatzz/MKVAudioSubtitleChanger.git
 cd MKVAudioSubtitleChanger
-mvn package
+mvn clean package -Pportable
 ```

config-template.yaml

@@ -1,34 +0,0 @@
-mkvtoolnix: C:\Program Files\MKVToolNix
-library: X:/Files
-
-attribute-config:
-  1:
-    audio: ger
-    subtitle: OFF
-  2:
-    audio: eng
-    subtitle: ger
-
-# Recommendations for data stored on HDDs, increase when using SSDs
-#threads: 2
-
-#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:
-
-

maven/assembly.xml

@@ -14,10 +14,6 @@
             <destName>${project.artifactId}.jar</destName>
             <outputDirectory>/</outputDirectory>
         </file>
-        <file>
-            <source>${project.basedir}/config-template.yaml</source>
-            <outputDirectory>/</outputDirectory>
-        </file>
         <file>
             <source></source>
         </file>

pom.xml

@@ -6,21 +6,241 @@
 
     <groupId>at.pcgamingfreaks</groupId>
     <artifactId>MKVAudioSubtitleChanger</artifactId>
-    <version>3.0.2</version>
+    <version>${revision}</version>
+
+    <properties>
+        <revision>1.0.0-SNAPSHOT</revision>
+        <mainClass>at.pcgamingfreaks.mkvaudiosubtitlechanger.Main</mainClass>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <project.maintainer>RatzzFatzz</project.maintainer>
+        <project.maintainer.mail>github.contact@ratzloeffel.de</project.maintainer.mail>
+        <project.description>Command-line utility for batch-managing default audio and subtitle tracks in MKV files.</project.description>
+
+        <java-version>17</java-version>
+        <lombok-version>1.18.42</lombok-version>
+    </properties>
+
+    <profiles>
+        <profile>
+            <id>portable</id>
+            <build>
+                <resources>
+                    <resource>
+                        <directory>src/main/resources</directory>
+                        <includes>
+                            <include>log4j2.yaml</include>
+                        </includes>
+                    </resource>
+                </resources>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>3.3.0</version>
+                        <executions>
+                            <execution>
+                                <id>archive</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <appendAssemblyId>false</appendAssemblyId>
+                                    <descriptors>
+                                        <descriptor>maven/assembly.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>windows</id>
+            <build>
+                <resources>
+                    <resource>
+                        <directory>src/main/resources</directory>
+                        <includes>
+                            <include>log4j2-windows.yaml</include>
+                        </includes>
+                    </resource>
+                </resources>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <version>3.4.2</version>
+                        <configuration>
+                            <finalName>${project.artifactId}</finalName>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <version>3.3.1</version>
+                        <executions>
+                            <execution>
+                                <id>copy-jpackage-input</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/jpackage-input</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${project.build.directory}</directory>
+                                            <includes>
+                                                <include>${project.artifactId}.jar</include>
+                                            </includes>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>filter-windows-installer-info</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/wix-resources</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${project.basedir}/src/wix/resources</directory>
+                                            <filtering>true</filtering>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.panteleyev</groupId>
+                        <artifactId>jpackage-maven-plugin</artifactId>
+                        <version>1.7.1</version>
+                        <configuration>
+                            <name>${project.artifactId}</name>
+                            <vendor>RatzzFatzz</vendor>
+                            <appVersion>${project.version}</appVersion>
+
+                            <destination>target/installer</destination>
+
+                            <input>target/jpackage-input</input>
+                            <mainClass>at.pcgamingfreaks.mkvaudiosubtitlechanger.Main</mainClass>
+                            <mainJar>${project.artifactId}.jar</mainJar>
+
+                            <resourceDir>${project.build.directory}/wix-resources/</resourceDir>
+                            <type>EXE</type>
+                            <winConsole>true</winConsole>
+                            <winShortcut>false</winShortcut>
+                            <winMenu>false</winMenu>
+                            <javaOptions>
+                                <javaOption>-Dlog4j2.configurationFile=log4j2-windows.yaml</javaOption>
+                            </javaOptions>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>windows</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jpackage</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>debian</id>
+            <build>
+                <resources>
+                    <resource>
+                        <directory>src/main/resources</directory>
+                        <includes>
+                            <include>log4j2-debian.yaml</include>
+                        </includes>
+                    </resource>
+                </resources>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <version>3.3.1</version>
+                        <executions>
+                            <execution>
+                                <id>filter-linux-package-info</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/debian-package-info</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${project.basedir}/src/deb</directory>
+                                            <filtering>true</filtering>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>jdeb</artifactId>
+                        <groupId>org.vafer</groupId>
+                        <version>1.13</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jdeb</goal>
+                                </goals>
+                                <configuration>
+                                    <dataSet>
+                                        <!-- JAR file -->
+                                        <data>
+                                            <src>${project.build.directory}/${project.build.finalName}.jar</src>
+                                            <type>file</type>
+                                            <mapper>
+                                                <type>perm</type>
+                                                <prefix>/usr/lib/${project.artifactId}</prefix>
+                                            </mapper>
+                                        </data>
+                                        <!-- Launcher script -->
+                                        <data>
+                                            <src>${project.build.directory}/debian-package-info/bin/mkvaudiosubtitlechanger</src>
+                                            <type>file</type>
+                                            <mapper>
+                                                <type>perm</type>
+                                                <prefix>/usr/bin</prefix>
+                                                <filemode>755</filemode>
+                                            </mapper>
+                                        </data>
+                                    </dataSet>
+                                    <controlDir>${project.build.directory}/debian-package-info/control</controlDir>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
     <build>
         <defaultGoal>clean package</defaultGoal>
         <sourceDirectory>src/main/java</sourceDirectory>
         <testSourceDirectory>src/test/java</testSourceDirectory>
         <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
             <resource>
                 <directory>./</directory>
                 <includes>
                     <include>language-codes</include>
                     <include>project.properties</include>
+                    <include>LICENSE</include>
                 </includes>
                 <filtering>true</filtering>
             </resource>
@@ -35,11 +255,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.4.2</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Main-Class>at/pcgamingfreaks/mkvaudiosubtitlechanger/Main</Main-Class>
+                            <Main-Class>${mainClass}</Main-Class>
                         </manifestEntries>
                     </archive>
                 </configuration>
@@ -47,7 +267,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -76,35 +296,33 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>3.5.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>${java-version}</source>
+                    <target>${java-version}</target>
+                    <compilerArgs>
+                        <arg>-Aproject=${project.groupId}/${project.artifactId}</arg>
+                    </compilerArgs>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok-version}</version>
+                        </path>
+                        <path>
+                            <groupId>info.picocli</groupId>
+                            <artifactId>picocli-codegen</artifactId>
+                            <version>4.7.7</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.3.0</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>maven/assembly.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+
         </plugins>
     </build>
 
@@ -116,86 +334,145 @@
     </repositories>
 
     <dependencies>
+        <!-- https://mvnrepository.com/artifact/com.intellij/forms_rt -->
         <dependency>
             <groupId>com.intellij</groupId>
             <artifactId>forms_rt</artifactId>
             <version>7.0.3</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.24</version>
+            <version>${lombok-version}</version>
             <scope>provided</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/info.picocli/picocli -->
+        <dependency>
+            <groupId>info.picocli</groupId>
+            <artifactId>picocli</artifactId>
+            <version>4.7.7</version>
+        </dependency>
+
+        <!-- Hibernate Validator -->
+        <!-- https://mvnrepository.com/artifact/org.hibernate.validator/hibernate-validator -->
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>8.0.2.Final</version>
+        </dependency>
+
+        <!-- Expression Language Implementation -->
+        <!-- https://mvnrepository.com/artifact/jakarta.el/jakarta.el-api -->
+        <dependency>
+            <groupId>jakarta.el</groupId>
+            <artifactId>jakarta.el-api</artifactId>
+            <version>6.1.0-M1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.el</artifactId>
+            <version>5.0.0-M1</version>
+        </dependency>
+
+        <!-- Jakarta Bean Validation -->
+        <!-- https://mvnrepository.com/artifact/jakarta.validation/jakarta.validation-api -->
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>3.1.1</version>
+        </dependency>
+
         <!-- region logging -->
+        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.18.0</version>
+            <version>2.24.3</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.18.0</version>
+            <version>2.24.3</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j18-impl -->
+        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j2-impl -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j18-impl</artifactId>
-            <version>2.18.0</version>
+            <artifactId>log4j-slf4j2-impl</artifactId>
+            <version>2.24.3</version>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml -->
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.13.4</version>
+            <version>2.20.0</version>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.4.2</version>
+            <version>2.20.0</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
-            <version>1.5.0</version>
+            <version>1.10.0</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>3.19.0</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/me.tongfei/progressbar -->
         <dependency>
             <groupId>me.tongfei</groupId>
             <artifactId>progressbar</artifactId>
-            <version>0.9.5</version>
+            <version>0.10.1</version>
         </dependency>
         <!-- endregion -->
         <!-- region unit-tests -->
+        <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.0</version>
+            <version>6.0.0</version>
             <scope>test</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.0</version>
+            <version>6.0.0</version>
             <scope>test</scope>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
+        <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
+            <artifactId>mockito-core</artifactId>
+            <version>5.20.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>5.20.0</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-params -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.9.0</version>
+            <version>6.0.0</version>
             <scope>test</scope>
         </dependency>
+
         <!-- endregion -->
         <dependency>
             <groupId>at.pcgamingfreaks</groupId>
@@ -206,7 +483,7 @@
         <dependency>
             <groupId>net.harawata</groupId>
             <artifactId>appdirs</artifactId>
-            <version>1.2.1</version>
+            <version>1.5.0</version>
         </dependency>
     </dependencies>
 

src/deb/bin/mkvaudiosubtitlechanger

@@ -0,0 +1 @@
+java -Dlog4j2.configurationFile=log4j2-debian.yaml -jar /usr/lib/${project.artifactId}/${project.artifactId}-${project.version}.jar "$@"

src/deb/control/control

@@ -0,0 +1,8 @@
+Package: [[artifactId]]
+Version: [[version]]
+Section: misc
+Priority: optional
+Architecture: all
+Depends: java-runtime (>=${java-version}), mkvtoolnix
+Maintainer: ${project.maintainer} <${project.maintainer.mail}>
+Description: ${project.description}

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

@@ -1,21 +1,18 @@
 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 lombok.extern.slf4j.Slf4j;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.CommandRunner;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.validation.ValidationExecutionStrategy;
+import picocli.CommandLine;
 
-@Slf4j
 public class Main {
     public static void main(String[] args) {
-        ConfigLoader.initConfig(args);
-        AttributeUpdaterKernel kernel = Config.getInstance().getCoherent() != null
-                ? new CoherentAttributeUpdaterKernel(new MkvFileCollector(), new CachedMkvFileProcessor())
-                : new DefaultAttributeUpdaterKernel(new MkvFileCollector(), new CachedMkvFileProcessor());
-        kernel.execute();
+        if (args.length == 0) {
+            CommandLine.usage(CommandRunner.class, System.out);
+            return;
+        }
+
+        new CommandLine(CommandRunner.class)
+                .setExecutionStrategy(new ValidationExecutionStrategy())
+                .execute(args);
     }
 }

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

@@ -1,99 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
-
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-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.util.*;
-import java.util.regex.Pattern;
-
-@Slf4j
-@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();
-    private File configPath;
-    private File libraryPath;
-    @Getter(AccessLevel.NONE)
-    private File mkvToolNix;
-
-    private int threads;
-    private Pattern includePattern;
-    private boolean safeMode;
-
-    private Integer coherent;
-    private boolean forceCoherent;
-    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() {
-        return getInstance(false);
-    }
-
-    public static Config getInstance(boolean reset) {
-        if (config == null || reset) {
-            config = new Config();
-        }
-        return config;
-    }
-
-    /**
-     * Get path to specific mkvtoolnix application.
-     *
-     * @return absolute path to desired application.
-     */
-    public String getPathFor(MkvToolNix application) {
-        return mkvToolNix.getAbsolutePath().endsWith("/") ? mkvToolNix.getAbsolutePath() + application :
-                    mkvToolNix.getAbsolutePath() + "/" + application;
-    }
-
-    public String getNormalizedLibraryPath() {
-        return this.getLibraryPath().getAbsolutePath().replace("\\", "/");
-    }
-
-    @Override
-    public String toString() {
-        return new StringJoiner(", ", Config.class.getSimpleName() + "[", "]")
-                .add("parser=" + parser)
-                .add("formatter=" + formatter)
-                .add("configPath=" + configPath)
-                .add("libraryPath=" + libraryPath)
-                .add("mkvToolNix=" + mkvToolNix)
-                .add("threads=" + threads)
-                .add("includePattern=" + includePattern)
-                .add("safeMode=" + safeMode)
-                .add("coherent=" + coherent)
-                .add("forceCoherent=" + forceCoherent)
-                .add("onlyNewFiles=" + onlyNewFiles)
-                .add("filterDate=" + filterDate)
-                .add("forcedKeywords=" + forcedKeywords)
-                .add("commentaryKeywords=" + commentaryKeywords)
-                .add("excludedDirectories=" + excludedDirectories)
-                .add("preferredSubtitles=" + preferredSubtitles)
-                .add("attributeConfig=" + attributeConfig)
-                .toString();
-    }
-}
-

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

@@ -1,110 +0,0 @@
-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.prop())) {
-            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/ValidationResult.java

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

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

@@ -1,88 +0,0 @@
-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

@@ -1,63 +0,0 @@
-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

@@ -1,22 +0,0 @@
-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

@@ -1,35 +0,0 @@
-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

@@ -1,176 +0,0 @@
-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

@@ -1,61 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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

@@ -1,30 +0,0 @@
-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

@@ -1,34 +0,0 @@
-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

@@ -1,111 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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/impl/CachedMkvFileProcessor.java

@@ -1,15 +0,0 @@
-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/CommandRunner.java

@@ -0,0 +1,46 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.processors.*;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.InputConfig;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.ProjectUtil;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.config.Configurator;
+import picocli.CommandLine;
+
+@Slf4j
+@CommandLine.Command(
+        name = "mkvaudiosubtitlechanger",
+        usageHelpAutoWidth = true,
+        customSynopsis = {
+                "mkvaudiosubtitlechanger [-a <attributeConfig> [...<attributeConfig>]] [-s] <libraryPath>",
+                "Example: mkvaudiosubtitlechanger -a eng:eng eng:ger -s /mnt/media/",
+                ""
+        },
+        requiredOptionMarker = '*',
+        sortOptions = false,
+        mixinStandardHelpOptions = true,
+        versionProvider = ProjectUtil.class
+)
+public class CommandRunner implements Runnable {
+    @Getter
+    @CommandLine.ArgGroup(exclusive = false)
+    private InputConfig config;
+
+    @Override
+    public void run() {
+        if (config.isDebug()) {
+            Configurator.setRootLevel(Level.DEBUG);
+        }
+
+        FileFilter fileFilter = new FileFilter(config.getExcluded(), config.getIncludePattern(), config.getFilterDate());
+        FileProcessor fileProcessor = new CachedFileProcessor(new MkvFileProcessor(config.getMkvToolNix(), fileFilter));
+        AttributeChangeProcessor attributeChangeProcessor = new AttributeChangeProcessor(config.getPreferredSubtitles().toArray(new String[0]), config.getForcedKeywords(), config.getCommentaryKeywords(), config.getHearingImpaired());
+
+        AttributeUpdater kernel = config.getCoherent() != null
+                ? new CoherentAttributeUpdater(config, fileProcessor, attributeChangeProcessor)
+                : new SingleFileAttributeUpdater(config, fileProcessor, attributeChangeProcessor);
+        kernel.execute();
+    }
+}

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

@@ -1,22 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl;
-
-import java.io.File;
-import java.util.List;
-
-public interface FileCollector {
-
-    /**
-     * @param path leads to one file directly or a directory which will be loaded recursively
-     * @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,52 +1,89 @@
 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.RequiredArgsConstructor;
 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;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @Slf4j
+@RequiredArgsConstructor
 public class FileFilter {
-    static boolean accept(File pathName, String[] fileExtensions) {
-        if (hasProperFileExtension(pathName, fileExtensions)
-                && hasMatchingPattern(pathName)
-                && isNewer(pathName)) {
-            return true;
+    private final Set<String> excluded;
+    private final Pattern includePattern;
+    private final Date filterDate;
+
+    private final String EXTENSION_GROUP = "extension";
+    private final Pattern extensionPattern = Pattern.compile(String.format(".*(?<%s>\\..*)", EXTENSION_GROUP));
+
+    public boolean accept(File pathName, Set<String> fileExtensions) {
+        // Ignore files irrelevant for statistics
+        if (!hasProperFileExtension(pathName, new HashSet<>(fileExtensions))) {
+            log.debug("Ignored {}", pathName);
+            return false;
         }
 
-        ResultStatistic.getInstance().total();
+        if (!hasMatchingPattern(pathName)
+                || !isNewer(pathName)
+                || isExcluded(pathName, new HashSet<>(excluded))) {
+            log.debug("Excluded {}", pathName);
             ResultStatistic.getInstance().excluded();
             return false;
         }
 
-    private static boolean hasProperFileExtension(File pathName, String[] fileExtensions) {
-        return StringUtils.endsWithAny(pathName.getAbsolutePath().toLowerCase(), fileExtensions);
+        return true;
     }
 
-    private static boolean hasMatchingPattern(File pathName) {
-        return Config.getInstance().getIncludePattern().matcher(pathName.getName()).matches();
+    private boolean hasProperFileExtension(File pathName, Set<String> fileExtensions) {
+        Matcher matcher = extensionPattern.matcher(pathName.getName());
+        return matcher.find() && fileExtensions.contains(matcher.group(EXTENSION_GROUP));
     }
 
-    private static boolean isNewer(File pathName) {
-        Config config = Config.getInstance();
-        if (config.getFilterDate() == null) return true;
+    private boolean hasMatchingPattern(File pathName) {
+        return includePattern.matcher(pathName.getName()).matches();
+    }
+
+    private boolean isNewer(File pathName) {
+        if (filterDate == 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);
+            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());
+    private boolean isNewer(Date creationDate) {
+        return creationDate.toInstant().isAfter(filterDate.toInstant());
+    }
+
+    private boolean isExcluded(File pathName, Set<String> excludedDirs) {
+        if (excludedDirs.contains(pathName.getPath())) return true;
+
+        String[] pathSplit = pathName.getPath().split("/");
+        for (String excludedDir : excludedDirs) {
+            String[] excludeSplit = excludedDir.split("/");
+            if (excludeSplit.length > pathSplit.length) continue;
+            boolean matchingPaths = true;
+            for (int i = 0; i < excludeSplit.length; i++) {
+                if (!excludeSplit[i].equals(pathSplit[i])) {
+                       matchingPaths = false;
+                       break;
+                }
+            }
+            if (matchingPaths) return true;
+        }
+
+        return false;
     }
 }

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

@@ -1,51 +0,0 @@
-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;
-
-import java.io.File;
-import java.io.IOException;
-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);
-
-    /**
-     * 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);
-
-    /**
-     * 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,49 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl;
-
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-@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))) {
-            return paths.filter(Files::isRegularFile)
-                    .map(Path::toFile)
-                    .filter(file -> FileFilter.accept(file, fileExtensions))
-                    .collect(Collectors.toList());
-        } catch (IOException e) {
-            log.error("Couldn't find file or directory!", e);
-            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,193 +0,0 @@
-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.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.core.util.IOUtils;
-
-import java.io.File;
-import java.io.IOException;
-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;
-
-@Slf4j
-public class MkvFileProcessor implements FileProcessor {
-    private final ObjectMapper mapper = new ObjectMapper();
-
-    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 DISABLE_FORCED_TRACK = "--edit track:%s --set flag-forced=0 ";
-    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;
-        List<FileAttribute> fileAttributes = new ArrayList<>();
-        try {
-            String command = format("\"%s\"", Config.getInstance().getPathFor(MkvToolNix.MKV_MERGER));
-            String[] arguments = new String[]{
-                    command,
-                    "--identify",
-                    "--identification-format",
-                    "json",
-                    file.getAbsoluteFile().toString()
-            };
-
-            InputStream inputStream = Runtime.getRuntime().exec(arguments).getInputStream();
-            jsonMap = mapper.readValue(inputStream, Map.class);
-            List<Map<String, Object>> tracks = (List<Map<String, Object>>) jsonMap.get("tracks");
-            if (tracks == null) {
-                log.warn("Couldn't retrieve information of {}", file.getAbsolutePath());
-                return new ArrayList<>();
-            }
-            for (Map<String, Object> attribute : tracks) {
-                if (!"video".equals(attribute.get("type"))) {
-                    Map<String, Object> properties = (Map<String, Object>) attribute.get("properties");
-                    fileAttributes.add(new FileAttribute(
-                            (int) properties.get("number"),
-                            (String) properties.get("language"),
-                            (String) properties.get("track_name"),
-                            (Boolean) properties.getOrDefault("default_track", false),
-                            (Boolean) properties.getOrDefault("forced_track", false),
-                            LaneType.valueOf(((String) attribute.get("type")).toUpperCase(Locale.ENGLISH))));
-                }
-            }
-
-            log.debug(fileAttributes.toString());
-        } catch (IOException e) {
-            log.error("File could not be found or loaded: ", e);
-            System.out.println("File could not be found or loaded: " + file.getAbsolutePath());
-        }
-        return fileAttributes;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void detectDefaultTracks(FileInfoDto info, List<FileAttribute> attributes, List<FileAttribute> nonForcedTracks) {
-        for (FileAttribute attribute : attributes) {
-            if (AUDIO.equals(attribute.getType())) {
-                if (attribute.isDefaultTrack()) info.getExistingDefaultAudioLanes().add(attribute);
-                if (attribute.isForcedTrack()) info.getExistingForcedAudioLanes().add(attribute);
-            } else if (SUBTITLES.equals(attribute.getType())) {
-                if (attribute.isDefaultTrack()) info.getExistingDefaultSubtitleLanes().add(attribute);
-
-                if (attribute.isForcedTrack()) info.getExistingForcedSubtitleLanes().add(attribute);
-                else if (!nonForcedTracks.contains(attribute)) info.getDesiredForcedSubtitleLanes().add(attribute);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void detectDesiredTracks(FileInfoDto info, List<FileAttribute> nonForcedTracks, List<FileAttribute> nonCommentaryTracks,
-                                    AttributeConfig... configs) {
-        Set<FileAttribute> tracks = SetUtils.retainOf(nonForcedTracks, nonCommentaryTracks);
-        Set<FileAttribute> audioTracks = tracks.stream().filter(a -> AUDIO.equals(a.getType())).collect(Collectors.toSet());
-        Set<FileAttribute> subtitleTracks = tracks.stream().filter(a -> SUBTITLES.equals(a.getType())).collect(Collectors.toSet());
-
-        for (AttributeConfig config : configs) {
-            Optional<FileAttribute> desiredAudio = detectDesiredTrack(config.getAudioLanguage(), audioTracks).findFirst();
-            Optional<FileAttribute> desiredSubtitle = detectDesiredSubtitleTrack(config.getSubtitleLanguage(), subtitleTracks).findFirst();
-
-            if (desiredAudio.isPresent() && ("OFF".equals(config.getSubtitleLanguage()) || desiredSubtitle.isPresent())) {
-                info.setMatchedConfig(config);
-                info.setDesiredDefaultAudioLane(desiredAudio.get());
-                info.setDesiredDefaultSubtitleLane(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 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.getExistingDefaultAudioLanes() != null && !fileInfo.getExistingDefaultAudioLanes().isEmpty()) {
-                for (FileAttribute track: fileInfo.getExistingDefaultAudioLanes()) {
-                    sb.append(format(DISABLE_DEFAULT_TRACK, track.getId()));
-                }
-            }
-            sb.append(format(ENABLE_DEFAULT_TRACK, fileInfo.getDesiredDefaultAudioLane().getId()));
-        }
-
-        if (!fileInfo.getExistingForcedAudioLanes().isEmpty()) {
-            for (FileAttribute track: fileInfo.getExistingForcedAudioLanes()) {
-                sb.append(format(DISABLE_FORCED_TRACK, track.getId()));
-            }
-        }
-
-        if (fileInfo.isSubtitleDifferent()) {
-            if (fileInfo.getExistingDefaultSubtitleLanes() != null && !fileInfo.getExistingDefaultSubtitleLanes().isEmpty()) {
-                for (FileAttribute track: fileInfo.getExistingDefaultSubtitleLanes()) {
-                    sb.append(format(DISABLE_DEFAULT_TRACK, track.getId()));
-                }
-            }
-            if (fileInfo.getDesiredDefaultSubtitleLane() != null) {
-                sb.append(format(ENABLE_DEFAULT_TRACK, fileInfo.getDesiredDefaultSubtitleLane().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();
-        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

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

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/converter/AttributeConfigConverter.java

@@ -0,0 +1,47 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.converter;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
+import picocli.CommandLine;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.LanguageValidatorUtil.isLanguageValid;
+
+public class AttributeConfigConverter implements CommandLine.ITypeConverter<AttributeConfig> {
+    private static final String AUDIO_GROUP = "audio";
+    private static final String SUB_GROUP = "sub";
+    private static final Pattern PATTERN = Pattern.compile(String.format("^(?<%s>.{3}):(?<%s>.{3})$", AUDIO_GROUP, SUB_GROUP));
+
+    /**
+     * Converts the input string into an AttributeConfig object.
+     *
+     * @param s The input string containing audio and subtitle language configuration in format "audioLang:subtitleLang"
+     * @return An AttributeConfig object representing the parsed configuration
+     * @throws CommandLine.TypeConversionException if the input string is invalid or contains invalid language codes
+     */
+    @Override
+    public AttributeConfig convert(String s) {
+        Matcher matcher =  PATTERN.matcher(s);
+
+        if (!matcher.find()) throw new CommandLine.TypeConversionException("Invalid Attribute config: " + s);
+
+        return validateResult(new AttributeConfig(matcher.group(AUDIO_GROUP), matcher.group(SUB_GROUP)));
+    }
+
+    /**
+     * Validates that both language codes in the {@link AttributeConfig} object are valid.
+     *
+     * @param attr {@link AttributeConfig} object to validate
+     * @throws CommandLine.TypeConversionException if either language code is invalid
+     * @return valid {@link AttributeConfig}
+     */
+    private static AttributeConfig validateResult(AttributeConfig attr) {
+        if (!isLanguageValid(attr.getAudioLanguage()))
+            throw new CommandLine.TypeConversionException("Audio language invalid: " + attr.getAudioLanguage());
+        if (!isLanguageValid(attr.getSubtitleLanguage()))
+            throw new CommandLine.TypeConversionException("Subtitle language invalid: " + attr.getSubtitleLanguage());
+
+        return attr;
+    }
+}

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

@@ -1,173 +0,0 @@
-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

@@ -1,109 +0,0 @@
-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.List;
-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.getDesiredDefaultSubtitleLane() != null)
-                    && elem.getDesiredDefaultAudioLane() != 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.setDesiredDefaultAudioLane(null);
-                f.setDesiredDefaultSubtitleLane(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

@@ -1,36 +0,0 @@
-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/impl/processors/AttributeChangeProcessor.java

@@ -0,0 +1,133 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.processors;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.SubtitleTrackComparator;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.*;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+public class AttributeChangeProcessor {
+    private final SubtitleTrackComparator subtitleTrackComparator;
+    private final Set<String> commentaryKeywords;
+    private final Set<String> hearingImpairedKeywords;
+    private final Set<String> forcedKeywords;
+
+    public AttributeChangeProcessor(String[] preferredSubtitles, Set<String> forcedKeywords, Set<String> commentaryKeywords, Set<String> hearingImpairedKeywords) {
+        this.subtitleTrackComparator = new SubtitleTrackComparator(preferredSubtitles);
+        this.commentaryKeywords = commentaryKeywords;
+        this.hearingImpairedKeywords = hearingImpairedKeywords;
+        this.forcedKeywords = forcedKeywords;
+    }
+
+    private List<TrackAttributes> filterForPossibleDefaults(List<TrackAttributes> tracks) {
+        Stream<TrackAttributes> attributes = tracks.stream();
+
+        if (true) { // TODO: config for including commentary
+            attributes = attributes
+                    .filter(attr -> !attr.commentary())
+                    .filter(attr -> {
+                        if (attr.trackName() == null) return true;
+                        return commentaryKeywords.stream().noneMatch(keyword -> keyword.compareToIgnoreCase(attr.trackName()) == 0);
+                    });
+
+        }
+
+        if (true) { // TODO: config for including hearing impaired
+            attributes = attributes
+                    .filter(attr -> !attr.hearingImpaired())
+                    .filter(attr -> {
+                        if (attr.trackName() == null) return true;
+                        return hearingImpairedKeywords.stream().noneMatch(keyword -> keyword.compareToIgnoreCase(attr.trackName()) == 0);
+                    });;
+        }
+
+        return attributes
+                .filter(attr -> !attr.forced())
+                .filter(attr -> {
+                    if (attr.trackName() == null) return true;
+                    return forcedKeywords.stream().noneMatch(keyword -> keyword.compareToIgnoreCase(attr.trackName()) == 0);
+                })
+                .toList();
+    }
+
+    public void findDefaultMatchAndApplyChanges(FileInfo fileInfo, AttributeConfig... configs) {
+        Map<String, List<TrackAttributes>> audiosByLanguage = new HashMap<>(fileInfo.getTracks().size());
+        Map<String, List<TrackAttributes>> subsByLanguage = new HashMap<>(fileInfo.getTracks().size());
+        filterForPossibleDefaults(fileInfo.getTracks()).forEach(track -> {
+            if (TrackType.AUDIO.equals(track.type()))
+                audiosByLanguage.computeIfAbsent(track.language(), (k) -> new ArrayList<>()).add(track);
+            else if (TrackType.SUBTITLES.equals(track.type()))
+                subsByLanguage.computeIfAbsent(track.language(), (k) -> new ArrayList<>()).add(track);
+        });
+
+        for (AttributeConfig config : configs) {
+            if (("OFF".equals(config.getAudioLanguage()) || audiosByLanguage.containsKey(config.getAudioLanguage()))
+                    && ("OFF".equals(config.getSubtitleLanguage()) || subsByLanguage.containsKey(config.getSubtitleLanguage()))) {
+                fileInfo.setMatchedConfig(config);
+                break;
+            }
+            // TODO: forced if OFF
+        }
+
+        if (fileInfo.getMatchedConfig() == null) return;
+
+        applyDefaultChanges(fileInfo, FileInfo::getAudioTracks, fileInfo.getMatchedConfig().getAudioLanguage(),
+                () -> audiosByLanguage.get(fileInfo.getMatchedConfig().getAudioLanguage()).get(0));
+        applyDefaultChanges(fileInfo, FileInfo::getSubtitleTracks, fileInfo.getMatchedConfig().getSubtitleLanguage(),
+                () -> subsByLanguage.get(fileInfo.getMatchedConfig().getSubtitleLanguage()).stream().max(subtitleTrackComparator).get());
+    }
+
+    private void applyDefaultChanges(FileInfo fileInfo, Function<FileInfo, List<TrackAttributes>> tracks, String language, Supplier<TrackAttributes> targetDefaultSupplier) {
+        tracks.apply(fileInfo).stream()
+                .filter(TrackAttributes::defaultt)
+                .forEach(attr -> fileInfo.getChanges().getDefaultTrack().put(attr, false));
+        if (!"OFF".equals(language)) {
+            TrackAttributes targetDefault = targetDefaultSupplier.get();
+            if (fileInfo.getChanges().getDefaultTrack().containsKey(targetDefault)) {
+                fileInfo.getChanges().getDefaultTrack().remove(targetDefault);
+            } else {
+                fileInfo.getChanges().getDefaultTrack().put(targetDefault, true);
+            }
+        }
+    }
+
+    public void findForcedTracksAndApplyChanges(FileInfo fileInfo, boolean overwrite) {
+        Stream<TrackAttributes> forcedTracks = fileInfo.getTracks().stream()
+                .filter(track -> track.trackName() != null)
+                .filter(track -> forcedKeywords.stream().anyMatch(keyword -> track.trackName().toLowerCase().contains(keyword.toLowerCase(Locale.ROOT))));
+
+        if (overwrite) {
+            fileInfo.getTracks().stream().filter(TrackAttributes::forced).forEach(attr -> {
+                fileInfo.getChanges().getForcedTrack().put(attr, false);
+            });
+        } else {
+            forcedTracks = forcedTracks.filter(attr -> !attr.forced());
+        }
+
+        forcedTracks.forEach(attr -> {
+            fileInfo.getChanges().getForcedTrack().put(attr, true);
+        });
+    }
+
+    public void findCommentaryTracksAndApplyChanges(FileInfo fileInfo) {
+        fileInfo.getTracks().stream()
+                .filter(track -> !track.commentary())
+                .filter(track -> track.trackName() != null)
+                .filter(track -> commentaryKeywords.stream().anyMatch(keyword -> track.trackName().toLowerCase().contains(keyword.toLowerCase(Locale.ROOT))))
+                .forEach(attr -> {
+                    fileInfo.getChanges().getCommentaryTrack().put(attr, true);
+                });
+    }
+
+    public void findHearingImpairedTracksAndApplyChanges(FileInfo fileInfo) {
+        fileInfo.getTracks().stream()
+                .filter(track -> !track.hearingImpaired())
+                .filter(track -> track.trackName() != null)
+                .filter(track -> hearingImpairedKeywords.stream().anyMatch(keyword -> track.trackName().toLowerCase().contains(keyword.toLowerCase(Locale.ROOT))))
+                .forEach(attr -> {
+                    fileInfo.getChanges().getHearingImpairedTrack().put(attr, true);
+                });
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/processors/AttributeUpdater.java

@@ -0,0 +1,127 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.processors;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.exceptions.MkvToolNixException;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfo;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.InputConfig;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ResultStatistic;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+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.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+public abstract class AttributeUpdater {
+
+    protected final InputConfig config;
+    protected final FileProcessor fileProcessor;
+    protected final AttributeChangeProcessor attributeChangeProcessor;
+    protected final ResultStatistic statistic = ResultStatistic.getInstance();
+
+    private final ExecutorService executor;
+
+    public AttributeUpdater(InputConfig config, FileProcessor fileProcessor, AttributeChangeProcessor attributeChangeProcessor) {
+        this.config = config;
+        this.fileProcessor = fileProcessor;
+        this.attributeChangeProcessor = attributeChangeProcessor;
+        this.executor = Executors.newFixedThreadPool(config.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 = getFiles();
+
+            progressBar.maxHint(files.size());
+            progressBar.refresh();
+
+            files.forEach(file -> executor.submit(() -> {
+                process(file);
+                progressBar.step();
+            }));
+
+            executor.shutdown();
+            executor.awaitTermination(1, TimeUnit.DAYS);
+        }
+
+//        writeLastExecutionDate();
+
+        statistic.stopTimer();
+        statistic.print();
+    }
+
+    protected abstract List<File> getFiles();
+
+    /**
+     * 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
+     */
+    protected abstract void process(File file);
+
+    /**
+     * Persist file changes.
+     *
+     * @param fileInfo contains information about file and desired configuration.
+     */
+    protected void checkStatusAndUpdate(FileInfo fileInfo) {
+        if (!fileInfo.getChanges().isEmpty()) {
+            statistic.changePlanned();
+
+            if (config.isSafeMode()) return;
+
+            try {
+                fileProcessor.update(fileInfo);
+                statistic.changeSuccessful();
+                log.info("Commited {} to '{}'", fileInfo.getMatchedConfig().toStringShort(), fileInfo.getFile().getPath());
+            } catch (IOException | MkvToolNixException e) {
+                statistic.changeFailed();
+                log.warn("Couldn't commit {} to '{}'", fileInfo.getMatchedConfig().toStringShort(), fileInfo.getFile().getPath(), e);
+            }
+        } else if (fileInfo.getChanges().isEmpty()) {
+            statistic.unchanged();
+        } else {
+            statistic.unknownFailed();
+        }
+    }
+
+    // should this be here?
+//    protected void writeLastExecutionDate() {
+//        if (config.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.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/processors/CachedFileProcessor.java

@@ -0,0 +1,42 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.processors;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.exceptions.MkvToolNixException;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.Cache;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfo;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+public class CachedFileProcessor implements FileProcessor {
+    private final FileProcessor processor;
+    Cache<String, List<File>> fileCache = new Cache<>();
+    Cache<Pair<String, Integer>, List<File>> directoryCache = new Cache<>();
+    Cache<File, FileInfo> attributeCache = new Cache<>();
+
+    public CachedFileProcessor(FileProcessor processor) {
+        this.processor = processor;
+    }
+
+    @Override
+    public List<File> loadFiles(String path) {
+        return fileCache.retrieve(path, processor::loadFiles);
+    }
+
+    @Override
+    public List<File> loadDirectory(String path, int depth) {
+        return directoryCache.retrieve(Pair.of(path, depth), key -> processor.loadDirectory(key.getLeft(), key.getRight()));
+    }
+
+    @Override
+    public FileInfo readAttributes(File file) {
+        return attributeCache.retrieve(file, processor::readAttributes);
+    }
+
+    @Override
+    public void update(FileInfo fileInfo) throws IOException, MkvToolNixException {
+        processor.update(fileInfo);
+    }
+
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/processors/CoherentAttributeUpdater.java

@@ -0,0 +1,103 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.processors;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfo;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.InputConfig;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
+import lombok.extern.slf4j.Slf4j;
+import me.tongfei.progressbar.ProgressBarBuilder;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@Slf4j
+public class CoherentAttributeUpdater extends SingleFileAttributeUpdater {
+
+    public CoherentAttributeUpdater(InputConfig config, FileProcessor processor, AttributeChangeProcessor attributeChangeProcessor) {
+        super(config, processor, attributeChangeProcessor);
+    }
+
+    @Override
+    protected ProgressBarBuilder pbBuilder() {
+        return super.pbBuilder()
+                .setUnit(" directories", 1);
+    }
+
+    protected List<File> getFiles() {
+        return fileProcessor.loadDirectory(config.getLibraryPath().getPath(), config.getCoherent());
+    }
+
+    @Override
+    public void process(File rootDir) {
+        if (rootDir.isFile()) {
+            super.process(rootDir);
+            return;
+        }
+
+        List<File> files = fileProcessor.loadFiles(rootDir.getPath());
+        Set<FileInfo> matchedFiles = new HashSet<>(files.size() * 2);
+
+        for (AttributeConfig config: config.getAttributeConfig()) {
+            AttributeConfig matchedConfig = findMatch(config, matchedFiles, files);
+
+            if (matchedConfig == null) continue;
+            if (matchedFiles.size() != files.size()) {
+                log.warn("Skip applying changes: Found coherent match, but matched count is different than file count (matched: {}, files: {}, dir: {})",
+                        matchedFiles.size(), files.size(), rootDir.getPath());
+            }
+
+            matchedFiles.forEach(fileInfo -> {
+                attributeChangeProcessor.findForcedTracksAndApplyChanges(fileInfo, this.config.isOverwriteForced());
+                attributeChangeProcessor.findCommentaryTracksAndApplyChanges(fileInfo);
+                attributeChangeProcessor.findHearingImpairedTracksAndApplyChanges(fileInfo);
+
+                checkStatusAndUpdate(fileInfo);
+            });
+            return; // match was found and process must be stopped
+        }
+
+        // Couldn't match any config at current level. Resetting changes and trying to one level deeper
+        matchedFiles.forEach(fileInfo -> {
+            fileInfo.resetChanges();
+            fileInfo.setMatchedConfig(null);
+        });
+
+        if (config.isForceCoherent()) {
+            log.info("No coherent match found, aborting: {}", rootDir.getPath());
+            statistic.increaseUnchangedBy(files.size());
+            return;
+        }
+
+        log.info("No coherent match found, trying to find coherent match in child directories: {}", rootDir.getPath());
+        for (File dir: fileProcessor.loadDirectory(rootDir.getPath(), 1)) this.process(dir);
+    }
+
+    private AttributeConfig findMatch(AttributeConfig config, Set<FileInfo> matchedFiles, List<File> files) {
+        AttributeConfig matchedConfig = null;
+        matchedFiles.clear();
+
+        for (File file: files)  {
+            FileInfo fileInfo = fileProcessor.readAttributes(file);
+            fileInfo.resetChanges();
+            fileInfo.setMatchedConfig(null);
+
+            if (fileInfo.getTracks().isEmpty()) {
+                log.warn("No attributes found for file {}", file);
+                statistic.unknownFailed();
+                break;
+            }
+
+            attributeChangeProcessor.findDefaultMatchAndApplyChanges(fileInfo, config);
+
+            if (matchedConfig == null) matchedConfig = fileInfo.getMatchedConfig();
+            if (matchedConfig == null || matchedConfig != fileInfo.getMatchedConfig()) {
+                matchedConfig = null;
+                break;
+            }
+            matchedFiles.add(fileInfo);
+        }
+
+        return matchedConfig;
+    }
+}

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

@@ -0,0 +1,51 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.processors;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.exceptions.MkvToolNixException;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfo;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+public interface FileProcessor {
+
+    /**
+     * @param path leads to one file directly or a directory which will be loaded recursively
+     * @return list of all files within the directory
+     */
+    List<File> loadFiles(String path);
+
+    /**
+     * Load only directories and files at depth, ignoring everything between root dir and dir at depth.
+     * E.g. with file structure /base/depth1/depth2/depth3.file
+     *   - with depth 1: return /base/depth1/
+     *   - with depth 2: returns /base/depth1/depth2/
+     *
+     * @param path directory which will be loaded recursively until depth
+     * @param depth limit directory crawling
+     * @return list of directory at depth
+     */
+    List<File> loadDirectory(String path, int depth);
+
+    /**
+     * Load track information from file.
+     *
+     * @param file Takes the file from which the attributes will be returned
+     * @return list of all important attributes
+     */
+    FileInfo readAttributes(File file);
+
+    /**
+     * Update the file.
+     *
+     * @param fileInfo information used to update file
+     * @throws IOException         when error occurs accessing file retrieving information
+     * @throws MkvToolNixException when error occurs while sending query to mkvpropedit
+     */
+    void update(FileInfo fileInfo) throws IOException, MkvToolNixException;
+
+    default InputStream run(String[] command) throws IOException {
+        return Runtime.getRuntime().exec(command).getInputStream();
+    }
+}

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

@@ -0,0 +1,175 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.processors;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.exceptions.MkvToolNixException;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.FileFilter;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.*;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.core.util.IOUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.FileUtils.getPathFor;
+
+@Slf4j
+@RequiredArgsConstructor
+public class MkvFileProcessor implements FileProcessor {
+    protected final File mkvToolNixInstallation;
+    protected final FileFilter fileFilter;
+
+    private final ObjectMapper mapper = new ObjectMapper();
+
+    private static final Set<String> fileExtensions = new HashSet<>(Set.of(".mkv", ".mka", ".mks", ".mk3d"));
+
+    private static final String DEFAULT_TRACK = "--edit track:%s --set flag-default=%s";
+    private static final String FORCED_TRACK = "--edit track:%s --set flag-forced=%s";
+    private static final String COMMENTARY_TRACK = "--edit track:%s --set flag-commentary=%s";
+    private static final String HEARING_IMPAIRED_TRACK = "--edit track:%s --set flag-hearing-impaired=%s";
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public List<File> loadFiles(String path) {
+        try (Stream<Path> paths = Files.walk(Paths.get(path))) {
+            return paths
+                    .filter(Files::isRegularFile)
+                    .map(Path::toFile)
+                    .filter(file -> fileFilter.accept(file, fileExtensions))
+                    .collect(Collectors.toList());
+        } catch (IOException e) {
+            log.error("Couldn't find file or directory!", e);
+            return new ArrayList<>();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    // does this load /arst/arst & /arst ?
+    public List<File> loadDirectory(String path, int depth) {
+        File rootDir = Path.of(path).toFile();
+        if (!rootDir.exists()) {
+            log.error("Couldn't find file or directory!");
+            return new ArrayList<>();
+        }
+
+        List<File> result = new ArrayList<>();
+        exploreDirectory(rootDir, 0, depth, result);
+        return result;
+    }
+
+    /**
+     * Recursively explores directories to find items at the target depth.
+     *
+     * @param currentDir   The current directory being explored
+     * @param currentDepth The current depth level
+     * @param targetDepth  The target depth to collect files
+     * @param result       The collection to store found files
+     */
+    private static void exploreDirectory(File currentDir, int currentDepth, int targetDepth, List<File> result) {
+        if (currentDepth == targetDepth) {
+            result.add(currentDir);
+            return;
+        }
+
+        // Get all files and directories in the current directory
+        File[] files = currentDir.listFiles();
+        if (files == null) return;
+
+        // Recursively explore subdirectories
+        for (File file : files) {
+            if (file.isDirectory()) {
+                exploreDirectory(file, currentDepth + 1, targetDepth, result);
+            } else if (currentDepth + 1 == targetDepth) {
+                // If files at the next level would be at the target depth, include them
+                result.add(file);
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public FileInfo readAttributes(File file) {
+        FileInfo fileInfo = new FileInfo(file);
+        try {
+            String[] command = new String[]{
+                    getPathFor(mkvToolNixInstallation, MkvToolNix.MKV_MERGE).getAbsolutePath(),
+                    "--identify",
+                    "--identification-format",
+                    "json",
+                    file.getAbsolutePath()
+            };
+
+            log.debug("Executing: {}", String.join(" ", command));
+            InputStream inputStream = run(command);
+            Map<String, Object> jsonMap = mapper.readValue(inputStream, Map.class);
+            List<Map<String, Object>> tracks = (List<Map<String, Object>>) jsonMap.get("tracks");
+            if (tracks != null) {
+                for (Map<String, Object> attribute : tracks) {
+                    if (!"video".equals(attribute.get("type"))) {
+                        Map<String, Object> properties = (Map<String, Object>) attribute.get("properties");
+                        fileInfo.addTrack(new TrackAttributes(
+                                (int) properties.get("number"),
+                                (String) properties.get("language"),
+                                (String) properties.get("track_name"),
+                                (Boolean) properties.getOrDefault("default_track", false),
+                                (Boolean) properties.getOrDefault("forced_track", false),
+                                (Boolean) properties.getOrDefault("commentary_track", false),
+                                (Boolean) properties.getOrDefault("flag_hearing_impaired", false),
+                                TrackType.valueOf(((String) attribute.get("type")).toUpperCase(Locale.ENGLISH))));
+                    }
+                }
+            } else {
+                log.warn("Couldn't retrieve information of {}", file.getAbsolutePath());
+            }
+
+            log.debug("File attributes of '{}': {}", file.getAbsolutePath(), fileInfo.getTracks());
+        } catch (IOException e) {
+            log.error("File could not be found or loaded: ", e);
+            System.out.println("File could not be found or loaded: " + file.getAbsolutePath());
+        }
+        return fileInfo;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void update(FileInfo fileInfo) throws IOException, MkvToolNixException {
+        String[] command = getUpdateCommand(fileInfo);
+        log.debug("Executing '{}'", String.join(" ", command));
+        InputStream inputstream = run(command);
+        String output = IOUtils.toString(new InputStreamReader(inputstream));
+        log.debug("Result: {}", output.replaceAll("\\n", " '"));
+        if (output.contains("Error")) throw new MkvToolNixException(output);
+    }
+
+    private String[] getUpdateCommand(FileInfo fileInfo)  {
+        List<String> command = new ArrayList<>();
+        command.add(getPathFor(mkvToolNixInstallation, MkvToolNix.MKV_PROP_EDIT).getAbsolutePath());
+        command.add(String.format(fileInfo.getFile().getAbsolutePath()));
+
+        PlannedChange changes = fileInfo.getChanges();
+        changes.getDefaultTrack().forEach((key, value) -> command.addAll(format(DEFAULT_TRACK, key.id(), value ? 1 : 0)));
+        changes.getForcedTrack().forEach((key, value) -> command.addAll(format(FORCED_TRACK, key.id(), value ? 1 : 0)));
+        changes.getCommentaryTrack().forEach((key, value) -> command.addAll(format(COMMENTARY_TRACK, key.id(), value ? 1 : 0)));
+        changes.getHearingImpairedTrack().forEach((key, value) -> command.addAll(format(HEARING_IMPAIRED_TRACK, key.id(), value ? 1 : 0)));
+        return command.toArray(new String[0]);
+    }
+
+    private List<String> format(String format, Object... args) {
+        return Arrays.asList(String.format(format, args).split(" "));
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/processors/SingleFileAttributeUpdater.java

@@ -0,0 +1,46 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.processors;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfo;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.InputConfig;
+import lombok.extern.slf4j.Slf4j;
+import me.tongfei.progressbar.ProgressBarBuilder;
+
+import java.io.File;
+import java.util.List;
+
+@Slf4j
+public class SingleFileAttributeUpdater extends AttributeUpdater {
+
+    public SingleFileAttributeUpdater(InputConfig config, FileProcessor processor, AttributeChangeProcessor attributeChangeProcessor) {
+        super(config, processor, attributeChangeProcessor);
+    }
+
+    @Override
+    protected ProgressBarBuilder pbBuilder() {
+        return super.pbBuilder()
+                .setUnit(" files", 1);
+    }
+
+    @Override
+    protected List<File> getFiles() {
+        return fileProcessor.loadFiles(config.getLibraryPath().getPath());
+    }
+
+    @Override
+    public void process(File file) {
+        FileInfo fileInfo = fileProcessor.readAttributes(file);
+
+        if (fileInfo.getTracks().isEmpty()) {
+            log.warn("No attributes found for file {}", file);
+            statistic.unknownFailed();
+            return;
+        }
+
+        attributeChangeProcessor.findDefaultMatchAndApplyChanges(fileInfo, config.getAttributeConfig());
+        attributeChangeProcessor.findForcedTracksAndApplyChanges(fileInfo, config.isOverwriteForced());
+        attributeChangeProcessor.findCommentaryTracksAndApplyChanges(fileInfo);
+        attributeChangeProcessor.findHearingImpairedTracksAndApplyChanges(fileInfo);
+
+        checkStatusAndUpdate(fileInfo);
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/validation/ValidFile.java

@@ -0,0 +1,16 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.validation;
+
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
+import java.lang.annotation.*;
+
+@Documented
+@Constraint(validatedBy = ValidFileValidator.class)
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ValidFile {
+    String message() default "File does not exist";
+    Class<?>[] groups() default {};
+    Class<? extends Payload>[] payload() default {};
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/validation/ValidFileValidator.java

@@ -0,0 +1,17 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.validation;
+
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
+import java.io.File;
+
+public class ValidFileValidator implements ConstraintValidator<ValidFile, File> {
+    @Override
+    public void initialize(ValidFile constraintAnnotation) {
+    }
+
+    @Override
+    public boolean isValid(File file, ConstraintValidatorContext context) {
+        return file != null && file.exists();
+    }
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/validation/ValidMkvToolNix.java

@@ -0,0 +1,16 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.validation;
+
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
+import java.lang.annotation.*;
+
+@Documented
+@Constraint(validatedBy = ValidMkvToolNixValidator.class)
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ValidMkvToolNix {
+    String message() default "MkvToolNix does not exist";
+    Class<?>[] groups() default {};
+    Class<? extends Payload>[] payload() default {};
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/validation/ValidMkvToolNixValidator.java

@@ -0,0 +1,24 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.validation;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
+import java.io.File;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.FileUtils.getPathFor;
+
+public class ValidMkvToolNixValidator implements ConstraintValidator<ValidMkvToolNix, File> {
+    @Override
+    public void initialize(ValidMkvToolNix constraintAnnotation) {
+    }
+
+    @Override
+    public boolean isValid(File file, ConstraintValidatorContext context) {
+        return file != null && file.exists()
+                && getPathFor(file, MkvToolNix.MKV_MERGE).exists()
+                && getPathFor(file, MkvToolNix.MKV_PROP_EDIT).exists();
+    }
+
+
+}

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/validation/ValidationExecutionStrategy.java

@@ -0,0 +1,31 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.validation;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.CommandRunner;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.InputConfig;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.ValidationUtil;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
+import picocli.CommandLine;
+
+import java.util.Set;
+
+public class ValidationExecutionStrategy implements CommandLine.IExecutionStrategy {
+
+    public int execute(CommandLine.ParseResult parseResult) {
+        if (!parseResult.isVersionHelpRequested() && !parseResult.isUsageHelpRequested()) validate(parseResult.commandSpec());
+        return new CommandLine.RunLast().execute(parseResult);
+    }
+
+    private static void validate(CommandLine.Model.CommandSpec spec) {
+        Validator validator = ValidationUtil.getValidator();
+        Set<ConstraintViolation<InputConfig>> violations = validator.validate(((CommandRunner)spec.userObject()).getConfig());
+
+        if (!violations.isEmpty()) {
+            StringBuilder errors = new StringBuilder();
+            for (ConstraintViolation<InputConfig> violation : violations) {
+                errors.append(violation.getPropertyPath()).append(" ").append(violation.getMessage()).append("\n");
+            }
+            throw new CommandLine.ParameterException(spec.commandLine(), errors.toString());
+        }
+    }
+}

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

@@ -13,6 +13,10 @@ public class AttributeConfig {
     private final String audioLanguage;
     private final String subtitleLanguage;
 
+    public static AttributeConfig of(String audioLanguage, String subtitleLanguage)  {
+        return new AttributeConfig(audioLanguage, subtitleLanguage);
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -26,6 +30,10 @@ public class AttributeConfig {
         return Objects.hash(audioLanguage, subtitleLanguage);
     }
 
+    public String toStringShort()  {
+        return audioLanguage + ":" + subtitleLanguage;
+    }
+
     @Override
     public String toString() {
         return "AttributeConfig{"

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

@@ -1,68 +0,0 @@
-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 {
-    LIBRARY("library-path", "Path to library", "l", 1),
-    ATTRIBUTE_CONFIG("attribute-config", "Attribute config to decide which tracks to choose when", "a", Option.UNLIMITED_VALUES),
-    CONFIG_PATH("config-path", "Path to config file", "p", 1),
-    MKV_TOOL_NIX("mkvtoolnix", "Path to mkv tool nix installation", "m", 1),
-    SAFE_MODE("safe-mode", "Test run (no files will be changes)", "s", 0),
-    COHERENT("coherent", "Try to match all files in dir of depth with the same config", "c", 1),
-    FORCE_COHERENT("force-coherent", "Force coherent and don't update anything if config fits not whole config (default: false)", "cf", 0),
-    WINDOWS("windows", "Is operating system windows", null, 0),
-    ONLY_NEW_FILES("only-new-files", "Sets filter-date to last successful execution (Overwrites input of filter-date)", "n", 0),
-    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 abrv() {
-        return shortParameter;
-    }
-
-    public int args() {
-        return args;
-    }
-}

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

@@ -0,0 +1,56 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+@Getter
+@RequiredArgsConstructor
+public class FileInfo {
+    private final File file;
+
+    @Getter(AccessLevel.NONE)
+    private final List<TrackAttributes> tracks = new ArrayList<>();
+
+    @Getter(AccessLevel.NONE)
+    private final List<TrackAttributes> audioTracks = new ArrayList<>();
+    @Getter(AccessLevel.NONE)
+    private final List<TrackAttributes> subtitleTracks = new ArrayList<>();
+
+    private PlannedChange changes = new PlannedChange();
+    @Setter
+    private AttributeConfig matchedConfig;
+
+    public void addTrack(TrackAttributes track) {
+        tracks.add(track);
+        if (TrackType.AUDIO.equals(track.type())) audioTracks.add(track);
+        else if (TrackType.SUBTITLES.equals(track.type())) subtitleTracks.add(track);
+    }
+
+    public void addTracks(Collection<TrackAttributes> tracks) {
+        for (TrackAttributes track : tracks) addTrack(track);
+    }
+
+    public List<TrackAttributes> getTracks() {
+        return Collections.unmodifiableList(tracks);
+    }
+
+    public List<TrackAttributes> getAudioTracks() {
+        return Collections.unmodifiableList(audioTracks);
+    }
+
+    public List<TrackAttributes> getSubtitleTracks() {
+        return Collections.unmodifiableList(subtitleTracks);
+    }
+
+    public void resetChanges() {
+        changes = new PlannedChange();
+    }
+}

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

@@ -1,79 +0,0 @@
-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> existingDefaultAudioLanes = new HashSet<>();
-    private Set<FileAttribute> existingForcedAudioLanes = new HashSet<>();
-
-    private Set<FileAttribute> existingDefaultSubtitleLanes = new HashSet<>();
-    private Set<FileAttribute> existingForcedSubtitleLanes = new HashSet<>();
-
-    private Set<FileAttribute> desiredForcedSubtitleLanes = new HashSet<>();
-    private FileAttribute desiredDefaultAudioLane;
-    private FileAttribute desiredDefaultSubtitleLane;
-    private AttributeConfig matchedConfig;
-
-    public boolean isAudioDifferent() {
-        return desiredDefaultAudioLane != null &&
-                (existingDefaultAudioLanes == null || !existingDefaultAudioLanes.contains(desiredDefaultAudioLane) || existingDefaultAudioLanes.size() > 1);
-    }
-
-    public boolean isSubtitleDifferent() {
-        return isSubtitleMatchDifferent() || isSubtitleOFF();
-    }
-
-    private boolean isSubtitleMatchDifferent() {
-        return desiredDefaultSubtitleLane != null
-                && (existingDefaultSubtitleLanes == null || !existingDefaultSubtitleLanes.contains(desiredDefaultSubtitleLane) || existingDefaultSubtitleLanes.size() > 1);
-    }
-
-    private boolean isSubtitleOFF() {
-        return desiredDefaultSubtitleLane == null && "OFF".equals(matchedConfig.getSubtitleLanguage()) &&
-                (existingDefaultSubtitleLanes != null && !existingDefaultSubtitleLanes.isEmpty());
-    }
-
-    public boolean areForcedTracksDifferent() {
-        return !desiredForcedSubtitleLanes.isEmpty();
-    }
-
-    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 desiredDefaultAudioLane == null && desiredDefaultSubtitleLane == null;
-    }
-
-    private boolean isAlreadySuitable() {
-        return existingDefaultAudioLanes.contains(desiredDefaultAudioLane) && existingDefaultSubtitleLanes.contains(desiredDefaultSubtitleLane);
-    }
-
-    private boolean isChangeNecessary() {
-        return isAudioDifferent() || isSubtitleDifferent() || areForcedTracksDifferent() || !existingForcedAudioLanes.isEmpty();
-    }
-
-    @Override
-    public String toString() {
-        return "[" + "defaultAudioLanes=" + existingDefaultAudioLanes +
-                ", defaultSubtitleLanes=" + existingDefaultSubtitleLanes +
-                ", desiredForcedSubtitleLanes=" + desiredForcedSubtitleLanes +
-                ", desiredAudioLane=" + desiredDefaultAudioLane +
-                ", desiredSubtitleLane=" + desiredDefaultSubtitleLane +
-                ']';
-    }
-}

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

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

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

@@ -0,0 +1,118 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.converter.AttributeConfigConverter;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.validation.ValidFile;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.validation.ValidMkvToolNix;
+import jakarta.validation.constraints.Min;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.SystemUtils;
+import picocli.CommandLine;
+
+import java.io.File;
+import java.util.*;
+import java.util.regex.Pattern;
+import picocli.CommandLine.Option;
+
+@Slf4j
+@Getter
+@Setter
+@NoArgsConstructor
+@CommandLine.Command
+public class InputConfig implements CommandLine.IVersionProvider {
+
+    private File configPath;
+
+    @CommandLine.Spec
+    CommandLine.Model.CommandSpec spec;
+
+    @ValidFile(message = "does not exist")
+    @CommandLine.Parameters(description = "path to library")
+    private File libraryPath;
+
+    @Option(names = {"-a", "--attribute-config"}, arity = "1..*", converter = AttributeConfigConverter.class,
+            description = "List of audio:subtitle pairs used to match in order and update files accordingly (e.g. jpn:eng jpn:ger)")
+    private AttributeConfig[] attributeConfig = new AttributeConfig[0];
+    @ValidMkvToolNix(message = "does not exist")
+    @Option(names = {"-m", "--mkvtoolnix"}, defaultValue = "${DEFAULT_MKV_TOOL_NIX}", description = "path to mkvtoolnix installation")
+    private File mkvToolNix;
+
+    @Option(names = {"-s", "--safemode"}, description = "test run (no files will be changes)")
+    private boolean safeMode;
+
+    @Min(1)
+    @Option(names = {"-t", "--threads"}, defaultValue = "2", description = "thread count (default: ${DEFAULT-VALUE})")
+    private int threads;
+
+    @Min(0)
+    @Option(names = {"-c", "--coherent"}, description = "try to match all files in dir of depth with the same attribute config. Attempting increasing deeper levels until match is found (worst case applying config on single file basis)")
+    private Integer coherent;
+    @Option(names = {"-cf", "--force-coherent"}, description = "only applies changes if a coherent match was found for the specifically entered depth")
+    private boolean forceCoherent;
+
+    // TODO: implement usage
+//    @Option(names = {"-n", "--only-new-file"}, description = "sets filter-date to last successful execution (overwrites input of filter-date)")
+//    private boolean onlyNewFiles;
+    @Option(names = {"-d", "--filter-date"}, defaultValue = Option.NULL_VALUE, description = "only consider files created newer than entered date (format: \"dd.MM.yyyy-HH:mm:ss\")")
+    private Date filterDate;
+    @Option(names = {"-i", "--include-pattern"}, defaultValue = ".*", description = "include files matching pattern (default: \".*\")")
+    private Pattern includePattern;
+    @Option(names = {"-e", "--exclude"}, arity = "1..*",
+            description = "relative directories and files to be excluded (no wildcard)")
+    private Set<String> excluded = new HashSet<>();
+
+
+    @Option(names =  {"-o", "-overwrite-forced"}, description = "remove all forced flags")
+    private boolean overwriteForced;
+    @Option(names = {"--forced-keywords"}, arity = "1..*", defaultValue = "forced, signs, songs", split = ", ",
+            description = "Keywords to identify forced tracks (Defaults will be overwritten; Default: ${DEFAULT-VALUE})")
+    private Set<String> forcedKeywords;
+    @Option(names = {"--commentary-keywords"}, arity = "1..*", defaultValue = "comment, commentary, director", split = ", ",
+            description = "Keywords to identify commentary tracks (Defaults will be overwritten; Default: ${DEFAULT-VALUE})")
+    private Set<String> commentaryKeywords;
+    @Option(names = {"--hearing-impaired"}, arity = "1..*", defaultValue = "SDH, CC", split = ", ",
+            description = "Keywords to identify hearing impaired tracks (Defaults will be overwritten; Default: ${DEFAULT-VALUE}")
+    private Set<String> hearingImpaired;
+    @Option(names = {"--preferred-subtitles"}, arity = "1..*", defaultValue = "unstyled", split = ", ",
+            description = "Keywords to prefer specific subtitle tracks (Defaults will be overwritten; Default: ${DEFAULT-VALUE})")
+    private Set<String> preferredSubtitles;
+    @Option(names = {"--debug"}, description = "Enable debug logging")
+    private boolean debug;
+
+    static {
+        // Set default value into system properties to picocli can read the conditional value
+        System.setProperty("DEFAULT_MKV_TOOL_NIX", SystemUtils.IS_OS_WINDOWS ? "C:\\Program Files\\MKVToolNix" : "/usr/bin/");
+    }
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", InputConfig.class.getSimpleName() + "[", "]")
+                .add("configPath=" + configPath)
+                .add("spec=" + spec)
+                .add("libraryPath=" + libraryPath)
+                .add("attributeConfig=" + Arrays.toString(attributeConfig))
+                .add("mkvToolNix=" + mkvToolNix)
+                .add("safeMode=" + safeMode)
+                .add("threads=" + threads)
+                .add("coherent=" + coherent)
+                .add("forceCoherent=" + forceCoherent)
+                .add("filterDate=" + filterDate)
+                .add("includePattern=" + includePattern)
+                .add("excluded=" + excluded)
+                .add("overwriteForced=" + overwriteForced)
+                .add("forcedKeywords=" + forcedKeywords)
+                .add("commentaryKeywords=" + commentaryKeywords)
+                .add("hearingImpaired=" + hearingImpaired)
+                .add("preferredSubtitles=" + preferredSubtitles)
+                .add("debug=" + debug)
+                .toString();
+    }
+
+    @Override
+    public String[] getVersion() throws Exception {
+        return new String[0];
+    }
+}
+

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

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

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

@@ -0,0 +1,18 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
+
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Getter
+public class PlannedChange {
+    private final Map<TrackAttributes, Boolean> defaultTrack = new HashMap<>();
+    private final Map<TrackAttributes, Boolean> forcedTrack = new HashMap<>();
+    private final Map<TrackAttributes, Boolean> commentaryTrack = new HashMap<>();
+    private final Map<TrackAttributes, Boolean> hearingImpairedTrack = new HashMap<>();
+
+    public boolean isEmpty() {
+        return defaultTrack.isEmpty() && forcedTrack.isEmpty() && commentaryTrack.isEmpty() && hearingImpairedTrack.isEmpty();
+    }
+}

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

@@ -1,82 +1,65 @@
 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: %s";
+    private static final String PRINT_TEMPLATE = "Total: %s, Changing: %s (Successful: %s, Failed %s), Unchanged: %s, Excluded: %s, Unknown/Failed: %s\nRuntime: %s";
     private static ResultStatistic instance;
-    private int filesTotal = 0;
+
+    private int changePlanned = 0;
+    private int changeFailed = 0;
+    private int changeSuccessful = 0;
+    private int unchanged = 0;
     private int excluded = 0;
+    private int unknownFailed = 0;
 
-    private int shouldChange = 0;
-    private int failedChanging = 0;
-    private int successfullyChanged = 0;
-
-    private int noSuitableConfigFound = 0;
-    private int alreadyFits = 0;
-    private int failed = 0;
-
-    @Getter(AccessLevel.NONE)
     private long startTime = 0;
     private long runtime = 0;
 
     public static ResultStatistic getInstance() {
-        if (instance == null) {
+        return getInstance(false);
+    }
+
+    public static ResultStatistic getInstance(boolean reset) {
+        if (instance == null || reset) {
             instance = new ResultStatistic();
         }
         return instance;
     }
 
-    public void increaseTotalBy(int amount) {
-        filesTotal += amount;
+    public int total() {
+        return changePlanned + unchanged + excluded + unknownFailed;
     }
 
-    public synchronized void total() {
-        filesTotal++;
+    public synchronized void changePlanned() {
+        changePlanned++;
     }
 
-    public void increaseExcludedBy(int amount) {
-        excluded += amount;
+    public synchronized void changeSuccessful() {
+        changeSuccessful++;
+    }
+
+    public synchronized void changeFailed() {
+        changeFailed++;
+    }
+
+    public synchronized void unchanged() {
+        unchanged++;
+    }
+
+    public synchronized void increaseUnchangedBy(int amount) {
+        unchanged += amount;
     }
 
     public synchronized void excluded() {
         excluded++;
     }
 
-    public synchronized void shouldChange() {
-        shouldChange++;
-    }
-
-    public synchronized void success() {
-        successfullyChanged++;
-    }
-
-    public synchronized void failedChanging() {
-        failedChanging++;
-    }
-
-    public synchronized void noSuitableConfigFound() {
-        noSuitableConfigFound++;
-    }
-
-    public synchronized void alreadyFits() {
-        alreadyFits++;
-    }
-
-    public synchronized void failure() {
-        failed++;
+    public synchronized void unknownFailed() {
+        unknownFailed++;
     }
 
     public void startTimer() {
@@ -87,11 +70,6 @@ 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;
@@ -109,21 +87,14 @@ public class ResultStatistic {
         }
     }
 
-    public String prettyPrint() {
-        return String.format(result, filesTotal, excluded, shouldChange, failedChanging, successfullyChanged,
-                noSuitableConfigFound, alreadyFits, failed, formatTimer());
+    public void print() {
+        String result = this.toString();
+        System.out.println(result);
+        log.info(result);
     }
 
     @Override
     public String toString() {
-        return "ResultStatistic: " + "filesTotal=" + filesTotal +
-                ", excluded=" + excluded +
-                ", shouldChange=" + shouldChange +
-                " (failedChanging=" + failedChanging +
-                ", successfullyChanged=" + successfullyChanged +
-                "), noSuitableConfigFound=" + noSuitableConfigFound +
-                ", alreadyFits=" + alreadyFits +
-                ", failed=" + failed +
-                ", runtime=" + formatTimer();
+        return String.format(PRINT_TEMPLATE, total(), changePlanned, changeSuccessful, changeFailed, unchanged, excluded, unknownFailed, formatTimer());
     }
 }

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

@@ -1,47 +1,37 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Objects;
 
 @Slf4j
-@Getter
-@AllArgsConstructor
-public class FileAttribute {
-    private final int id;
-    private final String language;
-    private final String trackName;
-    private final boolean defaultTrack;
-    private final boolean forcedTrack;
-    private final LaneType type;
-
+public record TrackAttributes(int id, String language, String trackName,
+                              boolean defaultt, boolean forced, boolean commentary, boolean hearingImpaired,
+                              TrackType type) {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        FileAttribute attribute = (FileAttribute) o;
+        TrackAttributes attribute = (TrackAttributes) o;
         return id == attribute.id
-                && defaultTrack == attribute.defaultTrack
-                && forcedTrack == attribute.forcedTrack
+                && defaultt == attribute.defaultt
+                && forced == attribute.forced
+                && commentary == attribute.commentary
+                && hearingImpaired == attribute.hearingImpaired
                 && 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 +
                 ", language='" + language + '\'' +
                 ", trackName='" + trackName + '\'' +
-                ", defaultTrack=" + defaultTrack +
-                ", forcedTrack=" + forcedTrack +
+                ", defaultt=" + defaultt +
+                ", forced=" + forced +
+                ", commentary=" + commentary +
+                ", hearingImpaired=" + hearingImpaired +
                 ", type=" + type +
                 ']';
     }

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

@@ -1,6 +1,6 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
 
-public enum LaneType {
+public enum TrackType {
     AUDIO,
     SUBTITLES;
 }

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

@@ -1,23 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
-
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
-import org.apache.commons.cli.Option;
-
-public class CommandLineOptionsUtil {
-    public static Option optionOf(ConfigProperty property, String opt, int args) {
-        return optionOf(property, opt, args, false);
-    }
-
-    public static Option optionOf(ConfigProperty property, String opt, boolean hasArg, boolean required) {
-        return optionOf(property, opt, hasArg ? 1 : 0, required);
-    }
-
-    public static Option optionOf(ConfigProperty property, String opt, int args, boolean required) {
-        Option option = new Option(opt, property.desc());
-        option.setArgs(args);
-        option.setLongOpt(property.prop());
-        option.setRequired(required);
-        return option;
-    }
-
-}

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

@@ -0,0 +1,21 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix;
+import org.apache.commons.lang3.SystemUtils;
+
+import java.io.File;
+import java.nio.file.Path;
+
+public class FileUtils {
+    private static final boolean isWindows = SystemUtils.IS_OS_WINDOWS;
+
+    private static String expandPath(File dir, MkvToolNix application) {
+        return dir.getAbsolutePath().endsWith("/")
+                ? dir.getAbsolutePath() + application
+                : dir.getAbsolutePath() + "/" + application;
+    }
+
+    public static File getPathFor(File dir, MkvToolNix application) {
+        return Path.of(expandPath(dir, application) + (isWindows ? ".exe" : "")).toFile();
+    }
+}

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

@@ -23,10 +23,6 @@ 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);
     }

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

@@ -1,10 +1,16 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
 
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix;
+import org.apache.logging.log4j.util.Strings;
+import picocli.CommandLine;
+
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.Properties;
 
-public class ProjectUtil {
+public class ProjectUtil implements CommandLine.IVersionProvider {
     private static final Properties PROJECT_PROPERTIES = new Properties();
 
     static {
@@ -15,11 +21,32 @@ public class ProjectUtil {
         }
     }
 
-    public static String getVersion() {
-        return PROJECT_PROPERTIES.getProperty("version");
-    }
-
     public static String getProjectName() {
         return  PROJECT_PROPERTIES.getProperty("project_name");
     }
+
+    public String[] getVersion() throws IOException {
+        String mkvpropeeditVersion = getVersion(MkvToolNix.MKV_PROP_EDIT);
+        String mkvmergeVersion = getVersion(MkvToolNix.MKV_MERGE);
+
+        return new String[] {
+                getProjectName() + " " + PROJECT_PROPERTIES.getProperty("version"),
+                "Java ${java.version} (${java.vendor} ${java.vm.name} ${java.vm.version})",
+                "${os.name} ${os.version} ${os.arch}",
+                (!Strings.isBlank(mkvpropeeditVersion) ? mkvpropeeditVersion : "MkvPropEdit not found") + ", " + (!Strings.isBlank(mkvmergeVersion) ? mkvmergeVersion : "MkvMerge not found")
+        };
+    }
+
+    public static String getVersion(MkvToolNix app) throws IOException {
+        ProcessBuilder processBuilder = new ProcessBuilder(app.toString(), "--version");
+        Process process = processBuilder.start();
+
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+            String version = reader.readLine();
+            int exitCode = process.waitFor();
+
+            if (exitCode == 0) return version;
+        } catch (IOException | InterruptedException ignored) {}
+        return null;
+    }
 }

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

@@ -1,13 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class SetUtils {
-    public static <T> Set<T> retainOf(List<T> list1, List<T> list2) {
-        Set<T> set = new HashSet<>(list1);
-        set.retainAll(list2);
-        return set;
-    }
-}

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

@@ -0,0 +1,12 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
+
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
+import lombok.Getter;
+
+public class ValidationUtil {
+    private static final ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
+    @Getter
+    private static final Validator validator = factory.getValidator();
+}

src/main/resources/log4j2-debian.yaml

@@ -0,0 +1,34 @@
+Configuration:
+  name: DefaultLogger
+  Appenders:
+    RollingFile:
+      name: FileAppender
+      fileName: ${sys:user.home}/.local/mkvaudiosubtitlechanger/logs/application.log
+      filePattern: ${sys:user.home}/.local/mkvaudiosubtitlechanger/logs/archive/application-%d{yyyy-MM-dd}-%i.log.gz
+      PatternLayout:
+        Pattern: "%d{DEFAULT} | %-5level | %thread | %C{1} | %msg %n %throwable"
+      ThresholdFilter:
+        level: debug
+      Policies:
+        OnStartupTriggeringPolicy:
+          minSize: 0
+      DefaultRolloverStrategy:
+        max: 30
+        Delete:
+          basePath: archive
+          maxDepth: 1
+          IfLastModified:
+            age: 30d
+          IfAccumulatedFileSize:
+            exceeds: 1GB
+
+  Loggers:
+    Root:
+      level: info
+      AppenderRef:
+        - ref: FileAppender
+    Logger:
+      name: "com.zaxxer.hikari.HikariConfig"
+      level: info
+      AppenderRef:
+        - ref: FileAppender

src/main/resources/log4j2-dev.yaml

@@ -4,16 +4,30 @@ Configuration:
     Console:
       name: Console_Out
       PatternLayout:
-        Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
+        Pattern: "%d{DEFAULT} | %-5level | %thread | %C{1} | %msg %n %throwable"
       ThresholdFilter:
         level: debug
-    File:
+    RollingFile:
       name: FileAppender
-      fileName: default.log
+      fileName: logs/application.log
+      filePattern: logs/archive/application-%d{yyyy-MM-dd}-%i.log.gz
       PatternLayout:
-        Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
+        Pattern: "%d{DEFAULT} | %-5level | %thread | %C{1} | %msg %n %throwable"
       ThresholdFilter:
         level: debug
+      Policies:
+        OnStartupTriggeringPolicy:
+          minSize: 0
+      DefaultRolloverStrategy:
+        max: 30
+        Delete:
+          basePath: logs/archive
+          maxDepth: 1
+          IfLastModified:
+            age: 30d
+          IfAccumulatedFileSize:
+            exceeds: 1GB
+
   Loggers:
     Root:
       level: debug

src/main/resources/log4j2-windows.yaml

@@ -0,0 +1,34 @@
+Configuration:
+  name: DefaultLogger
+  Appenders:
+    RollingFile:
+      name: FileAppender
+      fileName: ${sys:user.home}/AppData/Local/MKVAudioSubtitleChanger/logs/application.log
+      filePattern: ${sys:user.home}/AppData/Local/MKVAudioSubtitleChanger/logs/archive/application-%d{yyyy-MM-dd}-%i.log.gz
+      PatternLayout:
+        Pattern: "%d{DEFAULT} | %-5level | %thread | %C{1} | %msg %n %throwable"
+      ThresholdFilter:
+        level: debug
+      Policies:
+        OnStartupTriggeringPolicy:
+          minSize: 0
+      DefaultRolloverStrategy:
+        max: 30
+        Delete:
+          basePath: logs/archive
+          maxDepth: 1
+          IfLastModified:
+            age: 30d
+          IfAccumulatedFileSize:
+            exceeds: 1GB
+
+  Loggers:
+    Root:
+      level: info
+      AppenderRef:
+        - ref: FileAppender
+    Logger:
+      name: "com.zaxxer.hikari.HikariConfig"
+      level: info
+      AppenderRef:
+        - ref: FileAppender

src/main/resources/log4j2.yaml

@@ -1,13 +1,27 @@
 Configuration:
   name: DefaultLogger
   Appenders:
-    File:
+    RollingFile:
       name: FileAppender
-      fileName: default.log
+      fileName: logs/application.log
+      filePattern: logs/archive/application-%d{yyyy-MM-dd}-%i.log.gz
       PatternLayout:
-        Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
+        Pattern: "%d{DEFAULT} | %-5level | %thread | %C{1} | %msg %n %throwable"
       ThresholdFilter:
-        level: info
+        level: debug
+      Policies:
+        OnStartupTriggeringPolicy:
+          minSize: 0
+      DefaultRolloverStrategy:
+        max: 30
+        Delete:
+          basePath: logs/archive
+          maxDepth: 1
+          IfLastModified:
+            age: 30d
+          IfAccumulatedFileSize:
+            exceeds: 1GB
+
   Loggers:
     Root:
       level: info

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigLoaderTest.java

@@ -1,44 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
-
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.PathUtils.TEST_FILE;
-import static org.junit.jupiter.api.Assertions.*;
-
-class ConfigLoaderTest {
-
-    @Test
-    void initConfig() {
-        String[] sut = new String[]{"-a", "ger:ger", "-l", TEST_FILE,
-                "-s", "-cf", "-n",
-                "-c", "2",
-                "-t", "4",
-                "-i", ".*[abc].*",
-                "-fk", "testForced",
-                "-ck", "testCommentary",
-                "-ps", "testPreferred"
-        };
-        ConfigLoader.initConfig(sut);
-
-        assertTrue(Config.getInstance().getLibraryPath().exists());
-        assertEquals(List.of(new AttributeConfig("ger", "ger")), Config.getInstance().getAttributeConfig());
-
-        assertTrue(Config.getInstance().isSafeMode());
-        assertTrue(Config.getInstance().isForceCoherent());
-        assertTrue(Config.getInstance().isOnlyNewFiles());
-        assertNotNull(Config.getInstance().getFilterDate());
-
-        assertEquals(2, Config.getInstance().getCoherent());
-        assertEquals(4, Config.getInstance().getThreads());
-        assertEquals(".*[abc].*", Config.getInstance().getIncludePattern().pattern());
-        assertTrue(Config.getInstance().getForcedKeywords().contains("testForced"));
-        assertTrue(Config.getInstance().getCommentaryKeywords().contains("testCommentary"));
-        assertTrue(Config.getInstance().getPreferredSubtitles().contains("testPreferred"));
-
-        assertNull(Config.getInstance().getConfigPath());
-
-    }
-}

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/converter/AttributeConfigConverterTest.java

@@ -0,0 +1,50 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.converter;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.converter.AttributeConfigConverter;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import picocli.CommandLine;
+
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class AttributeConfigConverterTest {
+
+    private static Stream<Arguments> validData() {
+        return Stream.of(
+                Arguments.of("jpn:ger", new AttributeConfig("jpn", "ger")),
+                Arguments.of("eng:eng", new AttributeConfig("eng", "eng")),
+                Arguments.of("OFF:OFF", new AttributeConfig("OFF", "OFF"))
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("validData")
+    void convert(String input, AttributeConfig expected) {
+        AttributeConfigConverter underTest = new AttributeConfigConverter();
+        AttributeConfig actual = underTest.convert(input);
+        assertEquals(expected, actual);
+    }
+
+    private static Stream<Arguments> invalidData() {
+        return Stream.of(
+                Arguments.of("ars:eng"),
+                Arguments.of("ars:OFF"),
+                Arguments.of("OFF:ars"),
+                Arguments.of("ars:ars"),
+                Arguments.of("arss:ars"),
+                Arguments.of("ars:arsr")
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("invalidData")
+    void convertInvalid(String input) {
+        AttributeConfigConverter underTest = new AttributeConfigConverter();
+        assertThrows(CommandLine.TypeConversionException.class, () -> underTest.convert(input));
+    }
+}
+

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

@@ -1,85 +0,0 @@
-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

@@ -1,58 +0,0 @@
-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

@@ -1,57 +0,0 @@
-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

@@ -1,65 +0,0 @@
-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

@@ -1,65 +0,0 @@
-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.PathUtils.TEST_DIR;
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.PathUtils.TEST_FILE;
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.argumentsOf;
-import static org.junit.jupiter.api.Assertions.*;
-
-class PathValidatorTest {
-    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

@@ -1,64 +0,0 @@
-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

@@ -1,68 +0,0 @@
-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

@@ -1,61 +0,0 @@
-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/FileFilterTest.java

@@ -0,0 +1,85 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.InputConfig;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ResultStatistic;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.DateUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.PathUtils.TEST_FILE;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class FileFilterTest {
+    @Mock(strictness = Mock.Strictness.LENIENT)
+    File file;
+
+    @Mock(strictness = Mock.Strictness.LENIENT)
+    BasicFileAttributes attributes;
+
+    @BeforeEach
+    void beforeEach() {
+        ResultStatistic.getInstance(true);
+    }
+
+    private static Stream<Arguments> accept() {
+        return Stream.of(
+                Arguments.of("~/video.mkv", Set.of(".mkv"), Set.of(), -1, ".*", true, false),
+                Arguments.of("~/video.mp4", Set.of(".mkv"), Set.of(), -1, ".*", false, false),
+
+                Arguments.of("~/video.mkv", Set.of(".mkv"), Set.of(), -1, "v.*", true, false),
+                Arguments.of("~/video.mkv", Set.of(".mkv"), Set.of(), -1, "a.*", false, true),
+
+                Arguments.of("~/video.mkv", Set.of(".mkv"), Set.of(), -1000, ".*", true, false),
+                Arguments.of("~/video.mkv", Set.of(".mkv"), Set.of(), 1000, ".*", false, true),
+
+                Arguments.of("dir/video.mkv", Set.of(".mkv"), Set.of("dir"), -1, ".*", false, true),
+                Arguments.of("dir/dir2/video.mkv", Set.of(".mkv"), Set.of("dir/dir2"), -1, ".*", false, true),
+                Arguments.of("dir/video.mkv", Set.of(".mkv"), Set.of("dir/dir2"), -1, ".*", true, false),
+                Arguments.of("dirr/video.mkv", Set.of(".mkv"), Set.of("dir"), -1, ".*", true, false)
+        );
+    }
+
+    /**
+     * @param filterDateOffset move filter data into the future or past by positive and negative values
+     */
+    @ParameterizedTest
+    @MethodSource
+    void accept(String path, Set<String> extensions, Set<String> excludedDirs, int filterDateOffset, String pattern, boolean acceptanceExpected, boolean excluded) {
+        when(file.getAbsolutePath()).thenReturn(path);
+        when(file.getPath()).thenReturn(path);
+        String[] split = path.split("/");
+        when(file.getName()).thenReturn(split[split.length - 1]);
+        when(file.toPath()).thenReturn(Path.of(TEST_FILE));
+
+        long currentTime = System.currentTimeMillis();
+        FileFilter fileFilter = new FileFilter(excludedDirs, Pattern.compile(pattern), new Date(currentTime + filterDateOffset));
+
+        try (MockedStatic<DateUtils> mockedFiles = Mockito.mockStatic(DateUtils.class)) {
+            mockedFiles
+                    .when(() -> DateUtils.convert(anyLong()))
+                    .thenReturn(new Date(currentTime));
+
+            assertEquals(acceptanceExpected, fileFilter.accept(file, new HashSet<>(extensions)), "File is accepted");
+            assertEquals(excluded, ResultStatistic.getInstance().getExcluded() > 0, "Is counted in excluded statistic");
+        }
+    }
+}

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

@@ -1,13 +1,12 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl;
 
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute;
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.LaneType;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.TrackAttributes;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.TrackType;
 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.*;
@@ -34,13 +33,11 @@ class SubtitleTrackComparatorTest {
 
     @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]));
+    void compare(List<TrackAttributes> input, List<TrackAttributes> expected) {
+        assertIterableEquals(expected, input.stream().sorted(comparator.reversed()).toList());
     }
 
-    private static FileAttribute attr(String trackName, boolean defaultTrack) {
-        return new FileAttribute(0, "", trackName, defaultTrack, false, LaneType.SUBTITLES);
+    private static TrackAttributes attr(String trackName, boolean defaultTrack) {
+        return new TrackAttributes(0, "", trackName, defaultTrack, false, false, false, TrackType.SUBTITLES);
     }
 }

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/processors/AttributeChangeProcessorTest.java

@@ -0,0 +1,277 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.processors;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfo;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.TrackAttributes;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.FileInfoTestUtil.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class AttributeChangeProcessorTest {
+
+    private static Stream<Arguments> attributeConfigMatching() {
+        return Stream.of(
+                Arguments.of(
+                        List.of(withName(AUDIO_ENG, null), SUB_ENG),
+                        arr(a("eng:eng")), "eng:eng",
+                        Map.ofEntries(on(withName(AUDIO_ENG, null)), on(SUB_ENG))
+                ),
+                Arguments.of(
+                        List.of(AUDIO_ENG, SUB_ENG),
+                        arr(a("eng:eng")), "eng:eng",
+                        Map.ofEntries(on(AUDIO_ENG), on(SUB_ENG))
+                ),
+                Arguments.of(
+                        List.of(AUDIO_ENG, AUDIO_GER, SUB_ENG, SUB_GER),
+                        arr(a("eng:eng")), "eng:eng",
+                        Map.ofEntries(on(AUDIO_ENG), on(SUB_ENG))
+                ),
+                Arguments.of(
+                        List.of(AUDIO_ENG_DEFAULT, AUDIO_GER, SUB_ENG, SUB_GER),
+                        arr(a("ger:eng")), "ger:eng",
+                        Map.ofEntries(off(AUDIO_ENG_DEFAULT), on(AUDIO_GER), on(SUB_ENG))
+                ),
+                Arguments.of(
+                        List.of(AUDIO_ENG_DEFAULT, AUDIO_GER, SUB_ENG, SUB_GER),
+                        arr(a("eng:ger")), "eng:ger",
+                        Map.ofEntries(on(SUB_GER))
+                ),
+                Arguments.of(
+                        List.of(AUDIO_ENG_DEFAULT, AUDIO_GER, SUB_ENG_DEFAULT, SUB_GER),
+                        arr(a("eng:OFF")), "eng:OFF",
+                        Map.ofEntries(off(SUB_ENG_DEFAULT))
+                ),
+                Arguments.of(
+                        List.of(AUDIO_ENG_DEFAULT, AUDIO_GER, SUB_ENG_DEFAULT, SUB_GER),
+                        arr(a("OFF:OFF")), "OFF:OFF",
+                        Map.ofEntries(off(AUDIO_ENG_DEFAULT), off(SUB_ENG_DEFAULT))
+                ),
+                Arguments.of(
+                        List.of(AUDIO_ENG_DEFAULT, AUDIO_GER, SUB_GER),
+                        arr(a("eng:eng"), a("eng:ger")), "eng:ger",
+                        Map.ofEntries(on(SUB_GER))
+                ),
+                Arguments.of(
+                        List.of(AUDIO_ENG_DEFAULT, AUDIO_GER_COMMENTARY, SUB_GER_FORCED),
+                        arr(a("ger:ger")), null,
+                        Map.ofEntries()
+                ),
+                Arguments.of(
+                        List.of(AUDIO_ENG_DEFAULT, AUDIO_GER_COMMENTARY, withName(SUB_GER, "forced")),
+                        arr(a("ger:ger")), null,
+                        Map.ofEntries()
+                ),
+                Arguments.of(
+                        List.of(AUDIO_ENG_DEFAULT, AUDIO_GER_HEARING, SUB_GER),
+                        arr(a("ger:ger")), null,
+                        Map.ofEntries()
+                ),
+                Arguments.of(
+                        List.of(AUDIO_ENG_DEFAULT, withName(AUDIO_GER, "SDH"), SUB_GER),
+                        arr(a("ger:ger")), null,
+                        Map.ofEntries()
+                ),
+                Arguments.of(
+                        List.of(AUDIO_ENG_DEFAULT, AUDIO_GER_COMMENTARY, AUDIO_GER_HEARING, AUDIO_GER, SUB_GER_FORCED, SUB_GER),
+                        arr(a("ger:ger")), "ger:ger",
+                        Map.ofEntries(off(AUDIO_ENG_DEFAULT), on(AUDIO_GER), on(SUB_GER))
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("attributeConfigMatching")
+    void findDefaultMatchAndApplyChanges(List<TrackAttributes> tracks, AttributeConfig[] config, String expectedConfig, Map<TrackAttributes, Boolean> changes) {
+        AttributeChangeProcessor attributeChangeProcessor = new AttributeChangeProcessor(new String[]{}, Set.of("forced"), Set.of("commentary"), Set.of("SDH"));
+
+        FileInfo fileInfo = new FileInfo(null);
+        fileInfo.addTracks(tracks);
+        attributeChangeProcessor.findDefaultMatchAndApplyChanges(fileInfo, config);
+        assertEquals(expectedConfig, fileInfo.getMatchedConfig() != null  ? fileInfo.getMatchedConfig().toStringShort() : fileInfo.getMatchedConfig());
+        assertEquals(changes.size(), fileInfo.getChanges().getDefaultTrack().size());
+        changes.forEach((key, value) -> {
+            assertTrue(fileInfo.getChanges().getDefaultTrack().containsKey(key));
+            assertEquals(value, fileInfo.getChanges().getDefaultTrack().get(key));
+        });
+    }
+
+    private static AttributeConfig[] arr(AttributeConfig... configs) {
+        return configs;
+    }
+
+    private static AttributeConfig a(String config) {
+        String[] split = config.split(":");
+        return new AttributeConfig(split[0], split[1]);
+    }
+
+    private static Map.Entry<TrackAttributes, Boolean> on(TrackAttributes track) {
+        return Map.entry(track, true);
+    }
+
+    private static Map.Entry<TrackAttributes, Boolean> off(TrackAttributes track) {
+        return Map.entry(track, false);
+    }
+
+    private static Stream<Arguments> filterForPossibleDefaults() {
+        return Stream.of(
+            Arguments.of(List.of(AUDIO_GER, AUDIO_ENG, SUB_GER), Set.of(AUDIO_GER, AUDIO_ENG, SUB_GER)),
+            Arguments.of(List.of(AUDIO_GER, AUDIO_ENG, withName(AUDIO_GER, "forced"), SUB_GER), Set.of(AUDIO_GER, AUDIO_ENG, SUB_GER)),
+            Arguments.of(List.of(AUDIO_GER, AUDIO_ENG, withName(AUDIO_GER, "Forced"), SUB_GER), Set.of(AUDIO_GER, AUDIO_ENG, SUB_GER)),
+            Arguments.of(List.of(AUDIO_GER, AUDIO_ENG, withName(AUDIO_GER, "commentary"), SUB_GER), Set.of(AUDIO_GER, AUDIO_ENG, SUB_GER)),
+            Arguments.of(List.of(AUDIO_GER, AUDIO_ENG, withName(AUDIO_GER, "Commentary"), SUB_GER), Set.of(AUDIO_GER, AUDIO_ENG, SUB_GER)),
+            Arguments.of(List.of(AUDIO_GER, AUDIO_ENG, withName(AUDIO_GER, "SDH"), SUB_GER), Set.of(AUDIO_GER, AUDIO_ENG, SUB_GER)),
+            Arguments.of(List.of(AUDIO_GER, AUDIO_ENG, withName(AUDIO_GER, "sdh"), SUB_GER), Set.of(AUDIO_GER, AUDIO_ENG, SUB_GER)),
+            Arguments.of(List.of(AUDIO_GER, AUDIO_ENG, SUB_GER, SUB_GER_FORCED, AUDIO_GER_COMMENTARY, AUDIO_GER_HEARING), Set.of(AUDIO_GER, AUDIO_ENG, SUB_GER))
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("filterForPossibleDefaults")
+    void filterForPossibleDefaults(List<TrackAttributes> tracks, Set<TrackAttributes> expected) throws InvocationTargetException, IllegalAccessException {
+        AttributeChangeProcessor attributeChangeProcessor = new AttributeChangeProcessor(new String[]{}, Set.of("forced"), Set.of("commentary"), Set.of("SDH"));
+        Optional<Method> method = Arrays.stream(AttributeChangeProcessor.class.getDeclaredMethods())
+                .filter(m -> m.getName().equals("filterForPossibleDefaults"))
+                .findFirst();
+
+        assertTrue(method.isPresent());
+        Method underTest = method.get();
+        underTest.setAccessible(true);
+        List<TrackAttributes> result = (List<TrackAttributes>) underTest.invoke(attributeChangeProcessor, tracks);
+        assertEquals(expected.size(), result.size());
+        for (TrackAttributes track : result) {
+            assertTrue(expected.contains(track));
+        }
+    }
+
+    private static Stream<Arguments> findForcedTracksAndApplyChanges() {
+        return Stream.of(
+                Arguments.of(List.of(),
+                        Set.of("song & signs"), false,
+                        Map.ofEntries()
+                ),
+                Arguments.of(List.of(withName(SUB_GER, "song & signs"), SUB_GER),
+                        Set.of("song & signs"), false,
+                        Map.ofEntries(on(withName(SUB_GER, "song & signs")))
+                ),
+                Arguments.of(List.of(withName(SUB_GER, "song & signs"), withName(SUB_GER, "")),
+                        Set.of("song & signs"), false,
+                        Map.ofEntries(on(withName(SUB_GER, "song & signs")))
+                ),
+                Arguments.of(List.of(withName(SUB_GER, "song & signs"), withName(SUB_GER, null)),
+                        Set.of("song & signs"), false,
+                        Map.ofEntries(on(withName(SUB_GER, "song & signs")))
+                ),
+                Arguments.of(List.of(withName(SUB_GER, "song & signs")),
+                        Set.of("song & signs"), false,
+                        Map.ofEntries(on(withName(SUB_GER, "song & signs")))
+                ),
+                Arguments.of(List.of(withName(SUB_GER_FORCED, "song & signs")),
+                        Set.of("song & signs"), false,
+                        Map.ofEntries()
+                ),
+                Arguments.of(List.of(SUB_GER_FORCED, withName(SUB_GER, "song & signs")),
+                        Set.of("song & signs"), true,
+                        Map.ofEntries(off(SUB_GER_FORCED), on(withName(SUB_GER, "song & signs")))
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("findForcedTracksAndApplyChanges")
+    void findForcedTracksAndApplyChanges(List<TrackAttributes> tracks, Set<String> keywords, boolean overwrite, Map<TrackAttributes, Boolean> changes) {
+        AttributeChangeProcessor attributeChangeProcessor = new AttributeChangeProcessor(new String[]{}, keywords, Set.of(), Set.of());
+
+        FileInfo fileInfo = new FileInfo(null);
+        fileInfo.addTracks(tracks);
+        attributeChangeProcessor.findForcedTracksAndApplyChanges(fileInfo, overwrite);
+
+        assertEquals(changes.size(), fileInfo.getChanges().getForcedTrack().size());
+        changes.forEach((key, value) -> {
+            assertTrue(fileInfo.getChanges().getForcedTrack().containsKey(key));
+            assertEquals(value, fileInfo.getChanges().getForcedTrack().get(key));
+        });
+    }
+
+    private static Stream<Arguments> findCommentaryTracksAndApplyChanges() {
+        return Stream.of(
+                Arguments.of(List.of(withName(SUB_GER, "commentary"), withName(SUB_GER, null)),
+                        Set.of("commentary"),
+                        Map.ofEntries(on(withName(SUB_GER, "commentary")))
+                ),
+                Arguments.of(List.of(withName(SUB_GER, "commentary")),
+                        Set.of("commentary"),
+                        Map.ofEntries(on(withName(SUB_GER, "commentary")))
+                ),
+                Arguments.of(List.of(withName(AUDIO_GER_COMMENTARY, "commentary")),
+                        Set.of("commentary"),
+                        Map.ofEntries()
+                ),
+                Arguments.of(List.of(AUDIO_GER_COMMENTARY, withName(SUB_GER, "commentary")),
+                        Set.of("commentary"),
+                        Map.ofEntries(on(withName(SUB_GER, "commentary")))
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("findCommentaryTracksAndApplyChanges")
+    void findCommentaryTracksAndApplyChanges(List<TrackAttributes> tracks, Set<String> keywords, Map<TrackAttributes, Boolean> changes) {
+        AttributeChangeProcessor attributeChangeProcessor = new AttributeChangeProcessor(new String[]{}, Set.of(), keywords, Set.of());
+
+        FileInfo fileInfo = new FileInfo(null);
+        fileInfo.addTracks(tracks);
+        attributeChangeProcessor.findCommentaryTracksAndApplyChanges(fileInfo);
+
+        assertEquals(changes.size(), fileInfo.getChanges().getCommentaryTrack().size());
+        changes.forEach((key, value) -> {
+            assertTrue(fileInfo.getChanges().getCommentaryTrack().containsKey(key));
+            assertEquals(value, fileInfo.getChanges().getCommentaryTrack().get(key));
+        });
+    }
+
+    private static Stream<Arguments> findHearingImpairedTracksAndApplyChanges() {
+        return Stream.of(
+                Arguments.of(List.of(withName(SUB_GER, "SDH"), withName(SUB_GER, null)),
+                        Set.of("SDH"),
+                        Map.ofEntries(on(withName(SUB_GER, "SDH")))
+                ),
+                Arguments.of(List.of(withName(SUB_GER, "SDH")),
+                        Set.of("SDH"),
+                        Map.ofEntries(on(withName(SUB_GER, "SDH")))
+                ),
+                Arguments.of(List.of(withName(AUDIO_GER_HEARING, "SDH")),
+                        Set.of("SDH"),
+                        Map.ofEntries()
+                ),
+                Arguments.of(List.of(AUDIO_GER_HEARING, withName(SUB_GER, "SDH")),
+                        Set.of("SDH"),
+                        Map.ofEntries(on(withName(SUB_GER, "SDH")))
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("findHearingImpairedTracksAndApplyChanges")
+    void findHearingImpairedTracksAndApplyChanges(List<TrackAttributes> tracks, Set<String> keywords, Map<TrackAttributes, Boolean> changes) {
+        AttributeChangeProcessor attributeChangeProcessor =  new AttributeChangeProcessor(new String[]{}, Set.of(), Set.of(), keywords);
+
+        FileInfo fileInfo = new FileInfo(null);
+        fileInfo.addTracks(tracks);
+        attributeChangeProcessor.findHearingImpairedTracksAndApplyChanges(fileInfo);
+
+        assertEquals(changes.size(), fileInfo.getChanges().getHearingImpairedTrack().size());
+        changes.forEach((key, value) -> {
+            assertTrue(fileInfo.getChanges().getHearingImpairedTrack().containsKey(key));
+            assertEquals(value, fileInfo.getChanges().getHearingImpairedTrack().get(key));
+        });
+    }
+}

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/processors/AttributeUpdaterTest.java

@@ -0,0 +1,64 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.processors;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.*;
+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.io.File;
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.FileInfoTestUtil.AUDIO_GER;
+import static org.junit.jupiter.api.Assertions.*;
+
+class AttributeUpdaterTest {
+
+    @BeforeEach
+    void setup() {
+        ResultStatistic.getInstance(true);
+    }
+
+    private static Stream<Arguments> checkStatusAndUpdate() {
+        return Stream.of(
+                Arguments.of(info(new AttributeConfig("ger", "ger"), AUDIO_GER), supplier(() -> ResultStatistic.getInstance().getChangePlanned())),
+                Arguments.of(info(new AttributeConfig("ger", "ger"), null), supplier(() -> ResultStatistic.getInstance().getUnchanged())),
+                Arguments.of(info(null, null), supplier(() -> ResultStatistic.getInstance().getUnchanged()))
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("checkStatusAndUpdate")
+    void checkStatusAndUpdate(FileInfo fileInfo, Supplier<Integer> getActual) {
+        InputConfig config = new InputConfig();
+        config.setThreads(1);
+        config.setSafeMode(true);
+        AttributeUpdater underTest = new AttributeUpdater(config, null, null) {
+            @Override
+            protected List<File> getFiles() {
+                return List.of();
+            }
+
+            @Override
+            protected void process(File file) {
+
+            }
+        };
+
+        underTest.checkStatusAndUpdate(fileInfo);
+        assertEquals(1, getActual.get());
+    }
+
+    private static Supplier<Integer> supplier(Supplier<Integer> supplier)  {
+        return supplier;
+    }
+
+    private static FileInfo info(AttributeConfig config, TrackAttributes attr) {
+        FileInfo fileInfo = new FileInfo(null);
+        fileInfo.setMatchedConfig(config);
+        if(attr != null) fileInfo.getChanges().getDefaultTrack().put(attr, true);
+        return fileInfo;
+    }
+}

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/processors/CoherentAttributeUpdaterTest.java

@@ -0,0 +1,94 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.processors;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.CommandRunner;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfo;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.InputConfig;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.TrackAttributes;
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import picocli.CommandLine;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.FileInfoTestUtil.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class CoherentAttributeUpdaterTest {
+    @Mock(lenient = true)
+    FileProcessor fileProcessor;
+
+    @Test
+    void process() {
+    }
+
+    private static Stream<Arguments> findMatch() {
+        return Stream.of(
+                Arguments.of(AttributeConfig.of("ger", "ger"),
+                        List.of(), false, 0),
+                Arguments.of(AttributeConfig.of("ger", "ger"),
+                        List.of(fileInfoMock("test.mkv", AUDIO_GER, SUB_GER)), true, 1),
+                Arguments.of(AttributeConfig.of("ger", "ger"),
+                        List.of(fileInfoMock("test.mkv", AUDIO_GER, SUB_GER),
+                                fileInfoMock("test2.mkv", AUDIO_GER, SUB_GER)), true, 2),
+                Arguments.of(AttributeConfig.of("ger", "ger"),
+                        List.of(fileInfoMock("test.mkv", AUDIO_GER, SUB_GER),
+                                fileInfoMock("test2.mkv", AUDIO_ENG, SUB_ENG)), false, 1),
+                Arguments.of(AttributeConfig.of("ger", "ger"),
+                        List.of(fileInfoMock("test.mkv", AUDIO_GER, SUB_GER),
+                                fileInfoMock("test2.mkv", AUDIO_GER, SUB_GER),
+                                fileInfoMock("test3.mkv", AUDIO_GER, SUB_GER),
+                                fileInfoMock("test4.mkv", AUDIO_GER, SUB_GER),
+                                fileInfoMock("test5.mkv", AUDIO_ENG, SUB_ENG)), false, 4),
+                Arguments.of(AttributeConfig.of("ger", "ger"),
+                        List.of(fileInfoMock("test.mkv", AUDIO_GER, SUB_GER),
+                                fileInfoMock("test2.mkv", AUDIO_ENG, SUB_GER),
+                                fileInfoMock("test3.mkv", AUDIO_GER, SUB_GER),
+                                fileInfoMock("test4.mkv", AUDIO_GER, SUB_GER),
+                                fileInfoMock("test5.mkv", AUDIO_GER, SUB_ENG)), false, 1)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("findMatch")
+    void findMatch(AttributeConfig attributeConfig, List<Pair<File, FileInfo>> fileInfoMock, boolean expectedMatch, int expectedMatchCount) throws InvocationTargetException, IllegalAccessException {
+        CommandRunner commandRunner = new CommandRunner();
+        new CommandLine(commandRunner).parseArgs("-a", "ger:ger", "/arst");
+        InputConfig config = commandRunner.getConfig();
+        AttributeChangeProcessor attributeChangeProcessor = new AttributeChangeProcessor(config.getPreferredSubtitles().toArray(new String[0]), config.getForcedKeywords(), config.getCommentaryKeywords(), config.getHearingImpaired());
+        CoherentAttributeUpdater updater = new CoherentAttributeUpdater(config, fileProcessor, attributeChangeProcessor);
+        Set<FileInfo> matchedFiles = new HashSet<>(fileInfoMock.size() * 2);
+
+        List<File> files = new ArrayList<>();
+        for (Pair<File, FileInfo> pair : fileInfoMock) {
+            when(fileProcessor.readAttributes(pair.getKey())).thenReturn(pair.getRight());
+            files.add(pair.getKey());
+        }
+
+        Method underTest = Arrays.stream(updater.getClass().getDeclaredMethods()).filter(m -> "findMatch".equals(m.getName())).findFirst().get();
+        underTest.setAccessible(true);
+        AttributeConfig actualMatch = (AttributeConfig) underTest.invoke(updater, attributeConfig, matchedFiles, files);
+
+        assertEquals(expectedMatch ? attributeConfig : null, actualMatch, "Matched AttributeConfig");
+        assertEquals(expectedMatchCount, matchedFiles.size(), "Matched files count");
+    }
+
+    private static Pair<File, FileInfo> fileInfoMock(String path, TrackAttributes... tracks) {
+        File file = new File(path);
+        FileInfo fileInfo = new FileInfo(file);
+        fileInfo.addTracks(List.of(tracks));
+        return Pair.of(file, fileInfo);
+    }
+}

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/processors/MkvFileProcessorTest.java

@@ -0,0 +1,135 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.processors;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfo;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.TrackAttributes;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.TrackType;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+@ExtendWith(MockitoExtension.class)
+class MkvFileProcessorTest {
+
+    @Test
+    void readAttributes() throws IOException {
+        String mkvmergeResponse = """
+                {
+                  "tracks": [
+                    {
+                      "id": 0,
+                      "properties": {
+                        "default_track": true,
+                        "enabled_track": true,
+                        "forced_track": false,
+                        "language": "jpn",
+                        "number": 1
+                      },
+                      "type": "video"
+                    },
+                    {
+                      "id": 1,
+                      "properties": {
+                        "track_name": "testing",
+                        "default_track": true,
+                        "enabled_track": true,
+                        "forced_track": false,
+                        "language": "jpn",
+                        "number": 2
+                      },
+                      "type": "audio"
+                    },
+                    {
+                      "id": 2,
+                      "properties": {
+                        "default_track": true,
+                        "enabled_track": true,
+                        "forced_track": false,
+                        "commentary_track": true,
+                        "flag_hearing_impaired": true,
+                        "language": "eng",
+                        "number": 3
+                      },
+                      "type": "subtitles"
+                    }
+                  ]
+                }
+                """;
+
+        MkvFileProcessor underTest = spy(new MkvFileProcessor(new File("mkvtoolnix"), null));
+        doReturn(new ByteArrayInputStream(mkvmergeResponse.getBytes(StandardCharsets.UTF_8)))
+                .when(underTest).run(any(String[].class));
+
+        FileInfo result = underTest.readAttributes(new File("arst"));
+
+        TrackAttributes audio = result.getAudioTracks().get(0);
+        assertEquals(2, audio.id());
+        assertEquals("testing", audio.trackName());
+        assertEquals("jpn", audio.language());
+        assertTrue(audio.defaultt());
+        assertFalse(audio.forced());
+        assertFalse(audio.hearingImpaired());
+        assertFalse(audio.commentary());
+        assertEquals(TrackType.AUDIO, audio.type());
+
+        TrackAttributes sub = result.getSubtitleTracks().get(0);
+        assertEquals(3, sub.id());
+        assertNull(sub.trackName());
+        assertEquals("eng", sub.language());
+        assertTrue(sub.defaultt());
+        assertFalse(sub.forced());
+        assertTrue(sub.hearingImpaired());
+        assertTrue(sub.commentary());
+        assertEquals(TrackType.SUBTITLES, sub.type());
+    }
+
+    @Test
+    void getUpdateCommand() throws InvocationTargetException, IllegalAccessException {
+        FileInfo fileInfo = new FileInfo(new File("./"));
+        fileInfo.getChanges().getDefaultTrack().put(t(1), true);
+        fileInfo.getChanges().getDefaultTrack().put(t(2), false);
+        fileInfo.getChanges().getForcedTrack().put(t(3), true);
+        fileInfo.getChanges().getForcedTrack().put(t(4), false);
+        fileInfo.getChanges().getCommentaryTrack().put(t(5), true);
+        fileInfo.getChanges().getCommentaryTrack().put(t(6), false);
+        fileInfo.getChanges().getHearingImpairedTrack().put(t(7), true);
+        fileInfo.getChanges().getHearingImpairedTrack().put(t(8), false);
+        String[] expectedCommand = """
+                --edit track:1 --set flag-default=1
+                --edit track:2 --set flag-default=0
+                --edit track:3 --set flag-forced=1
+                --edit track:4 --set flag-forced=0
+                --edit track:5 --set flag-commentary=1
+                --edit track:6 --set flag-commentary=0
+                --edit track:7 --set flag-hearing-impaired=1
+                --edit track:8 --set flag-hearing-impaired=0
+                """.split("\\n");
+
+        MkvFileProcessor mkvFileProcessor = new MkvFileProcessor(new File("mkvtoolnix"), null);
+        Method underTest = Arrays.stream(mkvFileProcessor.getClass().getDeclaredMethods()).filter(m -> "getUpdateCommand".equals(m.getName())).findFirst().get();
+        underTest.setAccessible(true);
+        String[] actualCommand = (String[]) underTest.invoke(mkvFileProcessor, fileInfo);
+        String[] trimmedActualCommand = Arrays.copyOfRange(actualCommand, 2, actualCommand.length);
+        String actualCommandString = String.join(" ", trimmedActualCommand);
+        assertTrue(expectedCommand.length * 4 == trimmedActualCommand.length, "Command length is equal");
+        for (String commandPart: expectedCommand) {
+            assertTrue(actualCommandString.contains(commandPart));
+        }
+    }
+
+    private static TrackAttributes t(int id) {
+        return new TrackAttributes(id, "", "", false, false, false, false, TrackType.AUDIO);
+    }
+}

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/validation/ValidationExecutionStrategyTest.java

@@ -0,0 +1,60 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.validation;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.CommandRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import picocli.CommandLine;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.PathUtils.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.args;
+import static org.junit.jupiter.api.Assertions.*;
+
+class ValidationExecutionStrategyTest {
+
+    @Test
+    void validate() {
+        CommandRunner underTest = new CommandRunner();
+        new CommandLine(underTest)
+                .setExecutionStrategy(new ValidationExecutionStrategy())
+                .parseArgs("-a", "ger:ger", "-m", TEST_MKVTOOLNIX_DIR, TEST_FILE);
+
+        assertEquals(TEST_FILE, underTest.getConfig().getLibraryPath().getPath().replace("\\", "/"));
+        assertEquals(TEST_MKVTOOLNIX_DIR, underTest.getConfig().getMkvToolNix().getPath().replace("\\", "/"));
+    }
+
+    private static Stream<Arguments> validateFailure() {
+        return Stream.of(
+                Arguments.of(new String[]{"-a", "jpn:ger"}, "Error: Missing required argument(s): <libraryPath>"),
+                Arguments.of(new String[]{"/arstarstarst"}, "libraryPath does not exist"),
+                Arguments.of(new String[]{"/arstarstarst", "-a",}, "Missing required parameter for option '--attribute-config' at index 0 (<attributeConfig>)"),
+                Arguments.of(new String[]{"/arstarstarst", "-a", "jpn:ger"}, "libraryPath does not exist"),
+                Arguments.of(new String[]{"/arstarstarst", "-m"}, "Missing required parameter for option '--mkvtoolnix' (<mkvToolNix>)"),
+                Arguments.of(new String[]{"./", "-m", TEST_INVALID_DIR}, "mkvToolNix does not exist"),
+                Arguments.of(new String[]{"./", "-t"}, "Missing required parameter for option '--threads' (<threads>)"),
+                Arguments.of(new String[]{"./", "-t", "0"}, "threads must be greater than or equal to 1"),
+                Arguments.of(new String[]{"./", "-t", "-1"}, "threads must be greater than or equal to 1"),
+                Arguments.of(new String[]{"./", "-c", "-1"}, "coherent must be greater than or equal to 0")
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("validateFailure")
+    void validateFailure(String[] args, String expectedMessage) {
+        StringWriter writer = new StringWriter();
+        PrintWriter printWriter = new PrintWriter(writer);
+
+        new CommandLine(CommandRunner.class)
+                .setExecutionStrategy(new ValidationExecutionStrategy())
+                .setErr(printWriter)
+                .execute(args);
+
+        printWriter.flush();
+        assertEquals(expectedMessage, writer.toString().split("[\r\n]")[0]);
+    }
+}

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/FileInfoDtoTest.java

@@ -1,59 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
-
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.util.Set;
-import java.util.stream.Stream;
-
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.createFileInfo;
-import static org.junit.jupiter.api.Assertions.*;
-
-class FileInfoDtoTest {
-    private static final FileAttribute AUDIO_GER_DEFAULT = new FileAttribute(0, "ger", "", true, false, LaneType.AUDIO);
-    private static final FileAttribute AUDIO_GER = new FileAttribute(0, "ger", "", false, false, LaneType.AUDIO);
-    private static final FileAttribute AUDIO_ENG_DEFAULT = new FileAttribute(1, "eng", "", true, false, LaneType.AUDIO);
-    private static final FileAttribute AUDIO_ENG = new FileAttribute(1, "eng", "", false, false, LaneType.AUDIO);
-
-    private static final FileAttribute SUB_GER_DEFAULT = new FileAttribute(0, "ger", "", true, false, LaneType.SUBTITLES);
-    private static final FileAttribute SUB_GER = new FileAttribute(0, "ger", "", false, false, LaneType.SUBTITLES);
-    private static final FileAttribute SUB_ENG_DEFAULT = new FileAttribute(1, "eng", "", true, false, LaneType.SUBTITLES);
-    private static final FileAttribute SUB_ENG = new FileAttribute(1, "eng", "", false, false, LaneType.SUBTITLES);
-
-
-    private static Stream<Arguments> isAudioDifferent() {
-        return Stream.of(
-                Arguments.of(createFileInfo(Set.of(AUDIO_GER_DEFAULT), AUDIO_GER_DEFAULT), false),
-                Arguments.of(createFileInfo(Set.of(AUDIO_GER_DEFAULT), AUDIO_ENG), true),
-                Arguments.of(createFileInfo(Set.of(AUDIO_GER_DEFAULT, AUDIO_ENG_DEFAULT), AUDIO_GER_DEFAULT), true),
-                Arguments.of(createFileInfo(Set.of(), AUDIO_GER), true),
-                Arguments.of(createFileInfo(null, AUDIO_GER), true)
-        );
-    }
-
-    @ParameterizedTest
-    @MethodSource
-    void isAudioDifferent(FileInfoDto underTest, boolean expected) {
-        assertEquals(expected, underTest.isAudioDifferent());
-    }
-
-    private static Stream<Arguments> isSubtitleDifferent() {
-        return Stream.of(
-                Arguments.of(createFileInfo(Set.of(SUB_GER_DEFAULT), SUB_GER_DEFAULT, new AttributeConfig("", "ger")), false),
-                Arguments.of(createFileInfo(Set.of(SUB_GER_DEFAULT), SUB_ENG, new AttributeConfig("", "eng")), true),
-                Arguments.of(createFileInfo(Set.of(SUB_GER_DEFAULT, SUB_ENG_DEFAULT), SUB_ENG, new AttributeConfig("", "eng")), true),
-                Arguments.of(createFileInfo(Set.of(), SUB_ENG, new AttributeConfig("", "ger")), true),
-                Arguments.of(createFileInfo(null, SUB_GER, new AttributeConfig("", "ger")), true),
-                Arguments.of(createFileInfo(null, null, new AttributeConfig("", "OFF")), false),
-                Arguments.of(createFileInfo(Set.of(), null, new AttributeConfig("", "OFF")), false),
-                Arguments.of(createFileInfo(Set.of(SUB_GER_DEFAULT), null, new AttributeConfig("", "OFF")), true)
-            );
-    }
-
-    @ParameterizedTest
-    @MethodSource
-    void isSubtitleDifferent(FileInfoDto underTest, boolean expected) {
-        assertEquals(expected, underTest.isSubtitleDifferent());
-    }
-}

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

@@ -1,11 +1,13 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.util.Date;
 
 import static org.junit.jupiter.api.Assertions.*;
 
+@Disabled
 class DateUtilsTest {
 
     @Test

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

@@ -0,0 +1,28 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.TrackAttributes;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.TrackType;
+
+public class FileInfoTestUtil {
+    public static final TrackAttributes AUDIO_GER = new TrackAttributes(0, "ger", "", false, false, false, false, TrackType.AUDIO);
+    public static final TrackAttributes AUDIO_ENG = new TrackAttributes(1, "eng", "", false, false, false, false, TrackType.AUDIO);
+    public static final TrackAttributes AUDIO_GER_DEFAULT = new TrackAttributes(0, "ger", "", true, false, false, false, TrackType.AUDIO);
+    public static final TrackAttributes AUDIO_ENG_DEFAULT = new TrackAttributes(1, "eng", "", true, false, false, false, TrackType.AUDIO);
+    public static final TrackAttributes AUDIO_GER_FORCED = new TrackAttributes(0, "ger", "", false, true, false, false, TrackType.AUDIO);
+    public static final TrackAttributes AUDIO_ENG_FORCED = new TrackAttributes(1, "eng", "", false, true, false, false, TrackType.AUDIO);
+    public static final TrackAttributes AUDIO_GER_COMMENTARY = new TrackAttributes(0, "ger", "", false, false, true, false, TrackType.AUDIO);
+    public static final TrackAttributes AUDIO_ENG_COMMENTARY = new TrackAttributes(1, "eng", "", false, false, true, false, TrackType.AUDIO);
+    public static final TrackAttributes AUDIO_GER_HEARING = new TrackAttributes(0, "ger", "", false, false, false, true, TrackType.AUDIO);
+    public static final TrackAttributes AUDIO_ENG_HEARING = new TrackAttributes(1, "ger", "", false, false, false, true, TrackType.AUDIO);
+
+    public static final TrackAttributes SUB_GER = new TrackAttributes(0, "ger", "", false, false, false, false, TrackType.SUBTITLES);
+    public static final TrackAttributes SUB_ENG = new TrackAttributes(1, "eng", "", false, false, false, false, TrackType.SUBTITLES);
+    public static final TrackAttributes SUB_GER_DEFAULT = new TrackAttributes(0, "ger", "", true, false, false, false, TrackType.SUBTITLES);
+    public static final TrackAttributes SUB_ENG_DEFAULT = new TrackAttributes(1, "eng", "", true, false, false, false, TrackType.SUBTITLES);
+    public static final TrackAttributes SUB_GER_FORCED = new TrackAttributes(0, "ger", "", false, true, false, false, TrackType.SUBTITLES);
+    public static final TrackAttributes SUB_ENG_FORCED = new TrackAttributes(1, "eng", "", false, true, false, false, TrackType.SUBTITLES);
+
+    public static TrackAttributes withName(TrackAttributes track, String trackName) {
+        return new TrackAttributes(track.id(), track.language(), trackName, track.defaultt(), track.forced(), track.commentary(), track.hearingImpaired(), track.type());
+    }
+}

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

@@ -1,6 +1,10 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
 
+import org.apache.commons.lang3.SystemUtils;
+
 public class PathUtils {
     public static final String TEST_DIR = "src/test/resources/test-dir";
     public static final String TEST_FILE = "src/test/resources/test-dir/test-file.mkv";
+    public static final String TEST_INVALID_DIR = "src/test/resources/test-dir";
+    public static final String TEST_MKVTOOLNIX_DIR = SystemUtils.IS_OS_WINDOWS ? "src/test/resources/mkvtoolnix_exe" : "src/test/resources/mkvtoolnix";
 }

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

@@ -1,20 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
-
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-import java.util.Set;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class SetUtilsTest {
-
-    @Test
-    void retainOf() {
-        List<Integer> list1 = List.of(1, 2, 3, 4, 5);
-        List<Integer> list2 = List.of(2, 4, 6, 8, 10);
-        Set<Integer> expected = Set.of(2, 4);
-
-        assertEquals(expected, SetUtils.retainOf(list1, list2));
-    }
-}

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

@@ -1,46 +1,12 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
 
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileAttribute;
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.FileInfoDto;
-import org.junit.jupiter.params.provider.Arguments;
-
-import java.util.Arrays;
-import java.util.Set;
-
-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);
-    }
-
-    public static FileInfoDto createFileInfo(Set<FileAttribute> defaultAudio, FileAttribute desiredAudio) {
-        FileInfoDto fileInfoDto = new FileInfoDto(null);
-        fileInfoDto.setExistingDefaultAudioLanes(defaultAudio);
-        fileInfoDto.setDesiredDefaultAudioLane(desiredAudio);
-        return fileInfoDto;
-    }
-
-    public static FileInfoDto createFileInfo(Set<FileAttribute> defaultSubtitle, FileAttribute desiredSubtitle, AttributeConfig config) {
-        FileInfoDto fileInfoDto = new FileInfoDto(null);
-        fileInfoDto.setExistingDefaultSubtitleLanes(defaultSubtitle);
-        fileInfoDto.setDesiredDefaultSubtitleLane(desiredSubtitle);
-        fileInfoDto.setMatchedConfig(config);
-        return fileInfoDto;
+    public static String[] args(String... args) {
+        String[] staticArray = new String[]{"-a", "jpn:ger", "/"};
+        String[] result = new String[staticArray.length + args.length];
+        System.arraycopy(args, 0, result, 0, args.length);
+        System.arraycopy(staticArray, 0, result, args.length, staticArray.length);
+        return result;
     }
 }

src/wix/resources/main.wxs

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+  <?ifdef JpIsSystemWide ?>
+    <?define JpInstallScope="perMachine"?>
+  <?else?>
+    <?define JpInstallScope="perUser"?>
+  <?endif?>
+
+  <?define JpProductLanguage=1033 ?>
+  <?define JpInstallerVersion=200 ?>
+  <?define JpCompressedMsi=yes ?>
+
+  <?ifdef JpAllowUpgrades ?>
+    <?define JpUpgradeVersionOnlyDetectUpgrade="no"?>
+  <?else?>
+    <?define JpUpgradeVersionOnlyDetectUpgrade="yes"?>
+  <?endif?>
+  <?ifdef JpAllowDowngrades ?>
+    <?define JpUpgradeVersionOnlyDetectDowngrade="no"?>
+  <?else?>
+    <?define JpUpgradeVersionOnlyDetectDowngrade="yes"?>
+  <?endif?>
+
+  <?define JpProductCode="*"?>
+  <?define JpAppName="${project.artifactId}"?>
+  <?define JpAppVersion="${project.version}"?>
+  <?define JpAppVendor="${project.maintainer}"?>
+  <?define JpProductUpgradeCode="a9527300-d364-4cc3-a392-94035065d8c9"?>
+  <?define JpAppDescription="${project.description}"?>
+  <?define JpHelpURL="github.com/${project.maintainer}/${project.artifactId}"?>
+
+  <Product
+    Id="$(var.JpProductCode)"
+    Name="$(var.JpAppName)"
+    Language="$(var.JpProductLanguage)"
+    Version="$(var.JpAppVersion)"
+    Manufacturer="$(var.JpAppVendor)"
+    UpgradeCode="$(var.JpProductUpgradeCode)">
+
+    <Package
+      Description="$(var.JpAppDescription)"
+      Manufacturer="$(var.JpAppVendor)"
+      InstallerVersion="$(var.JpInstallerVersion)"
+      Compressed="$(var.JpCompressedMsi)"
+      InstallScope="$(var.JpInstallScope)" Platform="x64"
+    />
+
+    <Media Id="1" Cabinet="Data.cab" EmbedCab="yes" />
+
+    <Upgrade Id="$(var.JpProductUpgradeCode)">
+      <UpgradeVersion
+        OnlyDetect="$(var.JpUpgradeVersionOnlyDetectUpgrade)"
+        Property="JP_UPGRADABLE_FOUND"
+        Maximum="$(var.JpAppVersion)"
+        MigrateFeatures="yes"
+        IncludeMaximum="$(var.JpUpgradeVersionOnlyDetectUpgrade)" />
+      <UpgradeVersion
+        OnlyDetect="$(var.JpUpgradeVersionOnlyDetectDowngrade)"
+        Property="JP_DOWNGRADABLE_FOUND"
+        Minimum="$(var.JpAppVersion)"
+        MigrateFeatures="yes"
+        IncludeMinimum="$(var.JpUpgradeVersionOnlyDetectDowngrade)" />
+    </Upgrade>
+
+    <?ifndef JpAllowUpgrades ?>
+    <CustomAction Id="JpDisallowUpgrade" Error="!(loc.DisallowUpgradeErrorMessage)" />
+    <?endif?>
+    <?ifndef JpAllowDowngrades ?>
+    <CustomAction Id="JpDisallowDowngrade" Error="!(loc.DowngradeErrorMessage)" />
+    <?endif?>
+
+    <Binary Id="JpCaDll" SourceFile="wixhelper.dll"/>
+
+    <CustomAction Id="JpFindRelatedProducts" BinaryKey="JpCaDll" DllEntry="FindRelatedProductsEx" />
+
+    <!-- Standard required root -->
+    <Directory Id="TARGETDIR" Name="SourceDir"/>
+
+    <Feature Id="DefaultFeature" Title="!(loc.MainFeatureTitle)" Level="1">
+      <ComponentGroupRef Id="Shortcuts"/>
+      <ComponentGroupRef Id="Files"/>
+      <ComponentGroupRef Id="FileAssociations"/>
+      <Component Id="pathEnvironmentVariable" Guid="$(var.JpProductUpgradeCode)" KeyPath="yes" Directory="TARGETDIR">
+        <Environment Id="MyPathVariable" Name="Path" Value="[INSTALLDIR]" Action="set" System="no" Permanent="no" Part="last" Separator=";" />
+      </Component>
+    </Feature>
+
+    <CustomAction Id="JpSetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
+    <CustomAction Id="JpSetARPCOMMENTS" Property="ARPCOMMENTS" Value="$(var.JpAppDescription)" />
+    <CustomAction Id="JpSetARPCONTACT" Property="ARPCONTACT" Value="$(var.JpAppVendor)" />
+<!--     <CustomAction Id="JpSetARPSIZE" Property="ARPSIZE" Value="$(var.JpAppSizeKb)" /> -->
+
+    <?ifdef JpHelpURL ?>
+      <CustomAction Id="JpSetARPHELPLINK" Property="ARPHELPLINK" Value="$(var.JpHelpURL)" />
+    <?endif?>
+
+    <?ifdef JpAboutURL ?>
+      <CustomAction Id="JpSetARPURLINFOABOUT" Property="ARPURLINFOABOUT" Value="$(var.JpAboutURL)" />
+    <?endif?>
+
+    <?ifdef JpUpdateURL ?>
+      <CustomAction Id="JpSetARPURLUPDATEINFO" Property="ARPURLUPDATEINFO" Value="$(var.JpUpdateURL)" />
+    <?endif?>
+
+    <?ifdef JpIcon ?>
+    <Property Id="ARPPRODUCTICON" Value="JpARPPRODUCTICON"/>
+    <Icon Id="JpARPPRODUCTICON" SourceFile="$(var.JpIcon)"/>
+    <?endif?>
+
+    <UIRef Id="JpUI"/>
+
+    <InstallExecuteSequence>
+      <Custom Action="JpSetARPINSTALLLOCATION" After="CostFinalize">Not Installed</Custom>
+      <Custom Action="JpSetARPCOMMENTS" After="CostFinalize">Not Installed</Custom>
+      <Custom Action="JpSetARPCONTACT" After="CostFinalize">Not Installed</Custom>
+<!--       <Custom Action="JpSetARPSIZE" After="CostFinalize">Not Installed</Custom> -->
+      <?ifdef JpHelpURL ?>
+        <Custom Action="JpSetARPHELPLINK" After="CostFinalize">Not Installed</Custom>
+      <?endif?>
+      <?ifdef JpAboutURL ?>
+        <Custom Action="JpSetARPURLINFOABOUT" After="CostFinalize">Not Installed</Custom>
+      <?endif?>
+      <?ifdef JpUpdateURL ?>
+        <Custom Action="JpSetARPURLUPDATEINFO" After="CostFinalize">Not Installed</Custom>
+      <?endif?>
+
+      <?ifndef JpAllowUpgrades ?>
+      <Custom Action="JpDisallowUpgrade" After="JpFindRelatedProducts">JP_UPGRADABLE_FOUND</Custom>
+      <?endif?>
+      <?ifndef JpAllowDowngrades ?>
+      <Custom Action="JpDisallowDowngrade" After="JpFindRelatedProducts">JP_DOWNGRADABLE_FOUND</Custom>
+      <?endif?>
+      <RemoveExistingProducts Before="CostInitialize"/>
+      <Custom Action="JpFindRelatedProducts" After="FindRelatedProducts"/>
+    </InstallExecuteSequence>
+
+    <InstallUISequence>
+      <Custom Action="JpFindRelatedProducts" After="FindRelatedProducts"/>
+    </InstallUISequence>
+
+  </Product>
+</Wix>