Merge pull request #28 from RatzzFatzz/dev-config-validators

Update parameter validation

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [RatzzFatzz]
+custom: "https://paypal.me/ratzmichael"

.github/ISSUE_TEMPLATE/default-bug-report.md

@@ -0,0 +1,23 @@
+---
+name: Bug Report
+about: Create a report to help me improve
+title: ''
+labels: bug
+assignees: RatzzFatzz
+
+---
+
+**Environment**
+Java Version: [e.g. 8, 11, 17]
+MKV Audio Subtitle Changer version: [e.g. v1.1, v2.0]
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Additional context**
+Add any other context about the problem here.
+
+### Please attach logs

.github/ISSUE_TEMPLATE/default-feature-request.md

@@ -0,0 +1,11 @@
+---
+name: Feature Request
+about: Tell me about something you would want me to add
+title: ''
+labels: feature-request
+
+---
+
+**Describe your feature**
+A clear and concise description of the expected behaviour. 
+

.github/workflows/release.yml

@@ -0,0 +1,35 @@
+# This workflow will run every time a new release is created.
+
+name: Build and release
+on:
+  release:
+    types: [created]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 11
+
+      - name: Setup workspace
+        run: mkdir artifacts
+
+      - name: Build with Maven
+        run: |
+          mvn clean package --file pom.xml
+          cp target/M*.{zip,tar} artifacts/
+
+      - name: Upload artifacts
+        uses: skx/github-action-publish-binaries@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: 'artifacts/M*'
+        

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -2,42 +2,36 @@
  - Introduction
  - Requirements
  - Running
- - config.yml example
+ - Configuration
+ - Additional parameters
  
 ### Introduction
 
-This program helps changing audio and subtitle lines of mkv files.
+This program helps to change audio and subtitle lines of mkv files.
 
 ### Requirements
 
- - Java 8 or higher
+ - Java 11 or higher
  - mkvtoolnix installation
  
 ### Running
 
-Opening terminal / cmd in the directory of the jar and the config file and execute following command:
+1. Extract downloaded archive
+2. Copy `config-template.yaml` to `config.yaml`
+3. Update `config.yaml` to fit your needs
+4. Open terminal / cmd in the directory of the jar and the config file 
+5. Execute following commands:
+   1. (Optional) `java -jar mkvaudiosubtitleschanger.jar -l [path to mkv or dir with mkv] --safe-mode`
+   2. To permanently apply changes: `java -jar mkvaudiosubtitleschanger.jar -l [path to mkv or dir with mkv]`
 
-`java -jar mkvaudiosubtitleschanger.jar -l [path to mkv or dir with mkv]`
+### Configuration
 
-### Additional arameters
-```properties
- -c,--config                 path to config
- -h,--help                   "for help this is" - Yoda
- -k,--forcedKeywords <arg>   Additional keywords to identify forced tracks
- -l,--library <arg>          path to library (Required)
- -s,--safe-mode              Test run (no files will be changes)
- -t,--threads <arg>          thread count
-```
-
-### config.yml example
-Config file needs to be placed in the same directory as the jar or path to config has to be passed via command line 
+Config file needs to be placed in the same directory as the jar or path to config has to be passed via command line
 argument.
 
+The list of language configurations can be expanded. Use `OFF` if you want to turn of the audio or subtitle lane. 
+Players probably will display forced subtitles nonetheless.
 ```yaml
-mkvtoolnixPath: C:\Program Files\MKVToolNix
-# Recommendations for data stored on HDDs, increase when using SSDs
-threads: 2
-#forcedKeywords: ["forced", "signs"]
 config:
   1:
     audio: ger
@@ -47,3 +41,19 @@ config:
     subtitle: ger
 ```
 Subtitle lanes recognized as forced will be set as one. Already existing ones will not be overwritten or changed.
+
+
+### Additional arameters
+These properties overwrite already existing values in the config file.
+```properties
+ -c,--config <arg>                Path to config file
+ -e,--exclude-directories <arg>   Directories to be excluded, combines with config file
+ -h,--help                        "for help this is" - Yoda
+ -i,--include-pattern <arg>       Include files matching pattern
+ -k,--forcedKeywords <arg>        Additional keywords to identify forced tracks, combines with config file
+ -l,--library <arg>               Path to library
+ -m,--mkvtoolnix <arg>            Path to mkv tool nix installation
+ -s,--safe-mode                   Test run (no files will be changes)
+ -t,--threads <arg>               thread count (default: 2)
+ -v,--version                     Display version
+```

config-template.yaml

@@ -1,11 +1,18 @@
-mkvtoolnixPath: C:\Program Files\MKVToolNix
-# Recommendations for data stored on HDDs, increase when using SSDs
-threads: 2
-#forcedKeywords: ["forced", "signs"]
+mkvtoolnix: C:\Program Files\MKVToolNix
+
 config:
   1:
     audio: ger
     subtitle: OFF
   2:
     audio: eng
-    subtitle: ger
+    subtitle: ger
+
+# Recommendations for data stored on HDDs, increase when using SSDs
+#threads: 2
+#forcedKeywords: ["forced", "signs"]
+#exclude-directories:
+#  - "D:/Path/To/File.mkv"
+#  - "D:/Path/To/Directory"
+#include-pattern: "regex"
+

language-codes

@@ -0,0 +1,487 @@
+aar
+abk
+ace
+ach
+ada
+ady
+afa
+afh
+afr
+ain
+aka
+akk
+alb
+ale
+alg
+alt
+ang
+amh
+anp
+apa
+ara
+arc
+arg
+arm
+arn
+arp
+art
+arw
+asm
+ast
+ath
+aus
+ava
+ave
+awa
+aym
+aze
+bad
+bai
+bak
+bal
+bam
+ban
+baq
+bas
+bat
+bej
+bel
+bem
+ben
+ber
+bho
+bih
+bik
+bin
+bis
+bla
+bnt
+bos
+bra
+bre
+btk
+bua
+bug
+bul
+bur
+byn
+cad
+cai
+car
+cat
+cau
+ceb
+cel
+cha
+chb
+che
+chg
+chi
+chk
+chm
+chn
+cho
+chp
+chr
+chu
+chv
+chy
+cmc
+cnr
+cop
+cor
+cos
+cpe
+cpf
+cpp
+cre
+crh
+crp
+csb
+cus
+cze
+dak
+dan
+dar
+day
+del
+den
+dgr
+din
+div
+doi
+dra
+dsb
+dua
+dum
+dut
+dyu
+dzo
+efi
+egy
+eka
+elx
+eng
+enm
+epo
+est
+ewe
+ewo
+fan
+fao
+fat
+fij
+fil
+fin
+fiu
+fon
+fre
+frm
+fro
+frr
+frs
+fry
+ful
+fur
+gaa
+gay
+gba
+gem
+geo
+ger
+gez
+gil
+gla
+gle
+glg
+glv
+gmh
+goh
+gon
+gor
+got
+grb
+grc
+gre
+grn
+gsw
+guj
+gwi
+hai
+hat
+hau
+haw
+heb
+her
+hil
+him
+hin
+hit
+hmn
+hmo
+hrv
+hsb
+hun
+hup
+iba
+ibo
+ice
+ido
+iii
+ijo
+iku
+ile
+ilo
+ina
+inc
+ind
+ine
+inh
+ipk
+ira
+iro
+ita
+jav
+jbo
+jpn
+jpr
+jrb
+kaa
+kab
+kac
+kal
+kam
+kan
+kar
+kas
+kau
+kaw
+kaz
+kbd
+kha
+khi
+khm
+kho
+kik
+kin
+kir
+kmb
+kok
+kom
+kon
+kor
+kos
+kpe
+krc
+krl
+kro
+kru
+kua
+kum
+kur
+kut
+lad
+lah
+lam
+lao
+lat
+lav
+lez
+lim
+lin
+lit
+lol
+loz
+ltz
+lua
+lub
+lug
+lui
+lun
+luo
+lus
+mac
+mad
+mag
+mah
+mai
+mak
+mal
+man
+mao
+map
+mar
+mas
+may
+mdf
+mdr
+men
+mga
+mic
+min
+mis
+mkh
+mlg
+mlt
+mnc
+mni
+mno
+moh
+mon
+mos
+mul
+mun
+mus
+mwl
+mwr
+myn
+myv
+nah
+nai
+nap
+nau
+nav
+nbl
+nde
+ndo
+nds
+nep
+new
+nia
+nic
+niu
+nno
+nob
+nog
+non
+nor
+nqo
+nso
+nub
+nwc
+nya
+nym
+nyn
+nyo
+nzi
+oci
+oji
+ori
+orm
+osa
+oss
+ota
+oto
+paa
+pag
+pal
+pam
+pan
+pap
+pau
+peo
+per
+phi
+phn
+pli
+pol
+pon
+por
+pra
+pro
+pus
+que
+raj
+rap
+rar
+roa
+roh
+rom
+rum
+run
+rup
+rus
+sad
+sag
+sah
+sai
+sal
+sam
+san
+sas
+sat
+scn
+sco
+sel
+sem
+sga
+sgn
+shn
+sid
+sin
+sio
+sit
+sla
+slo
+slv
+sma
+sme
+smi
+smj
+smn
+smo
+sms
+sna
+snd
+snk
+sog
+som
+son
+sot
+spa
+srd
+srn
+srp
+srr
+ssa
+ssw
+suk
+sun
+sus
+sux
+swa
+swe
+syc
+syr
+tah
+tai
+tam
+tat
+tel
+tem
+ter
+tet
+tgk
+tgl
+tha
+tib
+tig
+tir
+tiv
+tkl
+tlh
+tli
+tmh
+tog
+ton
+tpi
+tsi
+tsn
+tso
+tuk
+tum
+tup
+tur
+tut
+tvl
+twi
+tyv
+udm
+uga
+uig
+ukr
+umb
+und
+urd
+uzb
+vai
+ven
+vie
+vol
+vot
+wak
+wal
+war
+was
+wel
+wen
+wln
+wol
+xal
+xho
+yao
+yap
+yid
+yor
+ypk
+zap
+zbl
+zen
+zgh
+zha
+znd
+zul
+zun
+zxx
+zza
+OFF

maven/assembly.xml

@@ -0,0 +1,25 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>zip</id>
+    <includeBaseDirectory>true</includeBaseDirectory>
+
+    <formats>
+        <format>zip</format>
+        <format>tar</format>
+    </formats>
+    <files>
+        <file>
+            <source> ${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
+            <destName>${project.artifactId}.jar</destName>
+            <outputDirectory>/</outputDirectory>
+        </file>
+        <file>
+            <source>${project.basedir}/config-template.yaml</source>
+            <outputDirectory>/</outputDirectory>
+        </file>
+        <file>
+            <source></source>
+        </file>
+    </files>
+</assembly>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>MKVAudioSubtileChanger</groupId>
     <artifactId>MKVAudioSubtitleChanger</artifactId>
-    <version>2.0</version>
+    <version>3.0</version>
 
     <build>
         <defaultGoal>clean package</defaultGoal>
@@ -16,6 +16,14 @@
             <resource>
                 <directory>src/main/resources</directory>
             </resource>
+            <resource>
+                <directory>./</directory>
+                <includes>
+                    <include>language-codes</include>
+                    <include>version.properties</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
         </resources>
         <testResources>
             <testResource>
@@ -24,15 +32,6 @@
         </testResources>
 
         <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -76,10 +75,29 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>9</source>
-                    <target>9</target>
+                    <source>11</source>
+                    <target>11</target>
                 </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>
 
@@ -99,7 +117,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.8</version>
+            <version>1.18.24</version>
             <scope>provided</scope>
         </dependency>
         <!-- region logging -->
@@ -137,12 +155,12 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.13.1</version>
+            <version>2.13.4</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.2.1</version>
+            <version>2.13.4.1</version>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
@@ -164,20 +182,26 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.4.2</version>
+            <version>5.9.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.4.2</version>
+            <version>5.9.0</version>
             <scope>test</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.9.5</version>
+            <version>1.10.19</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>5.9.0</version>
             <scope>test</scope>
         </dependency>
         <!-- endregion -->

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

@@ -14,15 +14,17 @@ import me.tongfei.progressbar.ProgressBarStyle;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 @Log4j2
 public class AttributeUpdaterKernel {
 
-    private final ExecutorService executor = Executors.newFixedThreadPool(Config.getInstance().getThreadCount());
+    private final ExecutorService executor = Executors.newFixedThreadPool(Config.getInstance().getThreads());
     private final FileCollector collector;
     private final FileProcessor processor;
     private final ResultStatistic statistic = new ResultStatistic();
@@ -37,7 +39,13 @@ public class AttributeUpdaterKernel {
         statistic.startTimer();
 
         try (ProgressBar progressBar = pbBuilder().build()) {
-            List<File> files = collector.loadFiles(Config.getInstance().getLibraryPath());
+            List<File> excludedFiles = Config.getInstance().getExcludedDirectories().stream()
+                    .map(collector::loadFiles)
+                    .flatMap(Collection::stream)
+                    .collect(Collectors.toList());
+            List<File> files = collector.loadFiles(Config.getInstance().getLibraryPath().getAbsolutePath()).stream()
+                    .filter(file -> !excludedFiles.contains(file))
+                    .collect(Collectors.toList());
             progressBar.maxHint(files.size());
             files.forEach(file -> executor.submit(() -> process(file, progressBar)));
             executor.shutdown();
@@ -46,25 +54,31 @@ public class AttributeUpdaterKernel {
 
         statistic.stopTimer();
         System.out.println(statistic);
+        log.info(statistic);
     }
 
     private void process(File file, ProgressBar progressBar) {
-        statistic.total();
         List<FileAttribute> attributes = processor.loadAttributes(file);
         FileInfoDto fileInfo = processor.filterAttributes(attributes);
+        statistic.total();
         if (fileInfo.isChangeNecessary()) {
             statistic.shouldChange();
             if (!Config.getInstance().isSafeMode()) {
                 try {
                     processor.update(file, fileInfo);
                     statistic.success();
-                } catch (IOException e) {
-                    statistic.failure();
-                    log.warn("File couldn't be updated: {}", file.getAbsoluteFile());
+                    log.info("Updated {}", file.getAbsolutePath());
+                } catch (IOException | RuntimeException e) {
+                    statistic.failedChanging();
+                    log.warn("File couldn't be updated: '{}', Error: {}", file.getAbsoluteFile(), e.getMessage().replaceAll("\\r|\\n", " "));
                 }
             }
+        } else if (fileInfo.isUnableToApplyConfig()) {
+            statistic.noSuitableConfigFound();
+        } else if (fileInfo.isAlreadySuitable()){
+            statistic.alreadyFits();
         } else {
-            statistic.fits();
+            statistic.failure();
         }
         progressBar.step();
     }

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

@@ -1,25 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.log4j.Log4j2;
-
-@Log4j2
-@Getter
-@Setter
-public class MKVToolProperties {
-    private String mkvmergePath;
-    private String mkvpropeditPath;
-
-    private static MKVToolProperties instance = null;
-
-    private MKVToolProperties() {
-    }
-
-    public static MKVToolProperties getInstance() {
-        if (instance == null) {
-            instance = new MKVToolProperties();
-        }
-        return instance;
-    }
-}

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

@@ -1,62 +1,16 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger;
 
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ConfigLoader;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.MkvFileCollector;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.MkvFileProcessor;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.cli.*;
-
-import java.util.List;
-
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*;
-import static java.lang.Integer.parseInt;
 
 @Log4j2
 public class Main {
     public static void main(String[] args) {
-        initConfig(args);
+        ConfigLoader.initConfig(args);
         AttributeUpdaterKernel kernel = new AttributeUpdaterKernel(new MkvFileCollector(), new MkvFileProcessor());
         kernel.execute();
     }
-
-    private static void initConfig(String[] args) {
-        Options options = new Options();
-        options.addOption("h", HELP.toString(), false, "\"for help this is\" - Yoda");
-        options.addRequiredOption("l", LIBRARY.toString(), true, "path to library");
-        options.addOption("c", CONFIG.toString(), false, "path to config");
-        options.addOption("t", THREADS.toString(), true, "thread count");
-        options.addOption("s", SAFE_MODE.toString(), false, "Test run (no files will be changes)");
-        options.addOption(create("k", FORCED_KEYWORDS.toString(), Option.UNLIMITED_VALUES, "Additional keywords to identify forced tracks"));
-
-        CommandLineParser parser = new DefaultParser();
-        HelpFormatter formatter = new HelpFormatter();
-        try {
-            CommandLine cmd = parser.parse(options, args);
-
-            if (cmd.hasOption("help")) {
-                formatter.printHelp("java -jar MKVAudioSubtitlesChanger.jar -p <path_to_library>", options);
-                System.exit(0);
-            }
-
-            Config config = Config.getInstance();
-            config.loadConfig(cmd.getOptionValue(CONFIG.toString(), "config.yaml")); // use cmd input
-            config.setLibraryPath(cmd.getOptionValue("library"));
-            config.setSafeMode(cmd.hasOption("safe-mode"));
-            if (cmd.hasOption("threads")) config.setThreadCount(parseInt(cmd.getOptionValue("threads")));
-            if (cmd.hasOption(FORCED_KEYWORDS.toString()))
-                config.getForcedKeywords().addAll(List.of(cmd.getOptionValues(FORCED_KEYWORDS.toString())));
-            config.isValid();
-        } catch (ParseException e) {
-            log.error(e);
-            formatter.printHelp("java -jar MKVAudioSubtitlesChanger.jar -p <path_to_library>", options);
-            System.exit(1);
-        }
-    }
-
-    private static Option create(String opt, String longOpt, int args, String desc) {
-        Option option = new Option(opt, desc);
-        option.setLongOpt(longOpt);
-        option.setArgs(args);
-        return option;
-    }
 }

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

@@ -1,118 +1,84 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
 
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix;
-import at.pcgamingfreaks.yaml.YAML;
-import at.pcgamingfreaks.yaml.YamlInvalidContentException;
-import at.pcgamingfreaks.yaml.YamlKeyNotFoundException;
 import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.extern.log4j.Log4j2;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.HelpFormatter;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.MKV_TOOL_NIX;
+import java.util.regex.Pattern;
 
 @Log4j2
 @Getter
 @Setter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class Config {
     @Getter(AccessLevel.NONE)
     @Setter(AccessLevel.NONE)
     private static Config config = null;
+    @Getter(AccessLevel.NONE)
+    CommandLineParser parser = new DefaultParser();
+    @Getter(AccessLevel.NONE)
+    HelpFormatter formatter = new HelpFormatter();
+    private File configPath;
+    private File libraryPath;
+    @Getter(AccessLevel.NONE)
+    private File mkvToolNix;
+
+    private int threads;
+    private Pattern includePattern;
+    private boolean safeMode;
+
+    private Set<String> forcedKeywords = new HashSet<>(Arrays.asList("forced", "signs"));
+    private Set<String> commentaryKeywords = new HashSet<>(Arrays.asList("commentary", "director"));
+    private Set<String> excludedDirectories = new HashSet<>();
 
     private List<AttributeConfig> attributeConfig;
-    private int threadCount;
-    private Set<String> forcedKeywords = new HashSet<>(Arrays.asList("forced", "signs"));
-    @Getter(AccessLevel.NONE)
-    private String mkvtoolnixPath;
-    private String libraryPath;
-    private boolean isSafeMode;
-    private boolean isWindows;
 
     public static Config getInstance() {
-        if (config == null) {
+        return getInstance(false);
+    }
+
+    public static Config getInstance(boolean reset) {
+        if (config == null || reset) {
             config = new Config();
         }
         return config;
     }
 
-    public void isValid() throws RuntimeException {
-        boolean isValid = true;
-        if (attributeConfig == null || attributeConfig.isEmpty()
-                || !attributeConfig.stream().allMatch(AttributeConfig::isValid)) {
-            isValid = false;
-            System.out.println("Audio & subtitle configuration invalid!");
-        }
-        if (threadCount <= 0) {
-            isValid = false;
-            System.out.println("Thread count needs to be at least 1!");
-        }
-        if (mkvtoolnixPath.isEmpty()
-                || !new File(getPathFor(MkvToolNix.MKV_MERGER)).isFile()
-                || !new File(getPathFor(MkvToolNix.MKV_PROP_EDIT)).isFile()) {
-            isValid = false;
-            System.out.println("MkvToolNix installation path invalid!");
-        }
-
-        if (!isValid) {
-            throw new RuntimeException("Invalid configuration");
-        }
+    /**
+     * 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 void loadConfig(String configPath) {
-        try (YAML config = new YAML(new File(configPath))) {
-            setAttributeConfig(loadAttributeConfig(config));
-            setThreadCount(loadThreadCount(config));
-            setMkvtoolnixPath(loadMkvToolNixPath(config));
-            setWindows(System.getProperty("os.name").toLowerCase().contains("windows"));
-            getForcedKeywords().addAll(loadForcedKeywords(config));
-        } catch (YamlInvalidContentException | YamlKeyNotFoundException | IOException e) {
-            log.fatal("Config could not be loaded: {}", e.getMessage());
-        }
-    }
-
-    private List<AttributeConfig> loadAttributeConfig(YAML config) {
-        Function<String, String> audio = key -> config.getString(key + ".audio", null);
-        Function<String, String> subtitle = key -> config.getString(key + ".subtitle", null);
-
-        return config.getKeysFiltered(".*audio.*").stream()
-                .sorted()
-                .map(key -> key.replace(".audio", ""))
-                .map(key -> new AttributeConfig(audio.apply(key), subtitle.apply(key)))
-                .collect(Collectors.toList());
-    }
-
-    private int loadThreadCount(YAML config) throws YamlKeyNotFoundException {
-        return config.isSet(ConfigProperty.THREADS.toString())
-                ? Integer.parseInt(config.getString(ConfigProperty.THREADS.toString()))
-                : 1;
-    }
-
-    private List<String> loadForcedKeywords(YAML config) {
-        return config.getStringList(ConfigProperty.FORCED_KEYWORDS.toString(), new ArrayList<>());
-    }
-
-    private String loadMkvToolNixPath(YAML config) throws YamlKeyNotFoundException {
-        return config.isSet(MKV_TOOL_NIX.toString())
-                ? config.getString(MKV_TOOL_NIX.toString())
-                : defaultMkvToolNixPath();
-    }
-
-    private String defaultMkvToolNixPath() {
-        return System.getProperty("os.name").toLowerCase().contains("windows")
-                ? "C:/Program Files/MKVToolNix/"
-                : "/usr/bin/";
-    }
-
-    public String getPathFor(MkvToolNix exe) {
-        return mkvtoolnixPath.endsWith("/") ? mkvtoolnixPath + exe : mkvtoolnixPath + "/" + exe;
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", Config.class.getSimpleName() + "[", "]")
+                .add("parser=" + parser).add("\n")
+                .add("formatter=" + formatter).add("\n")
+                .add("configPath=" + configPath).add("\n")
+                .add("libraryPath=" + libraryPath).add("\n")
+                .add("isSafeMode=" + safeMode).add("\n")
+                .add("forcedKeywords=" + forcedKeywords).add("\n")
+                .add("commentaryKeywords=" + commentaryKeywords).add("\n")
+                .add("excludedDirectories=" + excludedDirectories).add("\n")
+                .add("threadCount=" + threads).add("\n")
+                .add("includePattern=" + includePattern).add("\n")
+                .add("mkvToolNixPath='" + mkvToolNix + "'").add("\n")
+                .add("attributeConfig=" + attributeConfig)
+                .toString();
     }
 }
 

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

@@ -0,0 +1,106 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator.*;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.VersionUtil;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+
+public class ConfigLoader {
+    private static final List<ConfigValidator<?>> VALIDATORS = List.of(
+            new ConfigPathValidator(CONFIG_PATH, true, Path.of("./config.yaml").toFile()),
+            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 PatternValidator(INCLUDE_PATTERN, false, Pattern.compile(".*")),
+            new SetValidator(FORCED_KEYWORDS, false, true),
+            new SetValidator(COMMENTARY_KEYWORDS, false, true),
+            new SetValidator(EXCLUDE_DIRECTORY, false, true),
+            new AttributeConfigValidator()
+    );
+
+    public static void initConfig(String[] args) {
+        HelpFormatter formatter = new HelpFormatter();
+        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 && Config.getInstance().getConfigPath() != null) {
+                try {
+                    yamlConfig = Config.getInstance().getConfigPath() != null
+                            ? new YAML(Config.getInstance().getConfigPath())
+                            : new YAML("");
+                } catch (IOException | YamlInvalidContentException ignored) {}
+            }
+        }
+
+        if (results.contains(ValidationResult.INVALID)) System.exit(1);
+        System.out.println();
+    }
+
+    private static Options initOptions() {
+        Options options = new Options();
+        options.addOption(optionOf(HELP, HELP.abrv(), HELP.args()));
+        options.addOption(optionOf(VERSION, VERSION.abrv(), VERSION.args()));
+        options.addOption(optionOf(LIBRARY, LIBRARY.abrv(), LIBRARY.args() ));
+        options.addOption(optionOf(MKV_TOOL_NIX, MKV_TOOL_NIX.abrv(), MKV_TOOL_NIX.args() ));
+        options.addOption(optionOf(CONFIG_PATH, CONFIG_PATH.abrv(), CONFIG_PATH.args() ));
+        options.addOption(optionOf(THREADS, THREADS.abrv(), THREADS.args()));
+        options.addOption(optionOf(SAFE_MODE, SAFE_MODE.abrv(), SAFE_MODE.args() ));
+        options.addOption(optionOf(FORCED_KEYWORDS, FORCED_KEYWORDS.abrv(), FORCED_KEYWORDS.args()));
+        options.addOption(optionOf(EXCLUDE_DIRECTORY, FORCED_KEYWORDS.abrv(), FORCED_KEYWORDS.args()));
+        options.addOption(optionOf(INCLUDE_PATTERN, INCLUDE_PATTERN.abrv(), INCLUDE_PATTERN.args()));
+        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(106, "java -jar MKVAudioSubtitlesChanger.jar -l <path_to_library>",
+                    "\nParameters:", options,
+                    "\nFeature requests and bug reports: https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/issues");
+            System.exit(1);
+        }
+        return null; // can't be reached
+    }
+
+    private static void exitIfHelp(CommandLine cmd, Options options, HelpFormatter formatter) {
+        if (cmd.hasOption("help")) {
+            formatter.printHelp(106, "java -jar MKVAudioSubtitlesChanger.jar -l <path_to_library>",
+                    "\nParameters:", options,
+                    "\nFeature requests and bug reports: https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/issues");
+            System.exit(0);
+        }
+    }
+
+    private static void exitIfVersion(CommandLine cmd) {
+        if (cmd.hasOption(VERSION.prop())) {
+            System.out.printf("MKV Audio Subtitle Changer Version %s%n", VersionUtil.getVersion());
+            System.exit(0);
+        }
+    }
+}

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

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

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

@@ -0,0 +1,78 @@
+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.isLanguageValid;
+
+public class AttributeConfigValidator extends ConfigValidator<List<AttributeConfig>> {
+
+    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;
+
+        Function<String, String> audio = key -> yaml.getString(key + ".audio", null);
+        Function<String, String> subtitle = key -> yaml.getString(key + ".subtitle", null);
+
+        if (yaml.getKeysFiltered(property.prop() + ".*").size() > 0) {
+            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 = true;
+        for (AttributeConfig attributeConfig : result) {
+            isValid = isLanguageValid(attributeConfig.getAudioLanguage())
+                            && isLanguageValid(attributeConfig.getSubtitleLanguage());
+            if (!isValid) return false;
+        }
+        return true;
+    }
+}

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

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

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

@@ -0,0 +1,30 @@
+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, File defaultValue) {
+        super(property, required, defaultValue);
+    }
+
+    /**
+     * {@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"));
+    }
+}

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

@@ -0,0 +1,149 @@
+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 org.apache.commons.cli.CommandLine;
+import org.apache.commons.lang3.StringUtils;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+@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 (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();
+		};
+	}
+
+	/**
+	 * 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) {
+        List<Method> methods = Arrays.stream(Config.getInstance().getClass().getDeclaredMethods())
+                .filter(containsSetterOf(property))
+                .collect(Collectors.toList());
+        if (methods.size() != 1) {
+            return false;
+        }
+        try {
+			methods.get(0).invoke(Config.getInstance(), result);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            throw new RuntimeException(e);
+        }
+		return true;
+    }
+
+	protected Predicate<Method> containsSetterOf(ConfigProperty property) {
+		return method -> StringUtils.containsIgnoreCase(method.getName(), "set")
+				&& StringUtils.containsIgnoreCase(method.getName(), property.prop().replace("-", ""));
+	}
+
+	protected Predicate<Method> containsGetterOf(ConfigProperty property) {
+		return method -> StringUtils.containsIgnoreCase(method.getName(), "get")
+				&& StringUtils.containsIgnoreCase(method.getName(), property.prop().replace("-", ""));
+	}
+
+
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,13 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+
+public class FileFilter {
+    static boolean accept(File pathName, String[] fileExtensions) {
+        return StringUtils.endsWithAny(pathName.getAbsolutePath().toLowerCase(), fileExtensions)
+                && Config.getInstance().getIncludePattern().matcher(pathName.getName()).matches();
+    }
+}

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

@@ -14,26 +14,17 @@ import java.util.stream.Stream;
 
 @Log4j2
 public class MkvFileCollector implements FileCollector {
+    private static final String[] fileExtensions = new String[]{".mkv", ".mka", ".mks", ".mk3d"};
 
     @Override
     public List<File> loadFiles(String path) {
-        File file = new File(path);
-        if (file.isFile() && file.getAbsolutePath().endsWith(".mkv")) {
-            return new ArrayList<File>() {{
-                add(file);
-            }};
-        } else if (file.isDirectory()) {
-            try (Stream<Path> paths = Files.walk(Paths.get(path))) {
-                return paths
-                        .filter(Files::isRegularFile)
-                        .map(Path::toFile)
-                        .filter(f -> f.getAbsolutePath().endsWith(".mkv"))
-                        .collect(Collectors.toList());
-            } catch (IOException e) {
-                log.error("Couldn't find file or directory!", e);
-                return new ArrayList<>();
-            }
-        } else {
+        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<>();
         }
     }

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

@@ -2,6 +2,7 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.impl;
 
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.*;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.SetUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
@@ -21,12 +22,12 @@ import static java.lang.String.format;
 @Log4j2
 public class MkvFileProcessor implements FileProcessor {
     private final ObjectMapper mapper = new ObjectMapper();
-    private final String[] forcedKeywords = new String[]{"forced", "signs"};
     private static final String DISABLE_DEFAULT_TRACK = "--edit track:%s --set flag-default=0 ";
     private static final String ENABLE_DEFAULT_TRACK = "--edit track:%s --set flag-default=1 ";
     private static final String ENABLE_FORCED_TRACK = "--edit track:%s --set flag-forced=1 ";
 
 
+    @SuppressWarnings("unchecked")
     @Override
     public List<FileAttribute> loadAttributes(File file) {
         Map<String, Object> jsonMap;
@@ -60,6 +61,8 @@ public class MkvFileProcessor implements FileProcessor {
                             LaneType.valueOf(((String) attribute.get("type")).toUpperCase(Locale.ENGLISH))));
                 }
             }
+
+            log.debug(fileAttributes);
         } catch (IOException e) {
             e.printStackTrace();
             log.error("File could not be found or loaded!");
@@ -71,21 +74,29 @@ public class MkvFileProcessor implements FileProcessor {
     public FileInfoDto filterAttributes(List<FileAttribute> attributes) {
         FileInfoDto info = new FileInfoDto();
         List<FileAttribute> nonForcedTracks = attributes.stream()
-                .filter(elem -> !StringUtils.containsAnyIgnoreCase(elem.getTrackName(), forcedKeywords))
+                .filter(elem -> !StringUtils.containsAnyIgnoreCase(elem.getTrackName(),
+                        Config.getInstance().getForcedKeywords().toArray(new CharSequence[0])))
+                .filter(elem -> !elem.isForcedTrack())
+                .collect(Collectors.toList());
+        List<FileAttribute> nonCommentaryTracks = attributes.stream()
+                .filter(elem -> !StringUtils.containsAnyIgnoreCase(elem.getTrackName(),
+                        Config.getInstance().getCommentaryKeywords().toArray(new CharSequence[0])))
                 .collect(Collectors.toList());
 
-        detectCurrentConfiguration(attributes, info, nonForcedTracks);
-        detectDesiredConfiguration(info, nonForcedTracks);
+        detectDefaultTracks(info, attributes, nonForcedTracks);
+        detectDesiredTracks(info, nonForcedTracks, nonCommentaryTracks);
+        log.debug(info);
 
         return info;
     }
 
-    private void detectCurrentConfiguration(List<FileAttribute> attributes, FileInfoDto info, List<FileAttribute> nonForcedTracks) {
+    protected void detectDefaultTracks(FileInfoDto info, List<FileAttribute> attributes, List<FileAttribute> nonForcedTracks) {
         Set<FileAttribute> detectedForcedSubtitleLanes = new HashSet<>();
         for (FileAttribute attribute : attributes) {
-            if (attribute.isDefaultTrack() && AUDIO.equals(attribute.getType())) info.setDefaultAudioLane(attribute);
+            if (attribute.isDefaultTrack() && AUDIO.equals(attribute.getType()))
+                info.getDefaultAudioLanes().add(attribute);
             if (attribute.isDefaultTrack() && SUBTITLES.equals(attribute.getType()))
-                info.setDefaultSubtitleLane(attribute);
+                info.getDefaultSubtitleLanes().add(attribute);
             if (attribute.isForcedTrack() && SUBTITLES.equals(attribute.getType()))
                 detectedForcedSubtitleLanes.add(attribute);
         }
@@ -97,11 +108,11 @@ public class MkvFileProcessor implements FileProcessor {
         );
     }
 
-    private void detectDesiredConfiguration(FileInfoDto info, List<FileAttribute> nonForcedTracks) {
+    protected void detectDesiredTracks(FileInfoDto info, List<FileAttribute> nonForcedTracks, List<FileAttribute> nonCommentaryTracks) {
         for (AttributeConfig config : Config.getInstance().getAttributeConfig()) {
             FileAttribute desiredAudio = null;
             FileAttribute desiredSubtitle = null;
-            for (FileAttribute attribute : nonForcedTracks) {
+            for (FileAttribute attribute : SetUtils.retainOf(nonForcedTracks, nonCommentaryTracks)) {
                 if (attribute.getLanguage().equals(config.getAudioLanguage())
                         && AUDIO.equals(attribute.getType())) desiredAudio = attribute;
                 if (attribute.getLanguage().equals(config.getSubtitleLanguage())
@@ -116,19 +127,23 @@ public class MkvFileProcessor implements FileProcessor {
     }
 
     @Override
-    public void update(File file, FileInfoDto fileInfo) throws IOException {
-        StringBuffer sb = new StringBuffer();
+    public void update(File file, FileInfoDto fileInfo) throws IOException, RuntimeException {
+        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.getDefaultAudioLane() != null) {
-                sb.append(format(DISABLE_DEFAULT_TRACK, fileInfo.getDefaultAudioLane().getId()));
+            if (fileInfo.getDefaultAudioLanes() != null && !fileInfo.getDefaultSubtitleLanes().isEmpty()) {
+                for (FileAttribute track: fileInfo.getDefaultAudioLanes()) {
+                    sb.append(format(DISABLE_DEFAULT_TRACK, track.getId()));
+                }
             }
             sb.append(format(ENABLE_DEFAULT_TRACK, fileInfo.getDesiredAudioLane().getId()));
         }
         if (fileInfo.isSubtitleDifferent()) {
-            if (fileInfo.getDefaultSubtitleLane() != null) {
-                sb.append(format(DISABLE_DEFAULT_TRACK, fileInfo.getDefaultSubtitleLane().getId()));
+            if (fileInfo.getDefaultSubtitleLanes() != null && !fileInfo.getDefaultSubtitleLanes().isEmpty()) {
+                for (FileAttribute track: fileInfo.getDefaultSubtitleLanes()) {
+                    sb.append(format(DISABLE_DEFAULT_TRACK, track.getId()));
+                }
             }
             sb.append(format(ENABLE_DEFAULT_TRACK, fileInfo.getDesiredSubtitleLane().getId()));
         }
@@ -139,6 +154,8 @@ public class MkvFileProcessor implements FileProcessor {
         }
 
         InputStream inputstream = Runtime.getRuntime().exec(sb.toString()).getInputStream();
-        log.debug(IOUtils.toString(new InputStreamReader(inputstream)));
+        String output = IOUtils.toString(new InputStreamReader(inputstream));
+        log.debug(output);
+        if (output.contains("Error")) throw new RuntimeException(output);
     }
 }

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

@@ -1,29 +1,36 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
 
+import java.util.Objects;
+
 @Log4j2
 @Getter
+@AllArgsConstructor
 public class AttributeConfig {
     private final String audioLanguage;
     private final String subtitleLanguage;
 
-    public AttributeConfig(String audioLanguage, String subtitleLanguage) {
-        this.audioLanguage = audioLanguage;
-        this.subtitleLanguage = subtitleLanguage;
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        AttributeConfig that = (AttributeConfig) o;
+        return Objects.equals(audioLanguage, that.audioLanguage) && Objects.equals(subtitleLanguage, that.subtitleLanguage);
     }
 
-    public boolean isValid() {
-        return audioLanguage != null && subtitleLanguage != null;
+    @Override
+    public int hashCode() {
+        return Objects.hash(audioLanguage, subtitleLanguage);
     }
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer("AttributeConfig{");
-        sb.append("audioLanguage='").append(audioLanguage).append('\'');
-        sb.append(", subtitleLanguage='").append(subtitleLanguage).append('\'');
-        sb.append('}');
-        return sb.toString();
+        return "AttributeConfig{"
+                + "audioLanguage='" + audioLanguage + '\''
+                + ", subtitleLanguage='" + subtitleLanguage + '\'' +
+                '}';
     }
 }

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

@@ -1,22 +1,64 @@
 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 {
-    MKV_TOOL_NIX("mkvtoolnixPath"),
-    THREADS("threads"),
-    FORCED_KEYWORDS("forcedKeywords"),
-    CONFIG("config"),
-    LIBRARY("library"),
-    SAFE_MODE("safe-mode"),
-    HELP("help");
+    CONFIG_PATH("config-path", "Path to config file", "p", 1),
+    LIBRARY("library", "Path to library", "l", 1),
+    SAFE_MODE("safe-mode", "Test run (no files will be changes)", "s", 0),
+    WINDOWS("windows", "Is operating system windows", null, 0),
+    THREADS("threads", "thread count (default: 2)", "t", 1),
+    INCLUDE_PATTERN("include-pattern", "Include files matching pattern", "i", 1),
+    MKV_TOOL_NIX("mkvtoolnix", "Path to mkv tool nix installation", "m", 1),
+    FORCED_KEYWORDS("forcedKeywords", "Additional keywords to identify forced tracks", "fk", Option.UNLIMITED_VALUES),
+    COMMENTARY_KEYWORDS("commentary-keywords", "Additional keywords to identify commentary tracks", "ck", Option.UNLIMITED_VALUES),
+    EXCLUDE_DIRECTORY("exclude-directories", "Directories to be excluded, combines with config file", "e", 1),
+    COHERENT("coherent", "Try to match whole series with same config", "c", 0),
+    HELP("help", "\"for help this is\" - Yoda", "h", 0),
+    VERSION("version", "Display version", "v", 0),
+    ARGUMENTS("arguments", "List of arguments", null, 0),
+    ATTRIBUTE_CONFIG("attribute-config", "Attribute config to decide which tracks to choose when", "a", 1);
 
     private final String property;
+    private final String description;
+    private final String shortParameter;
+    private final int args;
 
-    ConfigProperty(String property) {
-        this.property = property;
-    }
-
-    @Override
-    public String toString() {
+    public String prop() {
         return property;
     }
+
+    public String desc() {
+        return description;
+    }
+
+    public String abrv() {
+        return shortParameter;
+    }
+
+    public int args() {
+        return args;
+    }
+
+    /*
+     * 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);
+            }
+        }
+    }
 }

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

@@ -1,10 +1,12 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
 
 @Log4j2
 @Getter
+@AllArgsConstructor
 public class FileAttribute {
     private final int id;
     private final String language;
@@ -13,12 +15,14 @@ public class FileAttribute {
     private final boolean forcedTrack;
     private final LaneType type;
 
-    public FileAttribute(int id, String language, String trackName, boolean defaultTrack, boolean forcedTrack, LaneType type) {
-        this.id = id;
-        this.language = language;
-        this.trackName = trackName;
-        this.defaultTrack = defaultTrack;
-        this.forcedTrack = forcedTrack;
-        this.type = type;
+    @Override
+    public String toString() {
+        return "[" + "id=" + id +
+                ", language='" + language + '\'' +
+                ", trackName='" + trackName + '\'' +
+                ", defaultTrack=" + defaultTrack +
+                ", forcedTrack=" + forcedTrack +
+                ", type=" + type +
+                ']';
     }
 }

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

@@ -3,32 +3,51 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.HashSet;
 import java.util.Set;
 
 @Getter
 @Setter
 public class FileInfoDto {
-    private FileAttribute defaultAudioLane;
-    private FileAttribute defaultSubtitleLane;
+    private Set<FileAttribute> defaultAudioLanes = new HashSet<>();
+    private Set<FileAttribute> defaultSubtitleLanes = new HashSet<>();
     private Set<FileAttribute> desiredForcedSubtitleLanes;
     private FileAttribute desiredAudioLane;
     private FileAttribute desiredSubtitleLane;
 
+    public boolean isUnableToApplyConfig() {
+        return desiredAudioLane == null && desiredSubtitleLane == null;
+    }
+
+    public boolean isAlreadySuitable() {
+        return defaultAudioLanes.contains(desiredAudioLane) && defaultSubtitleLanes.contains(desiredSubtitleLane);
+    }
+
     public boolean isChangeNecessary() {
         return isAudioDifferent() || isSubtitleDifferent() || areForcedTracksDifferent();
     }
 
     public boolean isAudioDifferent() {
         return desiredAudioLane != null &&
-                (defaultAudioLane == null || defaultAudioLane.getId() != desiredAudioLane.getId());
+                (defaultAudioLanes == null || !defaultAudioLanes.contains(desiredAudioLane));
     }
 
     public boolean isSubtitleDifferent() {
         return desiredSubtitleLane != null &&
-                (defaultSubtitleLane == null || defaultSubtitleLane.getId() != desiredSubtitleLane.getId());
+                (defaultSubtitleLanes == null || !defaultSubtitleLanes.contains(desiredSubtitleLane));
     }
 
     public boolean areForcedTracksDifferent() {
         return desiredForcedSubtitleLanes.size() > 0;
     }
+
+    @Override
+    public String toString() {
+        return "[" + "defaultAudioLanes=" + defaultAudioLanes +
+                ", defaultSubtitleLanes=" + defaultSubtitleLanes +
+                ", desiredForcedSubtitleLanes=" + desiredForcedSubtitleLanes +
+                ", desiredAudioLane=" + desiredAudioLane +
+                ", desiredSubtitleLane=" + desiredSubtitleLane +
+                ']';
+    }
 }

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

@@ -3,12 +3,4 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
 public enum LaneType {
     AUDIO,
     SUBTITLES;
-
-    LaneType() {
-    }
-
-    @Override
-    public String toString() {
-        return name();
-    }
 }

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

@@ -1,15 +1,14 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
 
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor
 public enum MkvToolNix {
-    MKV_MERGER("mkvmerge.exe"),
-    MKV_PROP_EDIT("mkvpropedit.exe");
+    MKV_MERGER("mkvmerge"),
+    MKV_PROP_EDIT("mkvpropedit");
 
     private final String file;
 
-    MkvToolNix(String file) {
-        this.file = file;
-    }
-
     @Override
     public String toString() {
         return file;

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

@@ -3,22 +3,27 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.model;
 import lombok.AccessLevel;
 import lombok.Getter;
 
-import java.io.File;
-
 @Getter
 public class ResultStatistic {
     private static final String result = "Total files: %s%n" +
             "├─ Should change: %s%n" +
-            "├─ Successfully changed: %s%n" +
+            "│  ├─ Failed changing: %s%n" +
+            "│  └─ Successfully changed: %s%n" +
+            "├─ No suitable config found: %s%n" +
             "├─ Already fit config: %s%n" +
             "└─ Failed: %s%n" +
-            "Runtime: %ss";
+            "Runtime: %s";
 
     private int filesTotal = 0;
-    private int filesShouldChange = 0;
-    private int filesSuccessfullyChanged = 0;
-    private int filesFailed = 0;
-    private int filesAlreadyFit = 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;
@@ -28,19 +33,27 @@ public class ResultStatistic {
     }
 
     public synchronized void shouldChange() {
-        filesShouldChange++;
+        shouldChange++;
     }
 
     public synchronized void success() {
-        filesSuccessfullyChanged++;
+        successfullyChanged++;
+    }
+
+    public synchronized void failedChanging() {
+        failedChanging++;
+    }
+
+    public synchronized void noSuitableConfigFound() {
+        noSuitableConfigFound++;
+    }
+
+    public synchronized void alreadyFits() {
+        alreadyFits++;
     }
 
     public synchronized void failure() {
-        filesFailed++;
-    }
-
-    public synchronized void fits() {
-        filesAlreadyFit++;
+        failed++;
     }
 
     public void startTimer() {
@@ -51,9 +64,26 @@ public class ResultStatistic {
         runtime = System.currentTimeMillis() - startTime;
     }
 
+    private String formatTimer() {
+        int seconds = (int) (runtime / 1000);
+        int minutes = seconds / 60;
+        int hours = minutes / 60;
+        int days = hours / 24;
+
+        if (days >= 1) {
+            return String.format("%sd %sh %sm %ss", days, hours % 24, minutes % 60, seconds % 60);
+        } else if (hours >= 1) {
+            return String.format("%sh %sm %ss", hours, minutes % 60, seconds % 60);
+        } else if (minutes >= 1) {
+            return String.format("%sm %ss", minutes , seconds % 60);
+        } else {
+            return String.format("%ss", seconds % 60);
+        }
+    }
+
     @Override
     public String toString() {
-        return String.format(result, filesTotal, filesShouldChange, filesSuccessfullyChanged, filesAlreadyFit,
-                filesFailed, runtime / 1000);
+        return String.format(result, filesTotal, shouldChange, failedChanging, successfullyChanged,
+                noSuitableConfigFound, alreadyFits, failed, formatTimer());
     }
 }

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

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

@@ -0,0 +1,29 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class LanguageValidatorUtil {
+    private static Set<String> ISO3_LANGUAGES;
+
+    static {
+        try {
+            ISO3_LANGUAGES = loadLanguageCodes();
+        } catch (IOException ignored) {}
+    }
+
+    private static Set<String> loadLanguageCodes() throws IOException {
+        try (BufferedReader bf = new BufferedReader(new InputStreamReader(
+                Objects.requireNonNull(LanguageValidatorUtil.class.getClassLoader().getResourceAsStream("language-codes"))))) {
+            return bf.lines().collect(Collectors.toSet());
+        }
+    }
+
+    public static boolean isLanguageValid(String language) {
+        return ISO3_LANGUAGES.contains(language);
+    }
+}

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

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

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

src/main/resources/log4j2-dev.yml

@@ -0,0 +1,28 @@
+Configuration:
+  name: DefaultLogger
+  Appenders:
+    Console:
+      name: Console_Out
+      PatternLayout:
+        Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
+      ThresholdFilter:
+        level: debug
+    File:
+      name: FileAppender
+      fileName: default.log
+      PatternLayout:
+        Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
+      ThresholdFilter:
+        level: debug
+  Loggers:
+    Root:
+      level: debug
+      AppenderRef:
+        - ref: Console_Out
+        - ref: FileAppender
+    Logger:
+      name: "com.zaxxer.hikari.HikariConfig"
+      level: info
+      AppenderRef:
+        - ref: Console_Out
+        - ref: FileAppender

src/main/resources/log4j2.yaml

@@ -10,7 +10,7 @@ Configuration:
         level: info
   Loggers:
     Root:
-      level: debug
+      level: info
       AppenderRef:
         - ref: FileAppender
     Logger:

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

@@ -0,0 +1,82 @@
+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(attrConfYaml("jpn", "ger", "jpn", "eng"), new String[]{}, VALID, attrConf("jpn", "ger", "jpn", "eng")),
+                Arguments.of(attrConfYaml("jpn", "ger", "jpn", "OFF"), new String[]{}, 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[0], languages[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[0], languages[1]));
+        }
+        return conf;
+    }
+}

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

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

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

@@ -0,0 +1,61 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.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.INVALID;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.CONFIG_PATH;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.argumentsOf;
+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.yml";
+
+    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(
+                argumentsOf(CONFIG_PATH, true, null, "", new String[]{"-p", TEST_CONFIG}, VALID),
+                argumentsOf(CONFIG_PATH, true, null, "config-path: " + TEST_CONFIG, new String[]{}, MISSING),
+                argumentsOf(CONFIG_PATH, false, null, "config-path: " + TEST_CONFIG, new String[]{}, NOT_PRESENT),
+                argumentsOf(CONFIG_PATH, false, Path.of(TEST_CONFIG).toFile(), "", new String[]{}, DEFAULT),
+                argumentsOf(CONFIG_PATH, true, null, "", new String[]{"-p", TEST_FILE}, INVALID)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(ConfigProperty property, boolean required, File defaultValue, String yamlArgs, String[] cmdArgs,
+                  ValidationResult expectedResult) throws ParseException, YamlInvalidContentException {
+        ConfigPathValidator underTest = new ConfigPathValidator(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/MkvToolNixPathValidatorTest.java

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

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

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

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

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

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

@@ -0,0 +1,67 @@
+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, false, true, COMMENTARY_KEYWORDS.prop() + ": [test]", new String[]{}, VALID, 3),
+                argumentsOf(COMMENTARY_KEYWORDS, false, false, "", new String[]{"-ck", "test"}, VALID, 1),
+                argumentsOf(COMMENTARY_KEYWORDS, true, true, COMMENTARY_KEYWORDS.prop() + ": [commentary]", new String[]{}, VALID, 2),
+
+                argumentsOf(COMMENTARY_KEYWORDS, true, true, "", new String[]{}, MISSING, 2),
+                argumentsOf(COMMENTARY_KEYWORDS, false, true, "", new String[]{}, NOT_PRESENT, 2)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(ConfigProperty property, boolean required, boolean append, String yamlArgs, String[] cmdArgs,
+                  ValidationResult expectedResult, int expectedSize) throws ParseException, YamlInvalidContentException {
+        SetValidator underTest = new SetValidator(property, required, append);
+
+        ValidationResult result = underTest.validate(new YAML(yamlArgs), parser.parse(options, cmdArgs));
+
+        assertEquals(expectedResult, result);
+        assertEquals(expectedSize, Config.getInstance().getCommentaryKeywords().size());
+    }
+}

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

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

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

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

version.properties

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