139 changed files with 3067 additions and 4919 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,10 +1,4 @@
 __pycache__
 junk/
-.vscode
+.vscode/launch.json
 .ipynb_checkpoints/
 ansible/inventory/hawaii.yml
 ansible/inventory/peppermint.yml
 ffx_test_report.log
 bin/conversiontest.py
 *.egg-info/
--- a/LICENSE.md
+++ b/LICENSE.md
@ -1,595 +0,0 @@
 GNU General Public License
 ==========================
 _Version 3, 29 June 2007_  
 _Copyright © 2007 Free Software Foundation, Inc. &lt;<http://fsf.org/>&gt;_
 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 <http://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
 &lt;<http://www.gnu.org/licenses/>&gt;.
 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
 &lt;<http://www.gnu.org/philosophy/why-not-lgpl.html>&gt;.
--- a/README.md
+++ b/README.md
@ -1,48 +0,0 @@
 # FFX
 ## Installation
 per https:
 ```sh
 pip install https://<URL>/<Releaser>/ffx.git@<Branch>
 ```
 per git:
 ```sh
 pip install git+ssh://<Username>@<URL>/<Releaser>/ffx.git@<Branch>
 ```
 ## Version history
 ### 0.1.1
 Bugfixes, TMBD identify shows
 ### 0.1.2
 Bugfixes
 ### 0.1.3
 Subtitle file imports
 ### 0.2.0
 Tests, Config-File
 ### 0.2.1
 Signature, Tags cleaning, Bugfixes, Refactoring
 ### 0.2.2
 CLI-Overrides
 ### 0.2.3
 PyPi packaging
 Templating output filename
 Season shiftung
 DB-Versionierung
--- a/bin/.ipynb_checkpoints/check-checkpoint.py
+++ b/bin/.ipynb_checkpoints/check-checkpoint.py
@ -0,0 +1,32 @@
 import os
 from ffx.pattern_controller import PatternController
 from ffx.model.show import Base
 from sqlalchemy import create_engine, Column, Integer, String, ForeignKey
 from sqlalchemy.orm import relationship, sessionmaker, Mapped, backref
 filename = 'Boruto.Naruto.Next.Generations.S01E256.GerEngSub.AAC.1080p.WebDL.x264-Tanuki.mkv'
 # Data 'input' variable
 context = {}
 # Initialize DB
 homeDir = os.path.expanduser("~")
 ffxVarDir = os.path.join(homeDir, '.local', 'var', 'ffx')
 if not os.path.exists(ffxVarDir):
    os.makedirs(ffxVarDir)
 context['database_url'] = f"sqlite:///{os.path.join(ffxVarDir, 'ffx.db')}"
 context['database_engine'] = create_engine(context['database_url'])
 context['database_session'] = sessionmaker(bind=context['database_engine'])
 Base.metadata.create_all(context['database_engine'])
 pc = PatternController(context)
 print(pc.matchFilename(filename))
--- a/bin/.ipynb_checkpoints/ffx-checkpoint.py
+++ b/bin/.ipynb_checkpoints/ffx-checkpoint.py
@ -0,0 +1,554 @@
 #! /usr/bin/python3
 import os, sys, subprocess, json, click, time, re
 from textual.app import App, ComposeResult
 from textual.screen import Screen
 from textual.widgets import Header, Footer, Placeholder, Label
 VERSION='0.1.0'
 DEFAULT_VIDEO_ENCODER = 'vp9'
 DEFAULT_QUALITY = 23
 DEFAULT_AV1_PRESET = 5
 DEFAULT_LABEL='output'
 DEFAULT_FILE_SUFFIX = 'webm'
 DEFAULT_STEREO_BANDWIDTH = "128"
 DEFAULT_AC3_BANDWIDTH = "256"
 DEFAULT_DTS_BANDWIDTH = "320"
 DEFAULT_CROP_START = 60
 DEFAULT_CROP_LENGTH = 180
 TEMP_FILE_NAME = "ffmpeg2pass-0.log"
 MKVMERGE_METADATA_KEYS = ['BPS',
                            'NUMBER_OF_FRAMES',
                            'NUMBER_OF_BYTES',
                            '_STATISTICS_WRITING_APP',
                            '_STATISTICS_WRITING_DATE_UTC',
                            '_STATISTICS_TAGS']
 FILE_EXTENSIONS = ['mkv', 'mp4', 'avi', 'flv', 'webm']
 COMMAND_TOKENS = ['ffmpeg', '-y', '-i']
 NULL_TOKENS = ['-f', 'null', '/dev/null']
 STREAM_TYPE_VIDEO = 'video'
 STREAM_TYPE_AUDIO = 'audio'
 STREAM_TYPE_SUBTITLE = 'subtitle'
 STREAM_LAYOUT_6_1 = '6.1'
 STREAM_LAYOUT_5_1 = '5.1(side)'
 STREAM_LAYOUT_STEREO = 'stereo'
 STREAM_LAYOUT_6CH = '6ch'
 SEASON_EPISODE_INDICATOR_MATCH = '([sS][0-9]+)([eE][0-9]+)'
 SEASON_INDICATOR_MATCH = '([sS][0-9]+)'
 EPISODE_INDICATOR_MATCH = '([eE][0-9]+)'
 class DashboardScreen(Screen):
    def __init__(self):
        super().__init__()
        context = self.app.getContext()
        context['dashboard'] = 'dashboard'
    def compose(self) -> ComposeResult:
        yield Header(show_clock=True)
        yield Placeholder("Dashboard Screen")
        yield Footer()
 class WarningScreen(Screen):
    def __init__(self):
        super().__init__()
        context = self.app.getContext()
    def compose(self) -> ComposeResult:
        yield Label("Warning! This file is not compliant to the defined source schema!")
        yield Footer()
 class SettingsScreen(Screen):
    def __init__(self):
        super().__init__()
        context = self.app.getContext()
    def compose(self) -> ComposeResult:
        yield Placeholder("Settings Screen")
        yield Footer()
 class HelpScreen(Screen):
    def __init__(self):
        super().__init__()
        context = self.app.getContext()
    def compose(self) -> ComposeResult:
        yield Placeholder("Help Screen")
        yield Footer()
 class ModesApp(App):
    BINDINGS = [
        ("q", "quit()", "Quit"),  
    #    ("d", "switch_mode('dashboard')", "Dashboard"),  
    #    ("s", "switch_mode('settings')", "Settings"),
    #    ("h", "switch_mode('help')", "Help"),
    ]
    MODES = {
        "warning": WarningScreen,
        "dashboard": DashboardScreen,  
        "settings": SettingsScreen,
        "help": HelpScreen,
    }
    def __init__(self, context = {}):
        super().__init__()
        self.context = context
    def on_mount(self) -> None:
        self.switch_mode("warning")  
    def getContext(self):
        return self.context
 def executeProcess(commandSequence):
    process = subprocess.Popen(commandSequence, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    output, error = process.communicate()
    return output
 #[{'index': 0, 'codec_name': 'vp9', 'codec_long_name': 'Google VP9', 'profile': 'Profile 0', 'codec_type': 'video', 'codec_tag_string': '[0][0][0][0]', 'codec_tag': '0x0000', 'width': 1920, 'height': 1080, 'coded_width': 1920, 'coded_height': 1080, 'closed_captions': 0, 'film_grain': 0, 'has_b_frames': 0, 'sample_aspect_ratio': '1:1', 'display_aspect_ratio': '16:9', 'pix_fmt': 'yuv420p', 'level': -99, 'color_range': 'tv', 'chroma_location': 'left', 'field_order': 'progressive', 'refs': 1, 'r_frame_rate': '24000/1001', 'avg_frame_rate': '24000/1001', 'time_base': '1/1000', 'start_pts': 0, 'start_time': '0.000000', 'disposition': {'default': 1, 'dub': 0, 'original': 0, 'comment': 0, 'lyrics': 0, 'karaoke': 0, 'forced': 0, 'hearing_impaired': 0, 'visual_impaired': 0, 'clean_effects': 0, 'attached_pic': 0, 'timed_thumbnails': 0, 'non_diegetic': 0, 'captions': 0, 'descriptions': 0, 'metadata': 0, 'dependent': 0, 'still_image': 0}, 'tags': {'BPS': '7974017', 'NUMBER_OF_FRAMES': '34382', 'NUMBER_OF_BYTES': '1429358655', '_STATISTICS_WRITING_APP': "mkvmerge v63.0.0 ('Everything') 64-bit", '_STATISTICS_WRITING_DATE_UTC': '2023-10-07 13:59:46', '_STATISTICS_TAGS': 'BPS DURATION NUMBER_OF_FRAMES NUMBER_OF_BYTES', 'ENCODER': 'Lavc61.3.100 libvpx-vp9', 'DURATION': '00:23:54.016000000'}}]
 #[{'index': 1, 'codec_name': 'opus', 'codec_long_name': 'Opus (Opus Interactive Audio Codec)', 'codec_type': 'audio', 'codec_tag_string': '[0][0][0][0]', 'codec_tag': '0x0000', 'sample_fmt': 'fltp', 'sample_rate': '48000', 'channels': 2, 'channel_layout': 'stereo', 'bits_per_sample': 0, 'initial_padding': 312, 'r_frame_rate': '0/0', 'avg_frame_rate': '0/0', 'time_base': '1/1000', 'start_pts': -7, 'start_time': '-0.007000', 'extradata_size': 19, 'disposition': {'default': 1, 'dub': 0, 'original': 0, 'comment': 0, 'lyrics': 0, 'karaoke': 0, 'forced': 0, 'hearing_impaired': 0, 'visual_impaired': 0, 'clean_effects': 0, 'attached_pic': 0, 'timed_thumbnails': 0, 'non_diegetic': 0, 'captions': 0, 'descriptions': 0, 'metadata': 0, 'dependent': 0, 'still_image': 0}, 'tags': {'language': 'jpn', 'title': 'Japanisch', 'BPS': '128000', 'NUMBER_OF_FRAMES': '61763', 'NUMBER_OF_BYTES': '22946145', '_STATISTICS_WRITING_APP': "mkvmerge v63.0.0 ('Everything') 64-bit", '_STATISTICS_WRITING_DATE_UTC': '2023-10-07 13:59:46', '_STATISTICS_TAGS': 'BPS DURATION NUMBER_OF_FRAMES NUMBER_OF_BYTES', 'ENCODER': 'Lavc61.3.100 libopus', 'DURATION': '00:23:54.141000000'}}]
 #[{'index': 2, 'codec_name': 'webvtt', 'codec_long_name': 'WebVTT subtitle', 'codec_type': 'subtitle', 'codec_tag_string': '[0][0][0][0]', 'codec_tag': '0x0000', 'r_frame_rate': '0/0', 'avg_frame_rate': '0/0', 'time_base': '1/1000', 'start_pts': -7, 'start_time': '-0.007000', 'duration_ts': 1434141, 'duration': '1434.141000', 'disposition': {'default': 1, 'dub': 0, 'original': 0, 'comment': 0, 'lyrics': 0, 'karaoke': 0, 'forced': 0, 'hearing_impaired': 0, 'visual_impaired': 0, 'clean_effects': 0, 'attached_pic': 0, 'timed_thumbnails': 0, 'non_diegetic': 0, 'captions': 0, 'descriptions': 0, 'metadata': 0, 'dependent': 0, 'still_image': 0}, 'tags': {'language': 'ger', 'title': 'Deutsch [Full]', 'BPS': '118', 'NUMBER_OF_FRAMES': '300', 'NUMBER_OF_BYTES': '21128', '_STATISTICS_WRITING_APP': "mkvmerge v63.0.0 ('Everything') 64-bit", '_STATISTICS_WRITING_DATE_UTC': '2023-10-07 13:59:46', '_STATISTICS_TAGS': 'BPS DURATION NUMBER_OF_FRAMES NUMBER_OF_BYTES', 'ENCODER': 'Lavc61.3.100 webvtt', 'DURATION': '00:23:54.010000000'}}, {'index': 3, 'codec_name': 'webvtt', 'codec_long_name': 'WebVTT subtitle', 'codec_type': 'subtitle', 'codec_tag_string': '[0][0][0][0]', 'codec_tag': '0x0000', 'r_frame_rate': '0/0', 'avg_frame_rate': '0/0', 'time_base': '1/1000', 'start_pts': -7, 'start_time': '-0.007000', 'duration_ts': 1434141, 'duration': '1434.141000', 'disposition': {'default': 0, 'dub': 0, 'original': 0, 'comment': 0, 'lyrics': 0, 'karaoke': 0, 'forced': 0, 'hearing_impaired': 0, 'visual_impaired': 0, 'clean_effects': 0, 'attached_pic': 0, 'timed_thumbnails': 0, 'non_diegetic': 0, 'captions': 0, 'descriptions': 0, 'metadata': 0, 'dependent': 0, 'still_image': 0}, 'tags': {'language': 'eng', 'title': 'Englisch [Full]', 'BPS': '101', 'NUMBER_OF_FRAMES': '276', 'NUMBER_OF_BYTES': '16980', '_STATISTICS_WRITING_APP': "mkvmerge v63.0.0 ('Everything') 64-bit", '_STATISTICS_WRITING_DATE_UTC': '2023-10-07 13:59:46', '_STATISTICS_TAGS': 'BPS DURATION NUMBER_OF_FRAMES NUMBER_OF_BYTES', 'ENCODER': 'Lavc61.3.100 webvtt', 'DURATION': '00:23:53.230000000'}}]
 def getStreamDescriptor(filename):
    ffprobeOutput = executeProcess(["ffprobe",
                                    "-show_streams",
                                    "-of", "json",
                                    filename])
    streamData = json.loads(ffprobeOutput)['streams']
    descriptor = []
    i = 0
    for d in [s for s in streamData if s['codec_type'] == STREAM_TYPE_VIDEO]:
        descriptor.append({
            'index': d['index'],
            'sub_index': i,
            'type': STREAM_TYPE_VIDEO,
            'codec': d['codec_name']
        })
        i += 1
    i = 0
    for d in [s for s in streamData if s['codec_type'] == STREAM_TYPE_AUDIO]:
        streamDescriptor = {
            'index': d['index'],
            'sub_index': i,
            'type': STREAM_TYPE_AUDIO,
            'codec': d['codec_name'],
            'channels': d['channels']
        }
        if 'channel_layout' in d.keys():
            streamDescriptor['layout'] = d['channel_layout']
        elif d['channels'] == 6:
            streamDescriptor['layout'] = STREAM_LAYOUT_6CH
        else:
            streamDescriptor['layout'] = 'undefined'
        descriptor.append(streamDescriptor)
        i += 1
    i = 0
    for d in [s for s in streamData if s['codec_type'] == STREAM_TYPE_SUBTITLE]:
        descriptor.append({
            'index': d['index'],
            'sub_index': i,
            'type': STREAM_TYPE_SUBTITLE,
            'codec': d['codec_name']
        })
        i += 1
    return descriptor
 def generateAV1Tokens(q, p):
    return ['-c:v:0', 'libsvtav1',
            '-svtav1-params', f"crf={q}:preset={p}:tune=0:enable-overlays=1:scd=1:scm=0",
            '-pix_fmt', 'yuv420p10le']
 def generateVP9Pass1Tokens(q):
    return ['-c:v:0', 'libvpx-vp9',
            '-row-mt', '1',
            '-crf', str(q),
            '-pass', '1',
            '-speed', '4',
            '-frame-parallel', '0',
            '-g', '9999',
            '-aq-mode', '0']
 def generateVP9Pass2Tokens(q):
    return ['-c:v:0', 'libvpx-vp9',
            '-row-mt', '1',
            '-crf', str(q),
            '-pass', '2',
            '-frame-parallel', '0',
            '-g', '9999',
            '-aq-mode', '0',
            '-auto-alt-ref', '1',
            '-lag-in-frames', '25']
 def generateCropTokens(start, length):
    return ['-ss', str(start), '-t', str(length)]
 def generateDenoiseTokens(spatial=5, patch=7, research=7, hw=False):
    filterName = 'nlmeans_opencl' if hw else 'nlmeans'
    return ['-vf', f"{filterName}=s={spatial}:p={patch}:r={research}"]
 def generateOutputTokens(f, suffix, q=None):
    if q is None:
        return ['-f', 'webm', f"{f}.{suffix}"]
    else:        
        return ['-f', 'webm', f"{f}_q{q}.{suffix}"]
 # preset = DEFAULT_AV1_PRESET
 # presetTokens = [p for p in sys.argv if p.startswith('p=')]
 # if presetTokens:
 #   preset = int(presetTokens[0].split('=')[1])
 # cropStart = ''
 # cropLength = ''
 # cropTokens = [c for c in sys.argv if c.startswith('crop')]
 # if cropTokens:
 #     if '=' in cropTokens[0]:
 #         cropString = cropTokens[0].split('=')[1]
 #         cropStart, cropLength = cropString.split(',')
 #     else:
 #         cropStart = 60
 #         cropLength = 180
 # 
 # denoiseTokens = [d for d in sys.argv if d.startswith('denoise')]
 # 
 # for aStream in audioStreams:
 #     if 'channel_layout' in aStream:
 #         print(f"audio stream: {aStream['channel_layout']}") #channel_layout
 #     else:
 #         print(f"unknown audio stream with {aStream['channels']} channels") #channel_layout
 def generateAudioTokens(context, index, layout):
    if layout == STREAM_LAYOUT_6_1:
        return [f"-c:a:{index}",
                        'libopus',
                        f"-filter:a:{index}",
                        'channelmap=channel_layout=6.1',
                        f"-b:a:{index}",
                            context['bitrates']['dts']]
    elif layout == STREAM_LAYOUT_5_1:
        return [f"-c:a:{index}",
                        'libopus',
                        f"-filter:a:{index}",
                        "channelmap=FL-FL|FR-FR|FC-FC|LFE-LFE|SL-BL|SR-BR:5.1",
                        f"-b:a:{index}",
                        context['bitrates']['ac3']]
    elif layout == STREAM_LAYOUT_STEREO:
        return [f"-c:a:{index}",
                        'libopus',
                        f"-b:a:{index}",
                        context['bitrates']['stereo']]
    elif layout == STREAM_LAYOUT_6CH:
        return [f"-c:a:{index}",
                        'libopus',
                        f"-filter:a:{index}",
                        "channelmap=FL-FL|FR-FR|FC-FC|LFE-LFE|SL-BL|SR-BR:5.1",
                        f"-b:a:{index}",
                        context['bitrates']['ac3']]
    else:
        return []
 def generateClearTokens(streams):
    clearTokens = []
    for s in streams:
        for k in MKVMERGE_METADATA_KEYS:
            clearTokens += [f"-metadata:s:{s['type'][0]}:{s['sub_index']}", f"{k}="]
    return clearTokens
@click.group()
@click.pass_context
 def ffx(ctx):
    """FFX"""
    ctx.obj = {}
    pass        
 # Define a subcommand
@ffx.command()
 def version():
    click.echo(VERSION)
 # Another subcommand
@ffx.command()
 def help():
    click.echo(f"ffx {VERSION}\n")
    click.echo(f"Usage: ffx [input file] [output file] [vp9|av1] [q=[nn[,nn,...]]] [p=nn] [a=nnn[k]] [ac3=nnn[k]] [dts=nnn[k]] [crop]")
@click.argument('filename', nargs=1)
@ffx.command()
 def streams(filename):
    for d in getStreamDescriptor(filename):
        click.echo(f"{d['codec']}{' (' + str(d['channels']) + ')' if d['type'] == 'audio' else ''}")
@ffx.command()
@click.pass_context
@click.argument('paths', nargs=-1)
@click.option('-l', '--label', type=str, default=DEFAULT_LABEL, help='Label to be used as filename prefix')
@click.option('-v', '--video-encoder', type=str, default=DEFAULT_VIDEO_ENCODER, help='Target video encoder (vp9 or av1) default: vp9')
@click.option('-q', '--quality', type=str, default=DEFAULT_QUALITY, help='Quality settings to be used with VP9 encoder (default: 23)')
@click.option('-p', '--preset', type=str, default=DEFAULT_QUALITY, help='Quality preset to be used with AV1 encoder (default: 5)')
@click.option('-a', '--stereo-bitrate', type=int, default=DEFAULT_STEREO_BANDWIDTH, help='Bitrate in kbit/s to be used to encode stereo audio streams')
@click.option('-ac3', '--ac3-bitrate', type=int, default=DEFAULT_AC3_BANDWIDTH, help='Bitrate in kbit/s to be used to encode 5.1 audio streams')
@click.option('-dts', '--dts-bitrate', type=int, default=DEFAULT_DTS_BANDWIDTH, help='Bitrate in kbit/s to be used to encode 6.1 audio streams')
@click.option('-ds', '--default-subtitle', type=int, help='Index of default subtitle stream')
@click.option('-fa', '--forced-audio', type=int, help='Index of forced audio stream (including default audio stream tag)')
@click.option('-da', '--default-audio', type=int, help='Index of default audio stream')
@click.option("--crop", is_flag=False, flag_value="default", default="none")
@click.option("-c", "--clear-metadata", is_flag=True, default=False)
@click.option("-d", "--denoise", is_flag=True, default=False)
@click.option("-o", "--output-directory", type=str, default='')
 def convert(ctx, paths, label, video_encoder, quality, preset, stereo_bitrate, ac3_bitrate, dts_bitrate, crop, clear_metadata, default_subtitle, forced_audio, default_audio, denoise, output_directory):
    """Batch conversion of audiovideo files in format suitable for web playback, e.g. jellyfin
    Files found under PATHS will be converted according to parameters.
    Filename extensions will be changed appropriately.
    Suffices will we appended to filename in case of multiple created files
    or if the filename has not changed."""
    startTime = time.perf_counter()
    context = ctx.obj
    click.echo(f"\nVideo encoder: {video_encoder}")
    qualityTokens = quality.split(',')
    q_list = [q for q in qualityTokens if q.isnumeric()]
    click.echo(f"Qualities: {q_list}")
    ctx.obj['bitrates'] = {}
    ctx.obj['bitrates']['stereo'] = str(stereo_bitrate) if str(stereo_bitrate).endswith('k') else f"{stereo_bitrate}k"
    ctx.obj['bitrates']['ac3'] = str(ac3_bitrate) if str(ac3_bitrate).endswith('k') else f"{ac3_bitrate}k"
    ctx.obj['bitrates']['dts'] = str(dts_bitrate) if str(dts_bitrate).endswith('k') else f"{dts_bitrate}k"
    click.echo(f"Stereo bitrate: {ctx.obj['bitrates']['stereo']}")
    click.echo(f"AC3 bitrate: {ctx.obj['bitrates']['ac3']}")
    click.echo(f"DTS bitrate: {ctx.obj['bitrates']['dts']}")
    ctx.obj['perform_crop'] = (crop != 'none')
    if ctx.obj['perform_crop']:
        cropTokens = crop.split(',')
        if cropTokens and len(cropTokens) == 2:
            ctx.obj['crop_start'], ctx.obj['crop_length'] = crop.split(',')
        else:
            ctx.obj['crop_start'] = DEFAULT_CROP_START
            ctx.obj['crop_length'] = DEFAULT_CROP_LENGTH
        click.echo(f"crop start={ctx.obj['crop_start']} length={ctx.obj['crop_length']}")
    click.echo(f"\nRunning {len(paths) * len(q_list)} jobs")
    se_match = re.compile(SEASON_EPISODE_INDICATOR_MATCH)
    s_match = re.compile(SEASON_INDICATOR_MATCH)
    e_match = re.compile(EPISODE_INDICATOR_MATCH)
    for sourcePath in paths:
        if not os.path.isfile(sourcePath):
            click.echo(f"There is no file with path {sourcePath}, skipping ...")
            continue
        sourceDirectory = os.path.dirname(sourcePath)
        sourceFilename = os.path.basename(sourcePath)
        sourcePathTokens = sourceFilename.split('.')
        if sourcePathTokens[-1] in FILE_EXTENSIONS:
            sourceFileBasename = '.'.join(sourcePathTokens[:-1])
            sourceFilenameExtension = sourcePathTokens[-1]
        else:
            sourceFileBasename = sourceFilename
            sourceFilenameExtension = ''
        #click.echo(f"dir={sourceDirectory} base={sourceFileBasename} ext={sourceFilenameExtension}")
        click.echo(f"\nProcessing file {sourcePath}")
        se_result = se_match.search(sourceFilename)
        s_result = s_match.search(sourceFilename)
        e_result = e_match.search(sourceFilename)
    #streamDescriptor = getStreamDescriptor(sourcePath)
    #commandTokens = COMMAND_TOKENS + [sourcePath]
    #for q in q_list:
        #click.echo(f"\nRunning job q={q}")
        #mappingVideoTokens = ['-map', 'v:0']
        #mappingTokens = mappingVideoTokens.copy()
        #audioTokens = []
        #audioIndex = 0
        #for audioStreamDescriptor in streamDescriptor:
            #if audioStreamDescriptor['type'] == STREAM_TYPE_AUDIO:
                #mappingTokens += ['-map', f"a:{audioIndex}"]
                #audioTokens += generateAudioTokens(ctx.obj, audioIndex, audioStreamDescriptor['layout'])
                #audioIndex += 1
        #for s in range(len([d for d in streamDescriptor if d['type'] == STREAM_TYPE_SUBTITLE])):
            #mappingTokens += ['-map', f"s:{s}"]
        #if video_encoder == 'av1':
            #commandSequence = commandTokens + mappingTokens + audioTokens + generateAV1Tokens(q, preset) + audioTokens
            #if clear_metadata:
                #commandSequence += generateClearTokens(streamDescriptor)
            #if performCrop:
                #commandSequence += generateCropTokens(cropStart, cropLength)
            #commandSequence += generateOutputTokens(targetFilename, DEFAULT_FILE_SUFFIX, q)
            #click.echo(f"Command: {' '.join(commandSequence)}")
            #executeProcess(commandSequence)
        #if video_encoder == 'vp9':
            #commandSequence1 = commandTokens + mappingVideoTokens + generateVP9Pass1Tokens(q)
            #if performCrop:
            #    commandSequence1 += generateCropTokens(cropStart, cropLength)
            #commandSequence1 += NULL_TOKENS
            #click.echo(f"Command 1: {' '.join(commandSequence1)}")
            #if os.path.exists(TEMP_FILE_NAME):
            #    os.remove(TEMP_FILE_NAME)
            #executeProcess(commandSequence1)
            #commandSequence2 = commandTokens + mappingTokens
            #if denoise:
            #    commandSequence2 += generateDenoiseTokens()
            #commandSequence2 += generateVP9Pass2Tokens(q) + audioTokens
            #if clear_metadata:
            #    commandSequence2 += generateClearTokens(streamDescriptor)
            #if performCrop:
            #    commandSequence2 += generateCropTokens(cropStart, cropLength)
            #commandSequence2 += generateOutputTokens(targetFilename, DEFAULT_FILE_SUFFIX, q)
            #click.echo(f"Command 2: {' '.join(commandSequence2)}")
            #executeProcess(commandSequence2)
    #app = ModesApp(ctx.obj)
    #app.run()
    #click.confirm('Warning! This file is not compliant to the defined source schema! Do you want to continue?', abort=True)
    click.echo('\nDONE\n')
    endTime = time.perf_counter()
    click.echo(f"Time elapsed {endTime - startTime}")
    # click.echo(f"app result: {app.getContext()}")
 if __name__ == '__main__':
    ffx()
--- a/bin/ffx.py
+++ b/bin/ffx.py
@ -0,0 +1,537 @@
 #! /usr/bin/python3
 import os, click, time, logging
 from ffx.configuration_controller import ConfigurationController
 from ffx.file_properties import FileProperties
 from ffx.ffx_app import FfxApp
 from ffx.ffx_controller import FfxController
 from ffx.tmdb_controller import TmdbController
 from ffx.database import databaseContext
 from ffx.media_descriptor import MediaDescriptor
 from ffx.track_descriptor import TrackDescriptor
 from ffx.track_type import TrackType
 from ffx.video_encoder import VideoEncoder
 from ffx.track_disposition import TrackDisposition
 from ffx.process import executeProcess
 VERSION='0.2.0'
 # 0.1.1
 # Bugfixes, TMBD identify shows
 # 0.1.2
 # Bugfixes
 # 0.1.3
 # Subtitle file imports
 # 0.2.0
 # Tests, Config-File
@click.group()
@click.pass_context
@click.option('--database-file', type=str, default='', help='Path to database file')
@click.option('-v', '--verbose', type=int, default=0, help='Set verbosity of output')
@click.option("--dry-run", is_flag=True, default=False)
 def ffx(ctx, database_file, verbose, dry_run):
    """FFX"""
    ctx.obj = {}
    ctx.obj['config'] = ConfigurationController()
    ctx.obj['database'] = databaseContext(databasePath=database_file
                                            if database_file else ctx.obj['config'].getDatabaseFilePath())
    ctx.obj['dry_run'] = dry_run
    ctx.obj['verbosity'] = verbose
    # Critical 50
    # Error 40
    # Warning 30
    # Info 20
    # Debug 10
    fileLogVerbosity = max(40 - verbose * 10, 10)
    consoleLogVerbosity = max(20 - verbose * 10, 10)
    ctx.obj['logger'] = logging.getLogger('FFX')
    ctx.obj['logger'].setLevel(logging.DEBUG)
    ffxFileHandler = logging.FileHandler(ctx.obj['config'].getLogFilePath())
    ffxFileHandler.setLevel(fileLogVerbosity)
    ffxConsoleHandler = logging.StreamHandler()
    ffxConsoleHandler.setLevel(consoleLogVerbosity)
    fileFormatter = logging.Formatter(
        '%(asctime)s - %(name)s - %(levelname)s - %(message)s')
    ffxFileHandler.setFormatter(fileFormatter)
    consoleFormatter = logging.Formatter(
        '%(message)s')
    ffxConsoleHandler.setFormatter(consoleFormatter)
    ctx.obj['logger'].addHandler(ffxConsoleHandler)
    ctx.obj['logger'].addHandler(ffxFileHandler)
 # Define a subcommand
@ffx.command()
 def version():
    click.echo(VERSION)
 # Another subcommand
@ffx.command()
 def help():
    click.echo(f"ffx {VERSION}\n")
    click.echo(f"Usage: ffx [input file] [output file] [vp9|av1] [q=[nn[,nn,...]]] [p=nn] [a=nnn[k]] [ac3=nnn[k]] [dts=nnn[k]] [crop]")
@ffx.command()
@click.pass_context
@click.argument('filename', nargs=1)
 def inspect(ctx, filename):
    ctx.obj['command'] = 'inspect'
    ctx.obj['arguments'] = {}
    ctx.obj['arguments']['filename'] = filename
    app = FfxApp(ctx.obj)
    app.run()
 #TODO: TrackCodec Klasse
 CODEC_LOOKUP_TABLE = {
    'h264':                 {'format': 'h264',  'extension': 'h264'},
    'aac':                  {                   'extension': 'aac'},
    'ac3':                  {'format': 'ac3',   'extension': 'ac3'},
    'ass':                  {'format': 'ass',   'extension': 'ass'},
    'hdmv_pgs_subtitle':    {'format': 'sup',   'extension': 'sup'}
 }
 def getUnmuxSequence(trackDescriptor: TrackDescriptor, sourcePath, targetPrefix, targetDirectory = ''):
    trackCodec = trackDescriptor.getCodec()
    if not trackCodec in CODEC_LOOKUP_TABLE.keys():
        return []
    commandTokens = FfxController.COMMAND_TOKENS + ['-i', sourcePath]
    trackType = trackDescriptor.getType()
    targetPathBase = os.path.join(targetDirectory, targetPrefix) if targetDirectory else targetPrefix
    commandTokens += ['-map',
            f"0:{trackType.indicator()}:{trackDescriptor.getSubIndex()}",
            '-c',
            'copy']
    if 'format' in CODEC_LOOKUP_TABLE[trackCodec].keys():
        commandTokens += ['-f', CODEC_LOOKUP_TABLE[trackCodec]['format']]
    commandTokens += [f"{targetPathBase}.{CODEC_LOOKUP_TABLE[trackCodec]['extension']}"]
    return commandTokens
@ffx.command()
@click.pass_context
@click.argument('paths', nargs=-1)
@click.option('-l', '--label', type=str, default='', help='Label to be used as filename prefix')
@click.option("-o", "--output-directory", type=str, default='')
@click.option("-s", "--subtitles-only", is_flag=True, default=False)
 def unmux(ctx,
            paths,
            label,
            output_directory,
            subtitles_only):
    existingSourcePaths = [p for p in paths if os.path.isfile(p)]
    if ctx.obj['verbosity'] > 0:
        click.echo(f"\nUnmuxing {len(existingSourcePaths)} files")
    for sourcePath in existingSourcePaths:
        fp = FileProperties(ctx.obj, sourcePath)
        try:
            sourceMediaDescriptor = fp.getMediaDescriptor()
            season = fp.getSeason()
            episode = fp.getEpisode()
            #TODO: Recognition für alle Formate anpassen
            targetLabel = label if label else fp.getFileBasename()
            targetIndicator = f"_S{season}E{episode}" if label and season != -1 and episode != -1 else ''
            if label and not targetIndicator:
                if ctx.obj['verbosity'] > 0:
                    click.echo(f"Skipping file {fp.getFilename()}: Label set but no indicator recognized")
                continue
            else:
                if ctx.obj['verbosity'] > 0:
                    click.echo(f"\nUnmuxing file {fp.getFilename()}\n")
            for trackDescriptor in sourceMediaDescriptor.getAllTrackDescriptors():
                if trackDescriptor.getType() == TrackType.SUBTITLE or not subtitles_only:
                    # SEASON_EPISODE_STREAM_LANGUAGE_MATCH = '[sS]([0-9]+)[eE]([0-9]+)_([0-9]+)_([a-z]{3})'
                    targetPrefix = f"{targetLabel}{targetIndicator}_{trackDescriptor.getIndex()}_{trackDescriptor.getLanguage().threeLetter()}"
                    unmuxSequence = getUnmuxSequence(trackDescriptor, sourcePath, targetPrefix, targetDirectory = output_directory)
                    if unmuxSequence:
                        if not ctx.obj['dry_run']:
                            if ctx.obj['verbosity'] > 0:
                                click.echo(f"Executing unmuxing sequence: {' '.join(unmuxSequence)}")
                            out, err, rc = executeProcess(unmuxSequence)
                            if rc:
                                if ctx.obj['verbosity'] > 0:
                                    click.echo(f"Unmuxing of stream {trackDescriptor.getIndex()} failed with error ({rc}) {err}")        
                    else:
                        if ctx.obj['verbosity'] > 0:
                            click.echo(f"Skipping stream with unknown codec {trackDescriptor.getCodec()}")
        except Exception as ex:
            if ctx.obj['verbosity'] > 0:
                click.echo(f"Skipping File {sourcePath} ({ex})")
@ffx.command()
@click.pass_context
 def shows(ctx):
    ctx.obj['command'] = 'shows'
    app = FfxApp(ctx.obj)
    app.run()
 def checkUniqueDispositions(context, mediaDescriptor: MediaDescriptor):
    # Check for multiple default or forced dispositions if not set by user input or database requirements
    #
    # Query user for the correct sub indices, then configure flags in track descriptors associated with media descriptor accordingly.
    # The correct tokens should then be created by 
    if len([v for v in mediaDescriptor.getVideoTracks() if v.getDispositionFlag(TrackDisposition.DEFAULT)]) > 1:
        if context['no_prompt']:
            raise click.ClickException('More than one default video stream detected and no prompt set')
        defaultVideoTrackSubIndex = click.prompt("More than one default video stream detected! Please select stream", type=int)
        mediaDescriptor.setDefaultSubTrack(TrackType.VIDEO, defaultVideoTrackSubIndex)
    if len([v for v in mediaDescriptor.getVideoTracks() if v.getDispositionFlag(TrackDisposition.FORCED)]) > 1:
        if context['no_prompt']:
            raise click.ClickException('More than one forced video stream detected and no prompt set')
        forcedVideoTrackSubIndex = click.prompt("More than one forced video stream detected! Please select stream", type=int)
        mediaDescriptor.setForcedSubTrack(TrackType.VIDEO, forcedVideoTrackSubIndex)
    if len([a for a in mediaDescriptor.getAudioTracks() if a.getDispositionFlag(TrackDisposition.DEFAULT)]) > 1:
        if context['no_prompt']:
            raise click.ClickException('More than one default audio stream detected and no prompt set')
        defaultAudioTrackSubIndex = click.prompt("More than one default audio stream detected! Please select stream", type=int)
        mediaDescriptor.setDefaultSubTrack(TrackType.AUDIO, defaultAudioTrackSubIndex)
    if len([a for a in mediaDescriptor.getAudioTracks() if a.getDispositionFlag(TrackDisposition.FORCED)]) > 1:
        if context['no_prompt']:
            raise click.ClickException('More than one forced audio stream detected and no prompt set')
        forcedAudioTrackSubIndex = click.prompt("More than one forced audio stream detected! Please select stream", type=int)
        mediaDescriptor.setForcedSubTrack(TrackType.AUDIO, forcedAudioTrackSubIndex)
    if len([s for s in mediaDescriptor.getSubtitleTracks() if s.getDispositionFlag(TrackDisposition.DEFAULT)]) > 1:
        if context['no_prompt']:
            raise click.ClickException('More than one default subtitle stream detected and no prompt set')
        defaultSubtitleTrackSubIndex = click.prompt("More than one default subtitle stream detected! Please select stream", type=int)
        mediaDescriptor.setDefaultSubTrack(TrackType.SUBTITLE, defaultSubtitleTrackSubIndex)
    if len([s for s in mediaDescriptor.getSubtitleTracks() if s.getDispositionFlag(TrackDisposition.FORCED)]) > 1:
        if context['no_prompt']:
            raise click.ClickException('More than one forced subtitle stream detected and no prompt set')
        forcedSubtitleTrackSubIndex = click.prompt("More than one forced subtitle stream detected! Please select stream", type=int)
        mediaDescriptor.setForcedSubTrack(TrackType.SUBTITLE, forcedSubtitleTrackSubIndex)
@ffx.command()
@click.pass_context
@click.argument('paths', nargs=-1)
@click.option('-l', '--label', type=str, default='', help='Label to be used as filename prefix')
@click.option('-v', '--video-encoder', type=str, default=FfxController.DEFAULT_VIDEO_ENCODER, help=f"Target video encoder (vp9 or av1) default: {FfxController.DEFAULT_VIDEO_ENCODER}")
@click.option('-q', '--quality', type=str, default=FfxController.DEFAULT_QUALITY, help=f"Quality settings to be used with VP9 encoder (default: {FfxController.DEFAULT_QUALITY})")
@click.option('-p', '--preset', type=str, default=FfxController.DEFAULT_AV1_PRESET, help=f"Quality preset to be used with AV1 encoder (default: {FfxController.DEFAULT_AV1_PRESET})")
@click.option('-s', '--stereo-bitrate', type=int, default=FfxController.DEFAULT_STEREO_BANDWIDTH, help=f"Bitrate in kbit/s to be used to encode stereo audio streams (default: {FfxController.DEFAULT_STEREO_BANDWIDTH})")
@click.option('--ac3', type=int, default=FfxController.DEFAULT_AC3_BANDWIDTH, help=f"Bitrate in kbit/s to be used to encode 5.1 audio streams (default: {FfxController.DEFAULT_AC3_BANDWIDTH})")
@click.option('--dts', type=int, default=FfxController.DEFAULT_DTS_BANDWIDTH, help=f"Bitrate in kbit/s to be used to encode 6.1 audio streams (default: {FfxController.DEFAULT_DTS_BANDWIDTH})")
@click.option('--subtitle-directory', type=str, default='', help='Load subtitles from here')
@click.option('--subtitle-prefix', type=str, default='', help='Subtitle filename prefix')
@click.option('--audio-language', type=str, multiple=True, help='Audio stream language(s)')
@click.option('--audio-title', type=str, multiple=True, help='Audio stream title(s)')
@click.option('--default-audio', type=int, default=-1, help='Index of default audio stream')
@click.option('--forced-audio', type=int, default=-1, help='Index of forced audio stream')
@click.option('--subtitle-language', type=str, multiple=True, help='Subtitle stream language(s)')
@click.option('--subtitle-title', type=str, multiple=True, help='Subtitle stream title(s)')
@click.option('--default-subtitle', type=int, default=-1, help='Index of default subtitle stream')
@click.option('--forced-subtitle', type=int, default=-1, help='Index of forced subtitle stream') # (including default audio stream tag)
@click.option("--crop", is_flag=False, flag_value="default", default="none")
@click.option("--output-directory", type=str, default='')
@click.option("--denoise", is_flag=True, default=False)
@click.option("--no-tmdb", is_flag=True, default=False)
@click.option("--no-jellyfin", is_flag=True, default=False)
@click.option("--no-pattern", is_flag=True, default=False)
@click.option("--dont-pass-dispositions", is_flag=True, default=False)
@click.option("--no-prompt", is_flag=True, default=False)
 def convert(ctx,
            paths,
            label,
            video_encoder,
            quality,
            preset,
            stereo_bitrate,
            ac3,
            dts,
            subtitle_directory,
            subtitle_prefix,
            audio_language,
            audio_title,
            default_audio,
            forced_audio,
            subtitle_language,
            subtitle_title,
            default_subtitle,
            forced_subtitle,
            crop,
            output_directory,
            denoise,
            no_tmdb,
            no_jellyfin,
            no_pattern,
            dont_pass_dispositions,
            no_prompt):
    """Batch conversion of audiovideo files in format suitable for web playback, e.g. jellyfin
    Files found under PATHS will be converted according to parameters.
    Filename extensions will be changed appropriately.
    Suffices will we appended to filename in case of multiple created files
    or if the filename has not changed."""
    startTime = time.perf_counter()
    context = ctx.obj
    context['video_encoder'] = VideoEncoder.fromLabel(video_encoder)
    context['use_jellyfin'] = not no_jellyfin
    context['use_tmdb'] = not no_tmdb
    context['use_pattern'] = not no_pattern
    context['no_prompt'] = no_prompt
    context['import_subtitles'] = (subtitle_directory and subtitle_prefix)
    if context['import_subtitles']:
        context['subtitle_directory'] = subtitle_directory
        context['subtitle_prefix'] = subtitle_prefix
 #     click.echo(f"\nVideo encoder: {video_encoder}")
    qualityTokens = quality.split(',')
    q_list = [q for q in qualityTokens if q.isnumeric()]
    if ctx.obj['verbosity'] > 0:
        click.echo(f"Qualities: {q_list}")
    context['bitrates'] = {}
    context['bitrates']['stereo'] = str(stereo_bitrate) if str(stereo_bitrate).endswith('k') else f"{stereo_bitrate}k"
    context['bitrates']['ac3'] = str(ac3) if str(ac3).endswith('k') else f"{ac3}k"
    context['bitrates']['dts'] = str(dts) if str(dts).endswith('k') else f"{dts}k"
    if ctx.obj['verbosity'] > 0:
        click.echo(f"Stereo bitrate: {context['bitrates']['stereo']}")
        click.echo(f"AC3 bitrate: {context['bitrates']['ac3']}")
        click.echo(f"DTS bitrate: {context['bitrates']['dts']}")
    # Process crop parameters
    context['perform_crop'] = (crop != 'none')
    if context['perform_crop']:
        cTokens = crop.split(',')
        if cTokens and len(cTokens) == 2:
            context['crop_start'] = int(cTokens[0])
            context['crop_length'] = int(cTokens[1])
            if ctx.obj['verbosity'] > 0:
                click.echo(f"Crop start={context['crop_start']} length={context['crop_length']}")
    tc = TmdbController() if context['use_tmdb'] else None
    existingSourcePaths = [p for p in paths if os.path.isfile(p) and p.split('.')[-1] in FfxController.INPUT_FILE_EXTENSIONS]
    if ctx.obj['verbosity'] > 0:
        click.echo(f"\nRunning {len(existingSourcePaths) * len(q_list)} jobs")
    jobIndex = 0
    for sourcePath in existingSourcePaths:
        # Separate basedir, basename and extension for current source file
        sourceDirectory = os.path.dirname(sourcePath)
        sourceFilename = os.path.basename(sourcePath)
        sourcePathTokens = sourceFilename.split('.')
        sourceFileBasename = '.'.join(sourcePathTokens[:-1])
        sourceFilenameExtension = sourcePathTokens[-1]
        if ctx.obj['verbosity'] > 0:
            click.echo(f"\nProcessing file {sourcePath}")
        mediaFileProperties = FileProperties(context, sourceFilename)
        sourceMediaDescriptor = mediaFileProperties.getMediaDescriptor()
        #HINT: This is None if the filename did not match anything in database
        currentPattern = mediaFileProperties.getPattern() if context['use_pattern'] else None
        if ctx.obj['verbosity'] > 0:
            click.echo(f"Pattern matching: {'No' if currentPattern is None else 'Yes'}")
        # fileBasename = ''
        if currentPattern is None:
            # Case no pattern matching
            # fileBasename = currentShowDescriptor.getFilenamePrefix()
            checkUniqueDispositions(context, sourceMediaDescriptor)
            if context['import_subtitles']:
                sourceMediaDescriptor.importSubtitles(context['subtitle_directory'],
                                                        context['subtitle_prefix'],
                                                        mediaFileProperties.getSeason(),
                                                        mediaFileProperties.getEpisode())
            if context['use_jellyfin']:
                # Reorder subtracks in types with default the last, then make subindices flat again
                sourceMediaDescriptor.applyJellyfinOrder()
            fc = FfxController(context, sourceMediaDescriptor)
        else:
            # Case pattern matching
            targetMediaDescriptor = currentPattern.getMediaDescriptor(ctx.obj)
            checkUniqueDispositions(context, targetMediaDescriptor)
            currentShowDescriptor = currentPattern.getShowDescriptor(ctx.obj)
            if context['use_tmdb']:
                click.echo(f"Querying TMDB for show_id={currentShowDescriptor.getId()} season={mediaFileProperties.getSeason()} episode{mediaFileProperties.getEpisode()}")
                tmdbEpisodeResult = tc.queryEpisode(currentShowDescriptor.getId(), mediaFileProperties.getSeason(), mediaFileProperties.getEpisode())
                click.echo(f"tmdbEpisodeResult={tmdbEpisodeResult}")
                if tmdbEpisodeResult:
                    sourceFileBasename = TmdbController.getEpisodeFileBasename(currentShowDescriptor.getFilenamePrefix(),
                                                            tmdbEpisodeResult['name'],
                                                            mediaFileProperties.getSeason(),
                                                            mediaFileProperties.getEpisode(),
                                                            currentShowDescriptor.getIndexSeasonDigits(),
                                                            currentShowDescriptor.getIndexEpisodeDigits(),
                                                            currentShowDescriptor.getIndicatorSeasonDigits(),
                                                            currentShowDescriptor.getIndicatorEpisodeDigits()) 
            else:
                sourceFileBasename = currentShowDescriptor.getFilenamePrefix()
            if context['import_subtitles']:
                targetMediaDescriptor.importSubtitles(context['subtitle_directory'],
                                                        context['subtitle_prefix'],
                                                        mediaFileProperties.getSeason(),
                                                        mediaFileProperties.getEpisode())
            # raise click.ClickException(f"tmd subindices: {[t.getSubIndex() for t in targetMediaDescriptor.getAllTrackDescriptors()]}")
            # click.echo(f"tmd subindices: {[t.getIndex() for t in targetMediaDescriptor.getAllTrackDescriptors()]} {[t.getSubIndex() for t in targetMediaDescriptor.getAllTrackDescriptors()]}  {[t.getDispositionFlag(TrackDisposition.DEFAULT) for t in targetMediaDescriptor.getAllTrackDescriptors()]}")
            if context['use_jellyfin']:
                # Reorder subtracks in types with default the last, then make subindices flat again
                targetMediaDescriptor.applyJellyfinOrder()
                # sourceMediaDescriptor.applyJellyfinOrder()
            # click.echo(f"tmd subindices: {[t.getIndex() for t in targetMediaDescriptor.getAllTrackDescriptors()]} {[t.getSubIndex() for t in targetMediaDescriptor.getAllTrackDescriptors()]}  {[t.getDispositionFlag(TrackDisposition.DEFAULT) for t in targetMediaDescriptor.getAllTrackDescriptors()]}")
            # raise click.Abort
            if ctx.obj['verbosity'] > 0:
                click.echo(f"Input mapping tokens (2nd pass): {targetMediaDescriptor.getInputMappingTokens()}")
            fc = FfxController(context, targetMediaDescriptor, sourceMediaDescriptor)
            if ctx.obj['verbosity'] > 0:
                click.echo(f"Season={mediaFileProperties.getSeason()} Episode={mediaFileProperties.getEpisode()}")
        if ctx.obj['verbosity'] > 0:
            click.echo(f"fileBasename={sourceFileBasename}")
        for q in q_list:
            if ctx.obj['verbosity'] > 0:
                click.echo(f"\nRunning job {jobIndex} file={sourcePath} q={q}")
            jobIndex += 1
            extra = ['ffx'] if sourceFilenameExtension == FfxController.DEFAULT_FILE_EXTENSION else []
            click.echo(f"label={label if label else 'Falsy'}")
            click.echo(f"sourceFileBasename={sourceFileBasename}")
            targetFilename = (sourceFileBasename if context['use_tmdb']
                                    else mediaFileProperties.assembleTargetFileBasename(label,
                                                                                        q if len(q_list) > 1 else -1,
                                                                                        extraTokens = extra))
            targetPath = os.path.join(output_directory if output_directory else sourceDirectory, targetFilename)
            # media_S01E02_S01E02
            click.echo(f"targetPath={targetPath}")
            fc.runJob(sourcePath,
                        targetPath,
                        context['video_encoder'],
                        q,
                        preset,
                        denoise)
    #TODO: click.confirm('Warning! This file is not compliant to the defined source schema! Do you want to continue?', abort=True)
    endTime = time.perf_counter()
    if ctx.obj['verbosity'] > 0:
        click.echo(f"\nDONE\nTime elapsed {endTime - startTime}")
 if __name__ == '__main__':
    ffx()
--- a/bin/ffx/.ipynb_checkpoints/file_properties-checkpoint.py
+++ b/bin/ffx/.ipynb_checkpoints/file_properties-checkpoint.py
@ -0,0 +1,66 @@
 import os, re, click
 class FileProperties():
    FILE_EXTENSIONS = ['mkv', 'mp4', 'avi', 'flv', 'webm']
    SEASON_EPISODE_INDICATOR_MATCH = '[sS]([0-9]+)[eE]([0-9]+)' 
    EPISODE_INDICATOR_MATCH = '[eE]([0-9]+)'
    def ___init__(self, sourcePath, ):
        # Separate basedir, basename and extension for current source file
        self.__sourceDirectory = os.path.dirname(sourcePath)
        self.__sourceFilename = os.path.basename(sourcePath)
        sourcePathTokens = self.__sourceFilename.split('.')
        if sourcePathTokens[-1] in FilenameController.FILE_EXTENSIONS:
            self.__sourceFileBasename = '.'.join(sourcePathTokens[:-1])
            self.__sourceFilenameExtension = sourcePathTokens[-1]
        else:
            self.__sourceFileBasename = self.__sourceFilename
            self.__sourceFilenameExtension = ''
        se_match = re.compile(FilenameController.SEASON_EPISODE_INDICATOR_MATCH)
        e_match = re.compile(FilenameController.EPISODE_INDICATOR_MATCH)
        se_result = se_match.search(self.__sourceFilename)
        e_result = e_match.search(self.__sourceFilename)
        self.__season = -1
        self.__episode = -1
        file_index = 0
        if se_result is not None:
            self.__season = int(se_result.group(1))
            self.__episode = int(se_result.group(2))
        elif e_result is not None:
            self.__episode = int(e_result.group(1))
        else:
            file_index += 1
        matchingFileSubtitleDescriptors = sorted([d for d in availableFileSubtitleDescriptors if d['season'] == season and d['episode'] == episode], key=lambda d: d['stream'])  if availableFileSubtitleDescriptors else []
        print(f"season={season} episode={episode} file={file_index}")
        # Assemble target filename tokens
        targetFilenameTokens = []
        targetFilenameExtension = DEFAULT_FILE_EXTENSION
        if label:
            targetFilenameTokens = [label]
            if season > -1 and episode > -1:
                targetFilenameTokens += [f"S{season:0{season_digits}d}E{episode:0{episode_digits}d}"]
            elif episode > -1:
                targetFilenameTokens += [f"E{episode:0{episode_digits}d}"]
            else:
                targetFilenameTokens += [f"{file_index:0{index_digits}d}"]
        else:
            targetFilenameTokens = [sourceFileBasename]
--- a/bin/ffx/init.py
+++ b/bin/ffx/init.py
--- a/bin/ffx/audio_layout.py
+++ b/bin/ffx/audio_layout.py
@ -1,3 +1,4 @@
 import click 
 from enum import Enum
 from .track_type import TrackType
@ -27,6 +28,7 @@ class AudioLayout(Enum):
            return [a for a in AudioLayout if a.value['label'] == str(label)][0]
        except:
            raise click.ClickException('fromLabel failed')
            return AudioLayout.LAYOUT_UNDEFINED
    @staticmethod
@ -34,6 +36,7 @@ class AudioLayout(Enum):
        try:
            return [a for a in AudioLayout if a.value['index'] == int(index)][0]
        except:
            raise click.ClickException('fromIndex failed')
            return AudioLayout.LAYOUT_UNDEFINED
    @staticmethod
--- a/bin/ffx/configuration_controller.py
+++ b/bin/ffx/configuration_controller.py
@ -0,0 +1,48 @@
 import os, json
 class ConfigurationController():
    CONFIG_FILENAME = 'ffx.json'
    DATABASE_FILENAME = 'ffx.db'
    LOG_FILENAME = 'ffx.log'
    DATABASE_PATH_CONFIG_KEY = 'databasePath'
    LOG_DIRECTORY_CONFIG_KEY = 'logDirectory'
    def __init__(self):
        self.__homeDir = os.path.expanduser("~")
        self.__localVarDir = os.path.join(self.__homeDir, '.local', 'var')
        self.__localEtcDir = os.path.join(self.__homeDir, '.local', 'etc')
        self.__configurationData = {}
        # .local/etc/ffx.json
        self.__configFilePath = os.path.join(self.__localEtcDir, ConfigurationController.CONFIG_FILENAME)
        if os.path.isfile(self.__configFilePath):
            with open(self.__configFilePath, 'r') as configurationFile:
                self.__configurationData = json.load(configurationFile)
        if ConfigurationController.DATABASE_PATH_CONFIG_KEY in self.__configurationData.keys():
            self.__databaseFilePath = self.__configurationData[ConfigurationController.DATABASE_PATH_CONFIG_KEY]
            os.makedirs(os.path.dirname(self.__databaseFilePath), exist_ok=True)
        else:
            ffxVarDir = os.path.join(self.__localVarDir, 'ffx')
            os.makedirs(ffxVarDir, exist_ok=True)
            self.__databaseFilePath = os.path.join(ffxVarDir, ConfigurationController.DATABASE_FILENAME)
        if ConfigurationController.LOG_DIRECTORY_CONFIG_KEY in self.__configurationData.keys():
            self.__logDir = self.__configurationData[ConfigurationController.LOG_DIRECTORY_CONFIG_KEY]
        else:
            self.__logDir = os.path.join(self.__localVarDir, 'log')
            os.makedirs(self.__logDir, exist_ok=True)
    def getHomeDirectory(self):
        return self.__homeDir
    def getLogFilePath(self):
        return os.path.join(self.__logDir, ConfigurationController.LOG_FILENAME)
    def getDatabaseFilePath(self):
        return self.__databaseFilePath
--- a/bin/ffx/database.py
+++ b/bin/ffx/database.py
@ -0,0 +1,45 @@
 import os
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 from ffx.model.show import Base, Show
 from ffx.model.pattern import Pattern
 from ffx.model.track import Track
 from ffx.model.media_tag import MediaTag
 from ffx.model.track_tag import TrackTag
 def databaseContext(databasePath: str = ''):
    databaseContext = {}
    if databasePath is None:
        # sqlite:///:memory:
        databasePath = ':memory:'
    elif not databasePath:
        homeDir = os.path.expanduser("~")
        ffxVarDir = os.path.join(homeDir, '.local', 'var', 'ffx')
        if not os.path.exists(ffxVarDir):
            os.makedirs(ffxVarDir)
        databasePath = os.path.join(ffxVarDir, 'ffx.db')
    databaseContext['url'] = f"sqlite:///{databasePath}"
    databaseContext['engine'] = create_engine(databaseContext['url'])
    databaseContext['session'] = sessionmaker(bind=databaseContext['engine'])
    Base.metadata.create_all(databaseContext['engine'])
    # isSyncronuous = False
    # while not isSyncronuous:
    # while True:
    #     try:
    #         with databaseContext['database_engine'].connect() as connection:
    #             connection.execute(sqlalchemy.text('PRAGMA foreign_keys=ON;'))
    #             #isSyncronuous = True
    #             break
    #     except sqlite3.OperationalError:
    #         time.sleep(0.1)
    return databaseContext
--- a/bin/ffx/ffx_app.py
+++ b/bin/ffx/ffx_app.py
--- a/bin/ffx/ffx_controller.py
+++ b/bin/ffx/ffx_controller.py
@ -1,19 +1,14 @@
-import os, click
+import os, click, re
 from ffx.media_descriptor import MediaDescriptor
 from ffx.helper import DIFF_ADDED_KEY, DIFF_REMOVED_KEY, DIFF_CHANGED_KEY
 from ffx.track_descriptor import TrackDescriptor
 from ffx.model.track import Track
 from ffx.audio_layout import AudioLayout
 from ffx.track_type import TrackType
 from ffx.video_encoder import VideoEncoder
 from ffx.process import executeProcess
 from ffx.track_disposition import TrackDisposition
 from ffx.track_codec import TrackCodec
 from ffx.constants import DEFAULT_CROP_START, DEFAULT_CROP_LENGTH
 from ffx.filter.quality_filter import QualityFilter
 from ffx.filter.preset_filter import PresetFilter
 class FfxController():
@ -24,15 +19,30 @@ class FfxController():
    DEFAULT_VIDEO_ENCODER = VideoEncoder.VP9.label()
    DEFAULT_QUALITY = 23
    DEFAULT_AV1_PRESET = 5
    DEFAULT_FILE_FORMAT = 'webm'
    DEFAULT_FILE_EXTENSION = 'webm'
    DEFAULT_STEREO_BANDWIDTH = "128"
    DEFAULT_AC3_BANDWIDTH = "256"
    DEFAULT_DTS_BANDWIDTH = "320"
    DEFAULT_CROP_START = 60
    DEFAULT_CROP_LENGTH = 180
    MKVMERGE_METADATA_KEYS = ['BPS',
                                'NUMBER_OF_FRAMES',
                                'NUMBER_OF_BYTES',
                                '_STATISTICS_WRITING_APP',
                                '_STATISTICS_WRITING_DATE_UTC',
                                '_STATISTICS_TAGS']
    INPUT_FILE_EXTENSIONS = ['mkv', 'mp4', 'avi', 'flv', 'webm']
    CHANNEL_MAP_5_1 = 'FL-FL|FR-FR|FC-FC|LFE-LFE|SL-BL|SR-BR:5.1'
    #!
    SIGNATURE_TAGS = {'RECODED_WITH': 'FFX'}
    def __init__(self,
                    context : dict,
@ -43,8 +53,6 @@ class FfxController():
        self.__sourceMediaDescriptor = sourceMediaDescriptor
        self.__targetMediaDescriptor = targetMediaDescriptor
        self.__configurationData = self.__context['config'].getData()
        self.__logger = context['logger']
@ -89,18 +97,20 @@ class FfxController():
            cropStart = int(self.__context['crop_start'])
            cropLength = int(self.__context['crop_length'])
        else:
-            cropStart = DEFAULT_CROP_START
+            cropStart = FfxController.DEFAULT_CROP_START
-            cropLength = DEFAULT_CROP_LENGTH
+            cropLength = FfxController.DEFAULT_CROP_LENGTH
        return ['-ss', str(cropStart), '-t', str(cropLength)]
-    def generateOutputTokens(self, filePathBase, format = '', ext = ''):
+    def generateDenoiseTokens(self, spatial=5, patch=7, research=7, hw=False):
-        outputFilePath = f"{filePathBase}{'.'+str(ext) if ext else ''}"
+        filterName = 'nlmeans_opencl' if hw else 'nlmeans'
-        if format:
+        return ['-vf', f"{filterName}=s={spatial}:p={patch}:r={research}"]
-            return ['-f', format, outputFilePath]
+
-        else:
+
-            return [outputFilePath]
+    def generateOutputTokens(self, filepath, format, ext):
        outputFilePath = f"{filepath}.{ext}"
        return ['-f', format, outputFilePath]
    def generateAudioEncodingTokens(self):
@ -108,12 +118,23 @@ class FfxController():
        audioTokens = []
        #sourceAudioTrackDescriptors = [smd for smd in self.__sourceMediaDescriptor.getAllTrackDescriptors() if smd.getType() == TrackType.AUDIO]
        # targetAudioTrackDescriptors = [rtd for rtd in self.__targetMediaDescriptor.getReorderedTrackDescriptors() if rtd.getType() == TrackType.AUDIO]
        targetAudioTrackDescriptors = [td for td in self.__targetMediaDescriptor.getAllTrackDescriptors() if td.getType() == TrackType.AUDIO]
        trackSubIndex = 0
        for trackDescriptor in targetAudioTrackDescriptors:
            # Calculate source sub index
            #changedTargetTrackDescriptor : TrackDescriptor = targetAudioTrackDescriptors[trackDescriptor.getIndex()]
            #changedTargetTrackSourceIndex = changedTargetTrackDescriptor.getSourceIndex()
            #sourceSubIndex = sourceAudioTrackDescriptors[changedTargetTrackSourceIndex].getSubIndex()
            trackAudioLayout = trackDescriptor.getAudioLayout()
            #TODO: Sollte nicht die sub index unverändert bleiben wenn jellyfin reordering angewendet wurde?
            # siehe auch: MediaDescriptor.getInputMappingTokens()
            #trackSubIndex = trackDescriptor.getSubIndex()
            if trackAudioLayout == AudioLayout.LAYOUT_6_1:
                audioTokens += [f"-c:a:{trackSubIndex}",
@ -155,6 +176,10 @@ class FfxController():
        sourceTrackDescriptors = ([] if self.__sourceMediaDescriptor is None
                                    else self.__sourceMediaDescriptor.getAllTrackDescriptors())
        # if not self.__sourceMediaDescriptor is None:
        #     sourceTrackDescriptors = self.__sourceMediaDescriptor.getAllTrackDescriptors()
        # else:
        #     sourceTrackDescriptors = []
        dispositionTokens = []
@ -164,7 +189,7 @@ class FfxController():
            #HINT: No dispositions for pgs subtitle tracks that have no external file source
            if (td.getExternalSourceFilePath()
-                        or td.getCodec() != TrackCodec.PGS):
+                        or td.getCodec() != TrackDescriptor.CODEC_PGS):
                subIndex = td.getSubIndex()
                streamIndicator = td.getType().indicator()
@ -189,48 +214,17 @@ class FfxController():
        metadataTokens = []
-        metadataConfiguration = self.__configurationData['metadata'] if 'metadata' in self.__configurationData.keys() else {}
+        for tagKey, tagValue in self.__targetMediaDescriptor.getTags().items():
        signatureTags = metadataConfiguration['signature'] if 'signature' in metadataConfiguration.keys() else {}
        removeGlobalKeys = metadataConfiguration['remove'] if 'remove' in metadataConfiguration.keys() else []
        removeTrackKeys = metadataConfiguration['streams']['remove'] if 'streams' in metadataConfiguration.keys() and 'remove' in metadataConfiguration['streams'].keys() else []
        mediaTags = {k:v for k,v in self.__targetMediaDescriptor.getTags().items() if not k in removeGlobalKeys}
        if (not 'no_signature' in self.__context.keys()
                or not self.__context['no_signature']):
            outputMediaTags = mediaTags | signatureTags
        else:
            outputMediaTags = mediaTags
        for tagKey, tagValue in outputMediaTags.items():
            metadataTokens += [f"-metadata:g",
                                f"{tagKey}={tagValue}"]
        for removeKey in removeGlobalKeys:
            metadataTokens += [f"-metadata:g",
                                f"{removeKey}="]
        removeMkvmergeMetadata = (not 'keep_mkvmerge_metadata' in self.__context.keys()
                                    or not self.__context['keep_mkvmerge_metadata'])
        #HINT: With current ffmpeg version track metadata tags are not passed to the outfile
        for td in self.__targetMediaDescriptor.getAllTrackDescriptors():
            typeIndicator = td.getType().indicator()
            subIndex = td.getSubIndex()
            for tagKey, tagValue in td.getTags().items():
-
+            
-                if not tagKey in removeTrackKeys:
+                metadataTokens += [f"-metadata:s:{td.getType().indicator()}:{td.getSubIndex()}",
-                    metadataTokens += [f"-metadata:s:{typeIndicator}:{subIndex}",
+                                    f"{tagKey}={tagValue}"]
                                        f"{tagKey}={tagValue}"]
            for removeKey in removeTrackKeys:
                metadataTokens += [f"-metadata:s:{typeIndicator}:{subIndex}",
                                    f"{removeKey}="]
        return metadataTokens
@ -238,22 +232,12 @@ class FfxController():
    def runJob(self,
                sourcePath,
                targetPath,
                targetFormat: str = '',
                videoEncoder: VideoEncoder = VideoEncoder.VP9,
-                chainIteration: list = []):
+                quality: int = DEFAULT_QUALITY,
-                # quality: int = DEFAULT_QUALITY,
+                preset: int = DEFAULT_AV1_PRESET,
-                # preset: int = DEFAULT_AV1_PRESET):
+                denoise: bool = False):
        qualityFilters = [fy for fy in chainIteration if fy['identifier'] == 'quality']
        presetFilters = [fy for fy in chainIteration if fy['identifier'] == 'preset']
        denoiseFilters = [fy for fy in chainIteration if fy['identifier'] == 'nlmeans']
        quality = qualityFilters[0]['parameters']['quality'] if qualityFilters else QualityFilter.DEFAULT_QUALITY
        preset = presetFilters[0]['parameters']['preset'] if presetFilters else PresetFilter.DEFAULT_PRESET
        denoiseTokens = denoiseFilters[0]['tokens'] if denoiseFilters else []
        # self.__targetMediaDescriptor order OK
        commandTokens = FfxController.COMMAND_TOKENS + ['-i', sourcePath]
@ -264,9 +248,11 @@ class FfxController():
                                + self.__targetMediaDescriptor.getInputMappingTokens()
                                + self.generateDispositionTokens())
-            # Optional tokens
+            if not self.__sourceMediaDescriptor is None:
-            commandSequence += self.generateMetadataTokens()
+                commandSequence += self.generateMetadataTokens()
-            commandSequence += denoiseTokens
+
            if denoise:
                commandSequence += self.generateDenoiseTokens()
            commandSequence += (self.generateAudioEncodingTokens()
                                + self.generateAV1Tokens(int(quality), int(preset))
@ -276,49 +262,44 @@ class FfxController():
                commandSequence += FfxController.generateCropTokens()
            commandSequence += self.generateOutputTokens(targetPath,
-                                                        targetFormat)
+                                                            FfxController.DEFAULT_FILE_FORMAT,
                                                            FfxController.DEFAULT_FILE_EXTENSION)
-            self.__logger.debug(f"FfxController.runJob(): Running command sequence")
+            self.__logger.debug(f"FfxController.runJon() commandSequence:{' '.join(commandSequence)}")
            if not self.__context['dry_run']:
-                executeProcess(commandSequence, context = self.__context)
+                executeProcess(commandSequence)
        if videoEncoder == VideoEncoder.VP9:
            commandSequence1 = (commandTokens
-                                    + self.__targetMediaDescriptor.getInputMappingTokens(only_video=True))
+                                    + self.__targetMediaDescriptor.getInputMappingTokens(only_video=True)
-
+                                    + self.generateVP9Pass1Tokens(int(quality)))
            # Optional tokens
            #NOTE: Filters and so needs to run on the first pass as well, as here
            # the required bitrate for the second run is determined and recorded
            # TODO: Results seems to be slightly better with first pass omitted,
            # Confirm or find better filter settings for 2-pass
            # commandSequence1 += self.__context['denoiser'].generateDenoiseTokens()
            commandSequence1 += self.generateVP9Pass1Tokens(int(quality))
            if self.__context['perform_crop']:
                commandSequence1 += self.generateCropTokens()
            commandSequence1 += FfxController.NULL_TOKENS
            self.__logger.debug(f"FfxController.runJon() commandSequence1:{' '.join(commandSequence1)}")
            if os.path.exists(FfxController.TEMP_FILE_NAME):
                os.remove(FfxController.TEMP_FILE_NAME)
            self.__logger.debug(f"FfxController.runJob(): Running command sequence 1")
            if not self.__context['dry_run']:
-                executeProcess(commandSequence1, context = self.__context)
+                executeProcess(commandSequence1)
            commandSequence2 = (commandTokens
                                + self.__targetMediaDescriptor.getImportFileTokens()
                                + self.__targetMediaDescriptor.getInputMappingTokens()
                                + self.generateDispositionTokens())
-            # Optional tokens
+            if not self.__sourceMediaDescriptor is None:
-            commandSequence2 += self.generateMetadataTokens()
+                commandSequence2 += self.generateMetadataTokens()
-            commandSequence2 += denoiseTokens
+
            if denoise:
                commandSequence2 += self.generateDenoiseTokens()
            commandSequence2 += self.generateVP9Pass2Tokens(int(quality)) + self.generateAudioEncodingTokens()
@ -326,19 +307,20 @@ class FfxController():
                commandSequence2 += self.generateCropTokens()
            commandSequence2 += self.generateOutputTokens(targetPath,
-                                                            targetFormat)
+                                                            FfxController.DEFAULT_FILE_FORMAT,
                                                            FfxController.DEFAULT_FILE_EXTENSION)
-            self.__logger.debug(f"FfxController.runJob(): Running command sequence 2")
+            self.__logger.debug(f"FfxController.runJon() commandSequence2:{' '.join(commandSequence2)}")
            if not self.__context['dry_run']:            
-                out, err, rc = executeProcess(commandSequence2, context = self.__context)
+                out, err, rc = executeProcess(commandSequence2)
                if rc:
                    raise click.ClickException(f"Command resulted in error: rc={rc} error={err}")
    def createEmptyFile(self,
-                        path: str = 'empty.mkv',
+                        path: str = 'output.mp4',
                        sizeX: int = 1280,
                        sizeY: int = 720,
                        rate: int = 25,
@ -358,4 +340,4 @@ class FfxController():
                            str(length),
                            path]
-        out, err, rc = executeProcess(commandTokens, context = self.__context)
+        out, err, rc = executeProcess(commandTokens)
--- a/bin/ffx/file_properties.py
+++ b/bin/ffx/file_properties.py
@ -0,0 +1,257 @@
 import os, re, click, json
 from .media_descriptor import MediaDescriptor
 from .pattern_controller import PatternController
 from .process import executeProcess
 from ffx.model.pattern import Pattern
 from ffx.ffx_controller import FfxController
 from ffx.show_descriptor import ShowDescriptor
 class FileProperties():
    FILE_EXTENSIONS = ['mkv', 'mp4', 'avi', 'flv', 'webm']
    SEASON_EPISODE_INDICATOR_MATCH = '[sS]([0-9]+)[eE]([0-9]+)' 
    EPISODE_INDICATOR_MATCH = '[eE]([0-9]+)'
    DEFAULT_INDEX_DIGITS = 3
    def __init__(self, context, sourcePath):
        self.context = context
        self.__logger = context['logger']
        # Separate basedir, basename and extension for current source file
        self.__sourcePath = sourcePath
        self.__sourceDirectory = os.path.dirname(self.__sourcePath)
        self.__sourceFilename = os.path.basename(self.__sourcePath)
        sourcePathTokens = self.__sourceFilename.split('.')
        if sourcePathTokens[-1] in FileProperties.FILE_EXTENSIONS:
            self.__sourceFileBasename = '.'.join(sourcePathTokens[:-1])
            self.__sourceFilenameExtension = sourcePathTokens[-1]
        else:
            self.__sourceFileBasename = self.__sourceFilename
            self.__sourceFilenameExtension = ''
        self.__pc = PatternController(context)
        # db pattern boruto_[sS]([0-9]+)[eE]([0-9]+).mkv
        # Checking if database contains matching pattern
        matchResult = self.__pc.matchFilename(self.__sourceFilename)
        self.__logger.debug(f"FileProperties.__init__(): Match result {matchResult}")
        self.__pattern: Pattern = matchResult['pattern'] if matchResult else None
        if matchResult:
            databaseMatchedGroups = matchResult['match'].groups()
            self.__season = databaseMatchedGroups[0]
            self.__episode = databaseMatchedGroups[1]
        else:
            self.__logger.debug(f"FileProperties.__init__(): Checking file name for indicator {self.__sourceFilename}")
            se_match = re.search(FileProperties.SEASON_EPISODE_INDICATOR_MATCH, self.__sourceFilename)
            e_match = re.search(FileProperties.EPISODE_INDICATOR_MATCH, self.__sourceFilename)
            if se_match is not None:
                self.__season = int(se_match.group(1))
                self.__episode = int(se_match.group(2))
            elif e_match is not None:
                self.__season = -1
                self.__episode = int(e_match.group(1))
            else:
                self.__season = -1
                self.__episode = -1
    def getFormatData(self):
        """
        "format": {
            "filename": "Downloads/nagatoro_s02/nagatoro_s01e02.mkv",
            "nb_streams": 18,
            "nb_programs": 0,
            "nb_stream_groups": 0,
            "format_name": "matroska,webm",
            "format_long_name": "Matroska / WebM",
            "start_time": "0.000000",
            "duration": "1420.063000",
            "size": "1489169824",
            "bit_rate": "8389316",
            "probe_score": 100,
            "tags": {
                "PUBLISHER": "Crunchyroll",
                "ENCODER": "Lavf58.29.100"
            }
        }       
        """
        ffprobeOutput, ffprobeError, returnCode = executeProcess(["ffprobe",
                                                        "-hide_banner",
                                                        "-show_format",
                                                        "-of", "json",
                                                        self.__sourcePath])
        if 'Invalid data found when processing input' in ffprobeError:
            raise Exception(f"File {self.__sourcePath} does not contain valid stream data")
        if returnCode != 0:
            raise Exception(f"ffprobe returned with error {returnCode}")
        return json.loads(ffprobeOutput)['format']
    #[{'index': 0, 'codec_name': 'vp9', 'codec_long_name': 'Google VP9', 'profile': 'Profile 0', 'codec_type': 'video', 'codec_tag_string': '[0][0][0][0]', 'codec_tag': '0x0000', 'width': 1920, 'height': 1080, 'coded_width': 1920, 'coded_height': 1080, 'closed_captions': 0, 'film_grain': 0, 'has_b_frames': 0, 'sample_aspect_ratio': '1:1', 'display_aspect_ratio': '16:9', 'pix_fmt': 'yuv420p', 'level': -99, 'color_range': 'tv', 'chroma_location': 'left', 'field_order': 'progressive', 'refs': 1, 'r_frame_rate': '24000/1001', 'avg_frame_rate': '24000/1001', 'time_base': '1/1000', 'start_pts': 0, 'start_time': '0.000000', 'disposition': {'default': 1, 'dub': 0, 'original': 0, 'comment': 0, 'lyrics': 0, 'karaoke': 0, 'forced': 0, 'hearing_impaired': 0, 'visual_impaired': 0, 'clean_effects': 0, 'attached_pic': 0, 'timed_thumbnails': 0, 'non_diegetic': 0, 'captions': 0, 'descriptions': 0, 'metadata': 0, 'dependent': 0, 'still_image': 0}, 'tags': {'BPS': '7974017', 'NUMBER_OF_FRAMES': '34382', 'NUMBER_OF_BYTES': '1429358655', '_STATISTICS_WRITING_APP': "mkvmerge v63.0.0 ('Everything') 64-bit", '_STATISTICS_WRITING_DATE_UTC': '2023-10-07 13:59:46', '_STATISTICS_TAGS': 'BPS DURATION NUMBER_OF_FRAMES NUMBER_OF_BYTES', 'ENCODER': 'Lavc61.3.100 libvpx-vp9', 'DURATION': '00:23:54.016000000'}}]
    #[{'index': 1, 'codec_name': 'opus', 'codec_long_name': 'Opus (Opus Interactive Audio Codec)', 'codec_type': 'audio', 'codec_tag_string': '[0][0][0][0]', 'codec_tag': '0x0000', 'sample_fmt': 'fltp', 'sample_rate': '48000', 'channels': 2, 'channel_layout': 'stereo', 'bits_per_sample': 0, 'initial_padding': 312, 'r_frame_rate': '0/0', 'avg_frame_rate': '0/0', 'time_base': '1/1000', 'start_pts': -7, 'start_time': '-0.007000', 'extradata_size': 19, 'disposition': {'default': 1, 'dub': 0, 'original': 0, 'comment': 0, 'lyrics': 0, 'karaoke': 0, 'forced': 0, 'hearing_impaired': 0, 'visual_impaired': 0, 'clean_effects': 0, 'attached_pic': 0, 'timed_thumbnails': 0, 'non_diegetic': 0, 'captions': 0, 'descriptions': 0, 'metadata': 0, 'dependent': 0, 'still_image': 0}, 'tags': {'language': 'jpn', 'title': 'Japanisch', 'BPS': '128000', 'NUMBER_OF_FRAMES': '61763', 'NUMBER_OF_BYTES': '22946145', '_STATISTICS_WRITING_APP': "mkvmerge v63.0.0 ('Everything') 64-bit", '_STATISTICS_WRITING_DATE_UTC': '2023-10-07 13:59:46', '_STATISTICS_TAGS': 'BPS DURATION NUMBER_OF_FRAMES NUMBER_OF_BYTES', 'ENCODER': 'Lavc61.3.100 libopus', 'DURATION': '00:23:54.141000000'}}]
    #[{'index': 2, 'codec_name': 'webvtt', 'codec_long_name': 'WebVTT subtitle', 'codec_type': 'subtitle', 'codec_tag_string': '[0][0][0][0]', 'codec_tag': '0x0000', 'r_frame_rate': '0/0', 'avg_frame_rate': '0/0', 'time_base': '1/1000', 'start_pts': -7, 'start_time': '-0.007000', 'duration_ts': 1434141, 'duration': '1434.141000', 'disposition': {'default': 1, 'dub': 0, 'original': 0, 'comment': 0, 'lyrics': 0, 'karaoke': 0, 'forced': 0, 'hearing_impaired': 0, 'visual_impaired': 0, 'clean_effects': 0, 'attached_pic': 0, 'timed_thumbnails': 0, 'non_diegetic': 0, 'captions': 0, 'descriptions': 0, 'metadata': 0, 'dependent': 0, 'still_image': 0}, 'tags': {'language': 'ger', 'title': 'Deutsch [Full]', 'BPS': '118', 'NUMBER_OF_FRAMES': '300', 'NUMBER_OF_BYTES': '21128', '_STATISTICS_WRITING_APP': "mkvmerge v63.0.0 ('Everything') 64-bit", '_STATISTICS_WRITING_DATE_UTC': '2023-10-07 13:59:46', '_STATISTICS_TAGS': 'BPS DURATION NUMBER_OF_FRAMES NUMBER_OF_BYTES', 'ENCODER': 'Lavc61.3.100 webvtt', 'DURATION': '00:23:54.010000000'}}, {'index': 3, 'codec_name': 'webvtt', 'codec_long_name': 'WebVTT subtitle', 'codec_type': 'subtitle', 'codec_tag_string': '[0][0][0][0]', 'codec_tag': '0x0000', 'r_frame_rate': '0/0', 'avg_frame_rate': '0/0', 'time_base': '1/1000', 'start_pts': -7, 'start_time': '-0.007000', 'duration_ts': 1434141, 'duration': '1434.141000', 'disposition': {'default': 0, 'dub': 0, 'original': 0, 'comment': 0, 'lyrics': 0, 'karaoke': 0, 'forced': 0, 'hearing_impaired': 0, 'visual_impaired': 0, 'clean_effects': 0, 'attached_pic': 0, 'timed_thumbnails': 0, 'non_diegetic': 0, 'captions': 0, 'descriptions': 0, 'metadata': 0, 'dependent': 0, 'still_image': 0}, 'tags': {'language': 'eng', 'title': 'Englisch [Full]', 'BPS': '101', 'NUMBER_OF_FRAMES': '276', 'NUMBER_OF_BYTES': '16980', '_STATISTICS_WRITING_APP': "mkvmerge v63.0.0 ('Everything') 64-bit", '_STATISTICS_WRITING_DATE_UTC': '2023-10-07 13:59:46', '_STATISTICS_TAGS': 'BPS DURATION NUMBER_OF_FRAMES NUMBER_OF_BYTES', 'ENCODER': 'Lavc61.3.100 webvtt', 'DURATION': '00:23:53.230000000'}}]
    def getStreamData(self):
        """Returns ffprobe stream data as array with elements according to the following example      
        {
            "index": 4,
            "codec_name": "hdmv_pgs_subtitle",
            "codec_long_name": "HDMV Presentation Graphic Stream subtitles",
            "codec_type": "subtitle",
            "codec_tag_string": "[0][0][0][0]",
            "codec_tag": "0x0000",
            "r_frame_rate": "0/0",
            "avg_frame_rate": "0/0",
            "time_base": "1/1000",
            "start_pts": 0,
            "start_time": "0.000000",
            "duration_ts": 1421035,
            "duration": "1421.035000",
            "disposition": {
                "default": 1,
                "dub": 0,
                "original": 0,
                "comment": 0,
                "lyrics": 0,
                "karaoke": 0,
                "forced": 0,
                "hearing_impaired": 0,
                "visual_impaired": 0,
                "clean_effects": 0,
                "attached_pic": 0,
                "timed_thumbnails": 0,
                "non_diegetic": 0,
                "captions": 0,
                "descriptions": 0,
                "metadata": 0,
                "dependent": 0,
                "still_image": 0
            },
            "tags": {
                "language": "ger",
                "title": "German Full"
            }
        }
        """
        ffprobeOutput, ffprobeError, returnCode = executeProcess(["ffprobe",
                                                        "-hide_banner",
                                                        "-show_streams",
                                                        "-of", "json",
                                                        self.__sourcePath])
        if 'Invalid data found when processing input' in ffprobeError:
            raise Exception(f"File {self.__sourcePath} does not contain valid stream data")
        if returnCode != 0:
            raise Exception(f"ffprobe returned with error {returnCode}")
        return json.loads(ffprobeOutput)['streams']
    def getMediaDescriptor(self):
        return MediaDescriptor.fromFfprobe(self.context, self.getFormatData(), self.getStreamData())
    def getShowId(self) -> int:
        """Result is -1 if the filename did not match anything in database"""
        return self.__pattern.getShowId() if self.__pattern is not None else -1
    def getPattern(self) -> Pattern:
        """Result is None if the filename did not match anything in database"""
        return self.__pattern
    def getSeason(self):
        return int(self.__season)
    def getEpisode(self):
        return int(self.__episode)
    def getFilename(self):
        return self.__sourceFilename
    def getFileBasename(self):
        return self.__sourceFileBasename
    def assembleTargetFileBasename(self,
                                label: str = "",
                                quality: int = -1,
                                fileIndex: int = -1,
                                indexDigits: int = DEFAULT_INDEX_DIGITS,
                                extraTokens: list = []):
        if 'show_descriptor' in self.context.keys():
            season_digits = self.context['show_descriptor'][ShowDescriptor.INDICATOR_SEASON_DIGITS_KEY]
            episode_digits = self.context['show_descriptor'][ShowDescriptor.INDICATOR_EPISODE_DIGITS_KEY]
        else:
            season_digits = ShowDescriptor.DEFAULT_INDICATOR_SEASON_DIGITS
            episode_digits = ShowDescriptor.DEFAULT_INDICATOR_EPISODE_DIGITS
        targetFilenameTokens = []
        # targetFilenameExtension = FfxController.DEFAULT_FILE_EXTENSION if extension is None else str(extension)
        click.echo(f"assembleTargetFileBasename(): label={label} is {'truthy' if label else 'falsy'}")
        if label:
            targetFilenameTokens = [label]
            if fileIndex > -1:
                targetFilenameTokens += [f"{fileIndex:0{indexDigits}d}"]
            elif self.__season > -1 and self.__episode > -1:
                targetFilenameTokens += [f"S{self.__season:0{season_digits}d}E{self.__episode:0{episode_digits}d}"]
            elif self.__episode > -1:
                targetFilenameTokens += [f"E{self.__episode:0{episode_digits}d}"]
        else:                
            targetFilenameTokens = [self.__sourceFileBasename]
        if quality != -1:
            targetFilenameTokens += [f"q{quality}"]
        # In case source and target filenames are the same add an extension to distinct output from input
        #if not label and self.__sourceFilenameExtension == targetFilenameExtension:
        #    targetFilenameTokens += ['ffx']
        targetFilenameTokens += extraTokens
        targetFilename = '_'.join(targetFilenameTokens)
        #self.__logger.debug(f"assembleTargetFileBasename(): Target filename: {targetFilename}")
        click.echo(f"assembleTargetFileBasename(): Target filename: {targetFilename}")
        return targetFilename
--- a/bin/ffx/help_screen.py
+++ b/bin/ffx/help_screen.py
@ -1,12 +1,11 @@
-from textual.app import ComposeResult
+from textual.app import App, ComposeResult
 from textual.screen import Screen
-from textual.widgets import Footer, Placeholder
+from textual.widgets import Header, Footer, Placeholder, Label
 class HelpScreen(Screen):
    def __init__(self):
        super().__init__()
        context = self.app.getContext()
    def compose(self) -> ComposeResult:
        yield Placeholder("Help Screen")
        yield Footer()
--- a/bin/ffx/helper.py
+++ b/bin/ffx/helper.py
@ -0,0 +1,61 @@
 import click
 DIFF_ADDED_KEY = 'added'
 DIFF_REMOVED_KEY = 'removed'
 DIFF_CHANGED_KEY = 'changed'
 DIFF_UNCHANGED_KEY = 'unchanged'
 def dictDiff(a : dict, b : dict):
    a_keys = set(a.keys())
    b_keys = set(b.keys())
    a_only = a_keys - b_keys
    b_only = b_keys - a_keys
    a_b = a_keys & b_keys
    changed = {k for k in a_b if a[k] != b[k]}
    diffResult = {}
    if a_only:
        diffResult[DIFF_REMOVED_KEY] = a_only
        diffResult[DIFF_UNCHANGED_KEY] = b_keys
    if b_only:
        diffResult[DIFF_ADDED_KEY] = b_only
    if changed:
        diffResult[DIFF_CHANGED_KEY] = changed
    return diffResult
 def dictCache(element: dict, cache: list = []):
    for index in range(len(cache)):
        diff = dictDiff(cache[index], element)
        if not diff:
            return index, cache
    cache.append(element)
    return -1, cache
 def setDiff(a : set, b : set) -> set:
    a_only = a - b
    b_only = b - a
    diffResult = {}
    if a_only:
        diffResult[DIFF_REMOVED_KEY] = a_only
    if b_only:
        diffResult[DIFF_ADDED_KEY] = b_only
    return diffResult
 def filterFilename(fileName: str) -> str:
    """This filter replaces charactes from TMDB responses with characters
    less problemating when using in filenames or removes them"""
    fileName = str(fileName).replace(':', ';')
    return fileName
--- a/bin/ffx/iso_language.py
+++ b/bin/ffx/iso_language.py
--- a/bin/ffx/media_controller.py
+++ b/bin/ffx/media_controller.py
@ -1,4 +1,4 @@
-import click
+import click, re
 from ffx.model.pattern import Pattern
 from ffx.media_descriptor import MediaDescriptor
--- a/bin/ffx/media_descriptor.py
+++ b/bin/ffx/media_descriptor.py
@ -3,10 +3,7 @@ import os, re, click, logging
 from typing import List, Self
 from ffx.track_type import TrackType
 from ffx.iso_language import IsoLanguage
 from ffx.track_disposition import TrackDisposition
 from ffx.track_codec import TrackCodec
 from ffx.track_descriptor import TrackDescriptor
@ -28,10 +25,11 @@ class MediaDescriptor:
    FFPROBE_TAGS_KEY = "tags"
    FFPROBE_CODEC_TYPE_KEY = "codec_type"
-    #407 remove as well
+    # JELLYFIN_ORDER_FLAG_KEY = "jellyfin_order"
    EXCLUDED_MEDIA_TAGS = ["creation_time"]
-    SEASON_EPISODE_STREAM_LANGUAGE_MATCH = '[sS]([0-9]+)[eE]([0-9]+)_([0-9]+)_([a-z]{3})(?:_([A-Z]{3}))*'
+    SEASON_EPISODE_STREAM_LANGUAGE_MATCH = '[sS]([0-9]+)[eE]([0-9]+)_([0-9]+)_([a-z]{3})'
    SUBTITLE_FILE_EXTENSION = 'vtt'
    def __init__(self, **kwargs):
@ -45,8 +43,7 @@ class MediaDescriptor:
            self.__logger = self.__context['logger']
        else:
            self.__context = {}
-            self.__logger = logging.getLogger('FFX')
+            self.__logger = logging.getLogger('FFX').addHandler(logging.NullHandler())
            self.__logger.addHandler(logging.NullHandler())
        if MediaDescriptor.TAGS_KEY in kwargs.keys():
            if type(kwargs[MediaDescriptor.TAGS_KEY]) is not dict:
@ -73,37 +70,15 @@ class MediaDescriptor:
        else:
            self.__trackDescriptors = []
-    def setTrackLanguage(self, language: str, index: int, trackType: TrackType = None):
+        # if MediaDescriptor.JELLYFIN_ORDER_FLAG_KEY in kwargs.keys():
-
+        #     if type(kwargs[MediaDescriptor.JELLYFIN_ORDER_FLAG_KEY]) is not bool:
-        trackLanguage = IsoLanguage.findThreeLetter(language)
+        #         raise TypeError(
-        if trackLanguage == IsoLanguage.UNDEFINED:
+        #             f"MediaDescriptor.__init__(): Argument {MediaDescriptor.JELLYFIN_ORDER_FLAG_KEY} is required to be of type bool"
-            self.__logger.warning('MediaDescriptor.setTrackLanguage(): Parameter language does not contain a registered '
+        #         )
-                                    + f"ISO 639 3-letter language code, skipping to set language for"
+        #     self.__jellyfinOrder = kwargs[MediaDescriptor.JELLYFIN_ORDER_FLAG_KEY]
-                                    + str('' if trackType is None else trackType.label()) + f"track {index}")
+        # else:
-
+        #     self.__jellyfinOrder = False
-        trackList = self.getTrackDescriptors(trackType=trackType)
+        self.__jellyfinOrder = self.__context['use_jellyfin'] if 'use_jellyfin' in self.__context.keys() else False
        if index < 0 or index > len(trackList) - 1:
            self.__logger.warning(f"MediaDescriptor.setTrackLanguage(): Parameter index ({index}) is "
                                    + f"out of range of {'' if trackType is None else trackType.label()}track list")
        td: TrackDescriptor = trackList[index]
        td.setLanguage(trackLanguage)
        return
    def setTrackTitle(self, title: str, index: int, trackType: TrackType = None):
        trackList = self.getTrackDescriptors(trackType=trackType)
        if index < 0 or index > len(trackList) - 1:
            self.__logger.error(f"MediaDescriptor.setTrackTitle(): Parameter index ({index}) is "
                                    + f"out of range of {'' if trackType is None else trackType.label()}track list")
            raise click.Abort()
        td: TrackDescriptor = trackList[index]
        td.setTitle(title)
    def setDefaultSubTrack(self, trackType: TrackType, subIndex: int):
@ -148,47 +123,6 @@ class MediaDescriptor:
            raise ValueError('Multiple streams originating from the same source stream')
    def applyOverrides(self, overrides: dict):
        if 'languages' in overrides.keys():
            for trackIndex in overrides['languages'].keys():
                self.setTrackLanguage(overrides['languages'][trackIndex], trackIndex)
        if 'titles' in overrides.keys():
            for trackIndex in overrides['titles'].keys():
                self.setTrackTitle(overrides['titles'][trackIndex], trackIndex)
        if 'forced_video' in overrides.keys():
            sti = int(overrides['forced_video'])
            self.setForcedSubTrack(TrackType.VIDEO, sti)
            self.setDefaultSubTrack(TrackType.VIDEO, sti)
        elif 'default_video' in overrides.keys():
            sti = int(overrides['default_video'])
            self.setDefaultSubTrack(TrackType.VIDEO, sti)
        if 'forced_audio' in overrides.keys():
            sti = int(overrides['forced_audio'])
            self.setForcedSubTrack(TrackType.AUDIO, sti)
            self.setDefaultSubTrack(TrackType.AUDIO, sti)
        elif 'default_audio' in overrides.keys():
            sti = int(overrides['default_audio'])
            self.setDefaultSubTrack(TrackType.AUDIO, sti)
        if 'forced_subtitle' in overrides.keys():
            sti = int(overrides['forced_subtitle'])
            self.setForcedSubTrack(TrackType.SUBTITLE, sti)
            self.setDefaultSubTrack(TrackType.SUBTITLE, sti)
        elif 'default_subtitle' in overrides.keys():
            sti = int(overrides['default_subtitle'])
            self.setDefaultSubTrack(TrackType.SUBTITLE, sti)
        if 'stream_order' in overrides.keys():
            self.rearrangeTrackDescriptors(overrides['stream_order'])
    def applySourceIndices(self, sourceMediaDescriptor: Self):
        sourceTrackDescriptors = sourceMediaDescriptor.getAllTrackDescriptors()
@ -197,16 +131,51 @@ class MediaDescriptor:
            raise ValueError('MediaDescriptor.applySourceIndices (): Number of track descriptors does not match')
        for trackIndex in range(numTrackDescriptors):
            # click.echo(f"{trackIndex} -> {sourceTrackDescriptors[trackIndex].getSourceIndex()}")
            self.__trackDescriptors[trackIndex].setSourceIndex(sourceTrackDescriptors[trackIndex].getSourceIndex())
-    def rearrangeTrackDescriptors(self, newOrder: List[int]):
+    def applyJellyfinOrder(self):
-        if len(newOrder) != len(self.__trackDescriptors):
+        """Reorder subtracks in types with default the last, then make subindices flat again"""
-            raise ValueError('Length of list with reordered indices does not match number of track descriptors')
+
-        reorderedTrackDescriptors = {}
+        # videoTracks = self.sortSubIndices(self.getVideoTracks())
-        for oldIndex in newOrder:
+        # audioTracks = self.sortSubIndices(self.getAudioTracks())
-            reorderedTrackDescriptors.append(self.__trackDescriptors[oldIndex])
+        # subtitleTracks = self.sortSubIndices(self.getSubtitleTracks())
-        self.__trackDescriptors = reorderedTrackDescriptors
+
        self.checkConfiguration()
        # from self.__trackDescriptors
        videoTracks = self.getVideoTracks()
        audioTracks = self.getAudioTracks()
        subtitleTracks = self.getSubtitleTracks()
        defaultVideoTracks = [v for v in videoTracks if v.getDispositionFlag(TrackDisposition.DEFAULT)]
        defaultAudioTracks = [a for a in audioTracks if a.getDispositionFlag(TrackDisposition.DEFAULT)]
        defaultSubtitleTracks = [s for s in subtitleTracks if s.getDispositionFlag(TrackDisposition.DEFAULT)]
        if defaultVideoTracks:
            videoTracks.append(videoTracks.pop(videoTracks.index(defaultVideoTracks[0])))
            #self.sortSubIndices(videoTracks)
            numVideoTracks = len(videoTracks)
            for vIndex in range(numVideoTracks):
                videoTracks[vIndex].setDispositionFlag(TrackDisposition.DEFAULT,
                                        vIndex == numVideoTracks - 1)
        if defaultAudioTracks:
            audioTracks.append(audioTracks.pop(audioTracks.index(defaultAudioTracks[0])))
            #self.sortSubIndices(audioTracks)
            numAudioTracks = len(audioTracks)
            for aIndex in range(numAudioTracks):
                audioTracks[aIndex].setDispositionFlag(TrackDisposition.DEFAULT,
                                        aIndex == numAudioTracks - 1)
        if defaultSubtitleTracks:
            subtitleTracks.append(subtitleTracks.pop(subtitleTracks.index(defaultSubtitleTracks[0])))
            #self.sortSubIndices(subtitleTracks)
            numSubtitleTracks = len(subtitleTracks)
            for sIndex in range(numSubtitleTracks):
                subtitleTracks[sIndex].setDispositionFlag(TrackDisposition.DEFAULT,
                                        sIndex == numSubtitleTracks - 1)
        self.__trackDescriptors = videoTracks + audioTracks + subtitleTracks
        #self.sortIndices(self.__trackDescriptors)
        self.reindexSubIndices()
        self.reindexIndices()
@ -285,30 +254,18 @@ class MediaDescriptor:
            tdList[trackIndex].setIndex(trackIndex)
-    def getAllTrackDescriptors(self):
+    def getAllTrackDescriptors(self) -> List[TrackDescriptor]:
        """Returns all track descriptors sorted by type: video, audio then subtitles"""                        
        return self.getVideoTracks() + self.getAudioTracks() + self.getSubtitleTracks()
    def getTrackDescriptors(self,
                            trackType: TrackType = None) -> List[TrackDescriptor]:
        if trackType is None:
            return self.__trackDescriptors
        descriptorList = []
        for td in self.__trackDescriptors:
            if td.getType() == trackType:
                descriptorList.append(td)
        return descriptorList
    def getVideoTracks(self) -> List[TrackDescriptor]:
-        return [v for v in self.__trackDescriptors if v.getType() == TrackType.VIDEO]
+        return [
            v for v in self.__trackDescriptors if v.getType() == TrackType.VIDEO
        ]
    def getAudioTracks(self) -> List[TrackDescriptor]:
-        return [a for a in self.__trackDescriptors if a.getType() == TrackType.AUDIO]
+        return [
            a for a in self.__trackDescriptors if a.getType() == TrackType.AUDIO
        ]
    def getSubtitleTracks(self) -> List[TrackDescriptor]:
        return [
@ -321,8 +278,10 @@ class MediaDescriptor:
    def compare(self, vsMediaDescriptor: Self):
        if not isinstance(vsMediaDescriptor, self.__class__):
-            self.__logger.error(f"MediaDescriptor.compare(): Argument is required to be of type {self.__class__}")
+            errorMessage = f"MediaDescriptor.compare(): Argument is required to be of type {self.__class__}"
-            raise click.Abort()
+            self.__logger.error(errorMessage)
            # raise click.ClickException(errorMessage)
            click.Abort()
        vsTags = vsMediaDescriptor.getTags()
        tags = self.getTags()
@ -356,8 +315,12 @@ class MediaDescriptor:
        for tp in range(maxNumOfTracks):
-            #!
+            # inspect/update funktionier nur so
-            vsTrackIndex = tracks[tp].getSourceIndex()
+            if self.__jellyfinOrder:
                vsTrackIndex = tracks[tp].getSourceIndex()
            else:
                vsTrackIndex = tp
            # vsTrackIndex = tracks[tp].getSourceIndex()
            # Will trigger if tracks are missing in file
            if tp > (numVsTracks - 1):
@ -394,19 +357,15 @@ class MediaDescriptor:
    def getImportFileTokens(self, use_sub_index: bool = True):
        # reorderedTrackDescriptors = self.getReorderedTrackDescriptors()
        importFileTokens = []
-        td: TrackDescriptor
+        #for rtd in reorderedTrackDescriptors:
        for td in self.__trackDescriptors:
            importedFilePath = td.getExternalSourceFilePath()
            if importedFilePath:
                self.__logger.info(f"Substituting subtitle stream #{td.getIndex()} "
                                    + f"({td.getType().label()}:{td.getSubIndex()}) "
                                    + f"with import from file {td.getExternalSourceFilePath()}")
                importFileTokens += [
                    "-i",
                    importedFilePath,
@ -418,6 +377,14 @@ class MediaDescriptor:
    def getInputMappingTokens(self, use_sub_index: bool = True, only_video: bool = False):
        """Tracks must be reordered for source index order"""
        # sourceTrackDescriptorSubIndices = [self.__trackDescriptors[std.getSourceIndex()].getSubIndex()
        #                                 for std in self.__trackDescriptors]
        # self.reindexSubIndices(trackDescriptors = sourceOrderTrackDescriptors)
        # self.reindexIndices(trackDescriptors = sourceOrderTrackDescriptors)
        # click.echo(sourceTrackDescriptorIndices)
        inputMappingTokens = []
        filePointer = 1
@ -431,6 +398,9 @@ class MediaDescriptor:
            # sti = self.__trackDescriptors[trackIndex].getSourceIndex()
            # sotd = sourceOrderTrackDescriptors[sti]
        # appearently this negates applyJellyfinOrder
        #for rtd in sorted(self.__trackDescriptors.copy(), key=lambda d: d.getSourceIndex()):
            trackType = td.getType()
            if (trackType == TrackType.VIDEO or not only_video):
@ -449,14 +419,14 @@ class MediaDescriptor:
                    else:
-                        if td.getCodec() != TrackCodec.PGS:
+                        if td.getCodec() != TrackDescriptor.CODEC_PGS:
                            inputMappingTokens += [
                                "-map",
                                f"0:{trackType.indicator()}:{stdsi}",
                            ]
                else:
-                    if td.getCodec() != TrackCodec.PGS:
+                    if td.getCodec() != TrackDescriptor.CODEC_PGS:
                        inputMappingTokens += ["-map", f"0:{stdi}"]
        return inputMappingTokens
@ -483,16 +453,6 @@ class MediaDescriptor:
                        subtitleFileDescriptor["index"] = int(sesl_result.group(3))
                        subtitleFileDescriptor["language"] = sesl_result.group(4)
                        dispSet = set()
                        dispCaptGroups = sesl_result.groups()
                        numCaptGroups = len(dispCaptGroups)
                        if numCaptGroups > 4:
                            for groupIndex in range(numCaptGroups - 4):
                                disp = TrackDisposition.fromIndicator(dispCaptGroups[groupIndex + 4])
                                if disp is not None:
                                    dispSet.add(disp)
                        subtitleFileDescriptor["disposition_set"] = dispSet
                        subtitleFileDescriptors.append(subtitleFileDescriptor)
        self.__logger.debug(f"searchSubtitleFiles(): Available subtitle files {subtitleFileDescriptors}")
@ -507,12 +467,17 @@ class MediaDescriptor:
        availableFileSubtitleDescriptors = self.searchSubtitleFiles(searchDirectory, prefix)
        # click.echo(f"availableFileSubtitleDescriptors: {availableFileSubtitleDescriptors}")
        self.__logger.debug(f"importSubtitles(): availableFileSubtitleDescriptors: {availableFileSubtitleDescriptors}")
        subtitleTracks = self.getSubtitleTracks()
        # click.echo(f"subtitleTracks: {[s.getIndex() for s in subtitleTracks]}")
        self.__logger.debug(f"importSubtitles(): subtitleTracks: {[s.getIndex() for s in subtitleTracks]}")
        # if len(availableFileSubtitleDescriptors) != len(subtitleTracks):
        #     raise click.ClickException(f"MediaDescriptor.importSubtitles(): Number if subtitle files not matching number of subtitle tracks")
        matchingSubtitleFileDescriptors = (
            sorted(
                [
@ -526,18 +491,17 @@ class MediaDescriptor:
            else []
        )
        # click.echo(f"matchingSubtitleFileDescriptors: {matchingSubtitleFileDescriptors}")
        self.__logger.debug(f"importSubtitles(): matchingSubtitleFileDescriptors: {matchingSubtitleFileDescriptors}")
        # click.echo(f"importSubtitles(): matchingSubtitleFileDescriptors: {matchingSubtitleFileDescriptors}")
        for msfd in matchingSubtitleFileDescriptors:
            matchingSubtitleTrackDescriptor = [s for s in subtitleTracks if s.getIndex() == msfd["index"]]
            if matchingSubtitleTrackDescriptor:
                # click.echo(f"Found matching subtitle file {msfd["path"]}\n")
-                self.__logger.debug(f"importSubtitles(): Found matching subtitle file {msfd['path']}")
+                self.__logger.debug(f"importSubtitles(): Found matching subtitle file {msfd["path"]}")
                matchingSubtitleTrackDescriptor[0].setExternalSourceFilePath(msfd["path"])
                # TODO: Check if useful
                # matchingSubtitleTrackDescriptor[0].setDispositionSet(msfd["disposition_set"])
    def getConfiguration(self, label: str = ''):
        yield f"--- {label if label else 'MediaDescriptor '+str(id(self))} {' '.join([str(k)+'='+str(v) for k,v in self.__mediaTags.items()])}"
--- a/bin/ffx/media_details_screen.py
+++ b/bin/ffx/media_details_screen.py
@ -1,21 +1,25 @@
 import os, click, re
 from textual import events
 from textual.app import App, ComposeResult
 from textual.screen import Screen
 from textual.widgets import Header, Footer, Static, Button, Input, DataTable
 from textual.containers import Grid
-from ffx.audio_layout import AudioLayout
+from ffx.model.show import Show
 from ffx.model.pattern import Pattern
 from .pattern_controller import PatternController
 from .show_controller import ShowController
 from .track_controller import TrackController
 from .tag_controller import TagController
 from .track_details_screen import TrackDetailsScreen
 from .track_delete_screen import TrackDeleteScreen
 from .show_details_screen import ShowDetailsScreen
 from .pattern_details_screen import PatternDetailsScreen
 from ffx.track_type import TrackType
 from ffx.track_codec import TrackCodec
 from ffx.model.track import Track
 from ffx.track_disposition import TrackDisposition
@ -37,22 +41,12 @@ class MediaDetailsScreen(Screen):
    Grid {
        grid-size: 5 8;
-        grid-rows: 8 2 2 2 2 8 2 2 8;
+        grid-rows: 8 2 2 2 8 2 2 8;
-        grid-columns: 25 25 120 10 75;
+        grid-columns: 25 25 100 10 75;
        height: 100%;
        width: 100%;
        padding: 1;
    }
    DataTable .datatable--cursor {
        background: darkorange;
        color: black;
    }
    DataTable .datatable--header {
        background: steelblue;
        color: white;
    }
    Input {
        border: none;
@ -91,10 +85,6 @@ class MediaDetailsScreen(Screen):
        border: solid green;
    }
    .purple {
        tint: purple 40%;
    }
    .yellow {
        tint: yellow 40%;
    }
@ -142,25 +132,7 @@ class MediaDetailsScreen(Screen):
        self.loadProperties()
-    def removeShow(self, showId : int = -1):
+    def getRowIndexFromShowId(self, showId : int) -> int:
        """Remove show entry from DataTable.
        Removes the <New show> entry if showId is not set"""
        for rowKey, row in self.showsTable.rows.items(): # dict[RowKey, Row]
            rowData = self.showsTable.get_row(rowKey)
            try:
                if (showId == -1 and rowData[0] == ' '
                        or showId == int(rowData[0])):
                    self.showsTable.remove_row(rowKey)
                    return
            except:
                continue
    def getRowIndexFromShowId(self, showId : int = -1) -> int:
        """Find the index of the row where the value in the specified column matches the target_value."""
        for rowKey, row in self.showsTable.rows.items(): # dict[RowKey, Row]
@ -168,8 +140,7 @@ class MediaDetailsScreen(Screen):
            rowData = self.showsTable.get_row(rowKey)
            try:
-                if ((showId == -1 and rowData[0] == ' ')
+                if showId == int(rowData[0]):
                        or showId == int(rowData[0])):
                    return int(self.showsTable.get_row_index(rowKey))
            except:
                continue
@ -328,13 +299,11 @@ class MediaDetailsScreen(Screen):
                typeCounter[trackType] = 0
            dispoSet = td.getDispositionSet()
-            audioLayout = td.getAudioLayout()
+
            row = (td.getIndex(),
                    trackType.label(),
                    typeCounter[trackType],
-                    td.getCodec().label(),
+                    td.getAudioLayout().label() if trackType == TrackType.AUDIO else ' ',
                    audioLayout.label() if trackType == TrackType.AUDIO
                        and audioLayout != AudioLayout.LAYOUT_UNDEFINED else ' ',
                    td.getLanguage().label(),
                    td.getTitle(),
                    'Yes' if TrackDisposition.DEFAULT in dispoSet else 'No',
@ -361,7 +330,7 @@ class MediaDetailsScreen(Screen):
        self.mediaTagsTable = DataTable(classes="two")
        # Define the columns with headers
-        self.column_key_track_tag_key = self.mediaTagsTable.add_column("Key", width=50)
+        self.column_key_track_tag_key = self.mediaTagsTable.add_column("Key", width=20)
        self.column_key_track_tag_value = self.mediaTagsTable.add_column("Value", width=100)
        self.mediaTagsTable.cursor_type = 'row'
@ -372,8 +341,7 @@ class MediaDetailsScreen(Screen):
        # Define the columns with headers
        self.column_key_track_index = self.tracksTable.add_column("Index", width=5)
        self.column_key_track_type = self.tracksTable.add_column("Type", width=10)
-        self.column_key_track_sub_index = self.tracksTable.add_column("SubIndex", width=8)
+        self.column_key_track_sub_index = self.tracksTable.add_column("Subindex", width=5)
        self.column_key_track_codec = self.tracksTable.add_column("Codec", width=10)
        self.column_key_track_layout = self.tracksTable.add_column("Layout", width=10)
        self.column_key_track_language = self.tracksTable.add_column("Language", width=15)
        self.column_key_track_title = self.tracksTable.add_column("Title", width=48)
@ -400,38 +368,35 @@ class MediaDetailsScreen(Screen):
            yield self.showsTable
            yield Static(" ")
            yield self.differencesTable
            # 2
            yield Static(" ", classes="four")
-            # 3
+            # 2
            yield Static(" ")
            yield Button("Substitute", id="pattern_button")
            yield Static(" ", classes="two")
-            # 4
+            # 3
            yield Static("Pattern")
            yield Input(type="text", id='pattern_input', classes="two")
            yield Static(" ")
-            # 5
+            # 4
            yield Static(" ", classes="four")
-            # 6
+            # 5
            yield Static("Media Tags")
            yield self.mediaTagsTable
            yield Static(" ")
-            # 7
+            # 6
            yield Static(" ", classes="four")
-            # 8
+            # 7
            yield Static(" ")
            yield Button("Set Default", id="select_default_button")
            yield Button("Set Forced", id="select_forced_button")
            yield Static(" ")
-            # 9
+            # 8
            yield Static("Streams")
            yield self.tracksTable
            yield Static(" ")
@ -454,12 +419,14 @@ class MediaDetailsScreen(Screen):
        if event.button.id == "pattern_button":
            INDICATOR_PATTERN = '([sS][0-9]+[eE][0-9]+)'
            pattern = self.query_one("#pattern_input", Input).value
-            patternMatch = re.search(FileProperties.SE_INDICATOR_PATTERN, pattern)
+            patternMatch = re.search(INDICATOR_PATTERN, pattern)
            if patternMatch:
-                self.query_one("#pattern_input", Input).value = pattern.replace(patternMatch.group(1), FileProperties.SE_INDICATOR_PATTERN)
+                self.query_one("#pattern_input", Input).value = pattern.replace(patternMatch.group(1), INDICATOR_PATTERN)
        if event.button.id == "select_default_button":
@ -489,8 +456,6 @@ class MediaDetailsScreen(Screen):
                kwargs[TrackDescriptor.INDEX_KEY] = int(selected_track_data[0])
                kwargs[TrackDescriptor.TRACK_TYPE_KEY] = TrackType.fromLabel(selected_track_data[1])
                kwargs[TrackDescriptor.SUB_INDEX_KEY] = int(selected_track_data[2])
                kwargs[TrackDescriptor.CODEC_KEY] = TrackCodec.fromLabel(selected_track_data[3])
                kwargs[TrackDescriptor.AUDIO_LAYOUT_KEY] = AudioLayout.fromLabel(selected_track_data[4])
                return TrackDescriptor(**kwargs)
            else:
@ -500,10 +465,11 @@ class MediaDetailsScreen(Screen):
            return None
-    def getSelectedShowDescriptor(self) -> ShowDescriptor:
+    def getSelectedShowDescriptor(self):
        try:
        try:
            # Fetch the currently selected row when 'Enter' is pressed
            #selected_row_index = self.table.cursor_row
            row_key, col_key = self.showsTable.coordinate_to_cell_key(self.showsTable.cursor_coordinate)
            if row_key is not None:
@ -527,20 +493,13 @@ class MediaDetailsScreen(Screen):
    def handle_new_pattern(self, showDescriptor: ShowDescriptor):
-        if type(showDescriptor) is not ShowDescriptor:
+        show = (showDescriptor.getId(), showDescriptor.getName(), showDescriptor.getYear())
-            raise TypeError("MediaDetailsScreen.handle_new_pattern(): Argument 'showDescriptor' has to be of type ShowDescriptor")
+        self.showsTable.add_row(*map(str, show))
        showRowIndex = self.getRowIndexFromShowId(showDescriptor.getId())
        if showRowIndex is None:
            show = (showDescriptor.getId(), showDescriptor.getName(), showDescriptor.getYear())
            self.showsTable.add_row(*map(str, show))
        showRowIndex = self.getRowIndexFromShowId(showDescriptor.getId()) 
        if showRowIndex is not None:
            self.showsTable.move_cursor(row=showRowIndex)
        self.removeShow()
        patternDescriptor = self.getPatternDescriptorFromInput()
        if patternDescriptor:
@ -557,11 +516,10 @@ class MediaDetailsScreen(Screen):
    def action_new_pattern(self):
-        #TODO #427: Fehlermeldung in TUI
+        try:
-        # try:
+            self.__currentMediaDescriptor.checkConfiguration()
-        #     self.__currentMediaDescriptor.checkConfiguration()
+        except ValueError:
-        # except ValueError:
+            return
        #     return
        selectedShowDescriptor = self.getSelectedShowDescriptor()
@ -665,8 +623,10 @@ class MediaDetailsScreen(Screen):
    def action_edit_pattern(self):
-
+        
-        patternDescriptor = self.getPatternDescriptorFromInput()
+        patternDescriptor = {}
        patternDescriptor['show_id'] = self.getSelectedShowDescriptor().getId()
        patternDescriptor['pattern'] = self.getPatternFromInput()
        if patternDescriptor['pattern']:
--- a/src/ffx/filter/init.py
+++ b/src/ffx/filter/init.py
--- a/bin/ffx/model/media_tag.py
+++ b/bin/ffx/model/media_tag.py
--- a/bin/ffx/model/pattern.py
+++ b/bin/ffx/model/pattern.py
@ -1,14 +1,14 @@
 import click
-from sqlalchemy import Column, Integer, String, ForeignKey
+from sqlalchemy import create_engine, Column, Integer, String, ForeignKey
-from sqlalchemy.orm import relationship
+from sqlalchemy.orm import relationship, sessionmaker, Mapped, backref
 from .show import Base, Show
 from .track import Track
 from ffx.media_descriptor import MediaDescriptor
 from ffx.show_descriptor import ShowDescriptor
 class Pattern(Base):
    __tablename__ = 'patterns'
--- a/bin/ffx/model/show.py
+++ b/bin/ffx/model/show.py
@ -4,8 +4,8 @@ from sqlalchemy.orm import relationship, declarative_base, sessionmaker
 from ffx.show_descriptor import ShowDescriptor
 Base = declarative_base()
 Base = declarative_base()
 class Show(Base):
    """
@ -38,9 +38,6 @@ class Show(Base):
    # v2.0
    # patterns: Mapped[List["Pattern"]] = relationship(back_populates="show", cascade="all, delete")
    shifted_seasons = relationship('ShiftedSeason', back_populates='show', cascade="all, delete")
    index_season_digits = Column(Integer, default=ShowDescriptor.DEFAULT_INDEX_SEASON_DIGITS)
    index_episode_digits = Column(Integer, default=ShowDescriptor.DEFAULT_INDEX_EPISODE_DIGITS)
    indicator_season_digits = Column(Integer, default=ShowDescriptor.DEFAULT_INDICATOR_SEASON_DIGITS)
--- a/bin/ffx/model/track.py
+++ b/bin/ffx/model/track.py
@ -12,8 +12,8 @@ from ffx.track_disposition import TrackDisposition
 from ffx.track_descriptor import TrackDescriptor
 from ffx.audio_layout import AudioLayout
 from ffx.track_codec import TrackCodec
 import click
 class Track(Base):
    """
@ -151,9 +151,9 @@ class Track(Base):
    def getType(self):
        return TrackType.fromIndex(self.track_type)
-
+    
-    def getCodec(self) -> TrackCodec:
+    def getCodec(self):
-        return TrackCodec.identify(self.codec_name)
+        return str(self.codec_name)
    def getIndex(self):
        return int(self.index) if self.index is not None else -1
@ -189,12 +189,11 @@ class Track(Base):
            return bool(self.disposition_flags & 2**disposition.index())
-    def getDescriptor(self, context = None, subIndex : int = -1) -> TrackDescriptor:
+    def getDescriptor(self, context, subIndex : int = -1) -> TrackDescriptor:
        kwargs = {}
-        if not context is None:
+        kwargs[TrackDescriptor.CONTEXT_KEY] = context
            kwargs[TrackDescriptor.CONTEXT_KEY] = context
        kwargs[TrackDescriptor.ID_KEY] = self.getId()
        kwargs[TrackDescriptor.PATTERN_ID_KEY] = self.getPatternId()
@ -206,7 +205,7 @@ class Track(Base):
            kwargs[TrackDescriptor.SUB_INDEX_KEY] = subIndex
        kwargs[TrackDescriptor.TRACK_TYPE_KEY] = self.getType()
-        kwargs[TrackDescriptor.CODEC_KEY] = self.getCodec()
+        kwargs[TrackDescriptor.CODEC_NAME_KEY] = self.getCodec()
        kwargs[TrackDescriptor.DISPOSITION_SET_KEY] = self.getDispositionSet()
        kwargs[TrackDescriptor.TAGS_KEY] = self.getTags()
--- a/bin/ffx/model/track_tag.py
+++ b/bin/ffx/model/track_tag.py
--- a/bin/ffx/pattern_controller.py
+++ b/bin/ffx/pattern_controller.py
@ -16,8 +16,7 @@ class PatternController():
        try:
            s = self.Session()
-            q = s.query(Pattern).filter(Pattern.show_id == int(patternDescriptor['show_id']),
+            q = s.query(Pattern).filter(Pattern.show_id == int(patternDescriptor['show_id']))
                                        Pattern.pattern == str(patternDescriptor['pattern']))
            if not q.count():
                pattern = Pattern(show_id = int(patternDescriptor['show_id']),
@ -139,18 +138,18 @@ class PatternController():
        finally:
            s.close()
-#    def getMediaDescriptor(self, context, patternId):
+    def getMediaDescriptor(self, context, patternId):
-#
+
-#        try:
+        try:
-#            s = self.Session()
+            s = self.Session()
-#            q = s.query(Pattern).filter(Pattern.id == int(patternId))
+            q = s.query(Pattern).filter(Pattern.id == int(patternId))
-#
+
-#            if q.count():
+            if q.count():
-#                return q.first().getMediaDescriptor(context)
+                return q.first().getMediaDescriptor(context)
-#            else:
+            else:
-#                return None
+                return None
-#
+
-#        except Exception as ex:
+        except Exception as ex:
-#            raise click.ClickException(f"PatternController.getMediaDescriptor(): {repr(ex)}")
+            raise click.ClickException(f"PatternController.getPatternDescriptor(): {repr(ex)}")
-#        finally:
+        finally:
-#            s.close()
+            s.close()
--- a/bin/ffx/pattern_delete_screen.py
+++ b/bin/ffx/pattern_delete_screen.py
@ -7,8 +7,6 @@ from textual.containers import Grid
 from .show_controller import ShowController
 from .pattern_controller import PatternController
 from ffx.model.pattern import Pattern
 # Screen[dict[int, str, int]]
 class PatternDeleteScreen(Screen):
@ -53,16 +51,16 @@ class PatternDeleteScreen(Screen):
        self.__pc = PatternController(context = self.context)
        self.__sc = ShowController(context = self.context)
-        self.__patternId = patternId
+        self.pattern_id = patternId
-        self.__pattern: Pattern = self.__pc.getPattern(patternId) if patternId is not None else {}
+        self.pattern_obj = self.__pc.getPatternDescriptor(patternId) if patternId is not None else {}
-        self.__showDescriptor = self.__sc.getShowDescriptor(showId) if showId is not None else {}
+        self.show_obj = self.__sc.getShowDescriptor(showId) if showId is not None else {}
    def on_mount(self):
-        if self.__showDescriptor:
+        if self.show_obj:
-            self.query_one("#showlabel", Static).update(f"{self.__showDescriptor.getId()} - {self.__showDescriptor.getName()} ({self.__showDescriptor.getYear()})")
+            self.query_one("#showlabel", Static).update(f"{self.show_obj['id']} - {self.show_obj['name']} ({self.show_obj['year']})")
-        if not self.__pattern is None:
+        if self.pattern_obj:
-            self.query_one("#patternlabel", Static).update(str(self.__pattern.pattern))
+            self.query_one("#patternlabel", Static).update(str(self.pattern_obj['pattern']))
    def compose(self):
@ -96,11 +94,11 @@ class PatternDeleteScreen(Screen):
        if event.button.id == "delete_button":
-            if self.__patternId is None:
+            if self.pattern_id is None:
                raise click.ClickException('PatternDeleteScreen.on_button_pressed(): pattern id is undefined')
-            if self.__pc.deletePattern(self.__patternId):
+            if self.__pc.deletePattern(self.pattern_id):
-                self.dismiss(self.__pattern)
+                self.dismiss(self.pattern_obj)
            else:
                #TODO: Meldung
--- a/bin/ffx/pattern_details_screen.py
+++ b/bin/ffx/pattern_details_screen.py
@ -1,10 +1,12 @@
 import click, re
 from typing import List
 from textual import events
 from textual.app import App, ComposeResult
 from textual.screen import Screen
 from textual.widgets import Header, Footer, Static, Button, Input, DataTable
 from textual.containers import Grid
 from ffx.model.show import Show
 from ffx.model.pattern import Pattern
 from ffx.model.track import Track
@ -26,10 +28,6 @@ from ffx.track_descriptor import TrackDescriptor
 from textual.widgets._data_table import CellDoesNotExist
 from ffx.file_properties import FileProperties
 from ffx.iso_language import IsoLanguage
 from ffx.audio_layout import AudioLayout
 # Screen[dict[int, str, int]]
 class PatternDetailsScreen(Screen):
@ -37,9 +35,9 @@ class PatternDetailsScreen(Screen):
    CSS = """
    Grid {
-        grid-size: 7 13;
+        grid-size: 5 13;
        grid-rows: 2 2 2 2 2 8 2 2 8 2 2 2 2;
-        grid-columns: 25 25 25 25 25 25 25;
+        grid-columns: 25 25 25 25 25;
        height: 100%;
        width: 100%;
        padding: 1;
@ -56,16 +54,6 @@ class PatternDetailsScreen(Screen):
        min-height: 6;
    }
    DataTable .datatable--cursor {
        background: darkorange;
        color: black;
    }
    DataTable .datatable--header {
        background: steelblue;
        color: white;
    }
    #toplabel {
        height: 1;
    }
@ -80,12 +68,6 @@ class PatternDetailsScreen(Screen):
    .five {
        column-span: 5;
    }
    .six {
        column-span: 6;
    }
    .seven {
        column-span: 7;
    }
    .box {
        height: 100%;
@ -142,7 +124,6 @@ class PatternDetailsScreen(Screen):
            typeCounter = {}
            tr: Track
            for tr in tracks:
                td : TrackDescriptor = tr.getDescriptor(self.context)
@ -153,69 +134,31 @@ class PatternDetailsScreen(Screen):
                dispoSet = td.getDispositionSet()
                trackLanguage = td.getLanguage()
                audioLayout = td.getAudioLayout()
                row = (td.getIndex(),
                        trackType.label(),
                        typeCounter[trackType],
-                        td.getCodec().label(),
+                        td.getAudioLayout().label() if trackType == TrackType.AUDIO else ' ',
-                        audioLayout.label() if trackType == TrackType.AUDIO
+                        td.getLanguage().label(),
                            and audioLayout != AudioLayout.LAYOUT_UNDEFINED else ' ',
                        trackLanguage.label() if trackLanguage != IsoLanguage.UNDEFINED else ' ',
                        td.getTitle(),
                        'Yes' if TrackDisposition.DEFAULT in dispoSet else 'No',
-                        'Yes' if TrackDisposition.FORCED in dispoSet else 'No',
+                        'Yes' if TrackDisposition.FORCED in dispoSet else 'No')
                        td.getSourceIndex())
                self.tracksTable.add_row(*map(str, row))
                typeCounter[trackType] += 1
    def swapTracks(self, trackIndex1: int, trackIndex2: int):
        ti1 = int(trackIndex1)
        ti2 = int(trackIndex2)
        siblingDescriptors: List[TrackDescriptor] = self.__tc.findSiblingDescriptors(self.__pattern.getId())
        numSiblings = len(siblingDescriptors)
        if ti1 < 0 or ti1 >= numSiblings:
            raise ValueError(f"PatternDetailsScreen.swapTracks(): trackIndex1 ({ti1}) is out of range ({numSiblings})")
        if ti2 < 0 or ti2 >= numSiblings:
            raise ValueError(f"PatternDetailsScreen.swapTracks(): trackIndex2 ({ti2}) is out of range ({numSiblings})")
        sibling1 = siblingDescriptors[trackIndex1]
        sibling2 = siblingDescriptors[trackIndex2]
        # raise click.ClickException(f"siblings id1={sibling1.getId()} id2={sibling2.getId()}")
        subIndex2 = sibling2.getSubIndex()
        sibling2.setIndex(sibling1.getIndex())
        sibling2.setSubIndex(sibling1.getSubIndex())
        sibling1.setIndex(trackIndex2)
        sibling1.setSubIndex(subIndex2)
        if not self.__tc.updateTrack(sibling1.getId(), sibling1):
            raise click.ClickException('Update sibling1 failed')
        if not self.__tc.updateTrack(sibling2.getId(), sibling2):
            raise click.ClickException('Update sibling2 failed')
        self.updateTracks()
    def updateTags(self):
        self.tagsTable.clear()
        if self.__pattern is not None:
            # raise click.ClickException(f"patternid={self.__pattern.getId()}") # 1
            tags = self.__tac.findAllMediaTags(self.__pattern.getId())
            #raise click.ClickException(f"tags={tags}") # encoder:blah
            for tagKey, tagValue in tags.items():
                row = (tagKey, tagValue)
                self.tagsTable.add_row(*map(str, row))
@ -236,27 +179,25 @@ class PatternDetailsScreen(Screen):
    def compose(self):
-        self.tagsTable = DataTable(classes="seven")
+        self.tagsTable = DataTable(classes="five")
        # Define the columns with headers
-        self.column_key_tag_key = self.tagsTable.add_column("Key", width=50)
+        self.column_key_tag_key = self.tagsTable.add_column("Key", width=10)
        self.column_key_tag_value = self.tagsTable.add_column("Value", width=100)
        self.tagsTable.cursor_type = 'row'
-        self.tracksTable = DataTable(id="tracks_table", classes="seven")
+        self.tracksTable = DataTable(id="tracks_table", classes="five")
        self.column_key_track_index = self.tracksTable.add_column("Index", width=5)
        self.column_key_track_type = self.tracksTable.add_column("Type", width=10)
-        self.column_key_track_sub_index = self.tracksTable.add_column("SubIndex", width=8)
+        self.column_key_track_sub_index = self.tracksTable.add_column("Subindex", width=5)
        self.column_key_track_codec = self.tracksTable.add_column("Codec", width=10)
        self.column_key_track_audio_layout = self.tracksTable.add_column("Layout", width=10)
        self.column_key_track_language = self.tracksTable.add_column("Language", width=15)
        self.column_key_track_title = self.tracksTable.add_column("Title", width=48)
        self.column_key_track_default = self.tracksTable.add_column("Default", width=8)
        self.column_key_track_forced = self.tracksTable.add_column("Forced", width=8)
        self.column_key_track_source_index = self.tracksTable.add_column("SrcIndex", width=8)
        self.tracksTable.cursor_type = 'row'
@ -267,21 +208,21 @@ class PatternDetailsScreen(Screen):
            # 1
            yield Static("Edit filename pattern" if self.__pattern is not None else "New filename pattern", id="toplabel")
-            yield Input(type="text", id="pattern_input", classes="six")
+            yield Input(type="text", id="pattern_input", classes="four")
            # 2
            yield Static("from show")
-            yield Static("", id="showlabel", classes="five")
+            yield Static("", id="showlabel", classes="three")
            yield Button("Substitute pattern", id="pattern_button")
            # 3
-            yield Static(" ", classes="seven")
+            yield Static(" ", classes="five")
            # 4
-            yield Static(" ", classes="seven")
+            yield Static(" ", classes="five")
            # 5
            yield Static("Media Tags")
-
+            yield Static(" ")
            if self.__pattern is not None:
                yield Button("Add", id="button_add_tag")
@ -291,20 +232,15 @@ class PatternDetailsScreen(Screen):
                yield Static(" ")
                yield Static(" ")
                yield Static(" ")
            yield Static(" ")
            yield Static(" ")
            yield Static(" ")
            # 6
            yield self.tagsTable
            # 7
-            yield Static(" ", classes="seven")
+            yield Static(" ", classes="five")
            # 8
            yield Static("Streams")
-
+            yield Static(" ")
            if self.__pattern is not None:
                yield Button("Add", id="button_add_track")
@ -314,27 +250,22 @@ class PatternDetailsScreen(Screen):
                yield Static(" ")
                yield Static(" ")
                yield Static(" ")
            yield Static(" ")
            yield Button("Up", id="button_track_up")
            yield Button("Down", id="button_track_down")
            # 9
            yield self.tracksTable
            # 10
-            yield Static(" ", classes="seven")
+            yield Static(" ", classes="five")
            # 11
-            yield Static(" ", classes="seven")
+            yield Static(" ", classes="five")
            # 12
            yield Button("Save", id="save_button")
            yield Button("Cancel", id="cancel_button")
-            yield Static(" ", classes="five")
+            yield Static(" ", classes="three")
            # 13
-            yield Static(" ", classes="seven")
+            yield Static(" ", classes="five")
        yield Footer()
@ -456,33 +387,14 @@ class PatternDetailsScreen(Screen):
        if event.button.id == "pattern_button":
            INDICATOR_PATTERN = '([sS][0-9]+[eE][0-9]+)'
            pattern = self.query_one("#pattern_input", Input).value
-            patternMatch = re.search(FileProperties.SE_INDICATOR_PATTERN, pattern)
+            patternMatch = re.search(INDICATOR_PATTERN, pattern)
            if patternMatch:
-                self.query_one("#pattern_input", Input).value = pattern.replace(patternMatch.group(1),
+                self.query_one("#pattern_input", Input).value = pattern.replace(patternMatch.group(1), INDICATOR_PATTERN)
                                                                                FileProperties.SE_INDICATOR_PATTERN)
        if event.button.id == "button_track_up":
            selectedTrackDescriptor = self.getSelectedTrackDescriptor()
            selectedTrackIndex = selectedTrackDescriptor.getIndex()
            if selectedTrackIndex > 0 and selectedTrackIndex < self.tracksTable.row_count:
                correspondingTrackIndex = selectedTrackIndex - 1
                self.swapTracks(selectedTrackIndex, correspondingTrackIndex)
        if event.button.id == "button_track_down":
            selectedTrackDescriptor = self.getSelectedTrackDescriptor()
            selectedTrackIndex = selectedTrackDescriptor.getIndex()
            if selectedTrackIndex >= 0 and selectedTrackIndex < (self.tracksTable.row_count - 1):
                correspondingTrackIndex = selectedTrackIndex + 1
                self.swapTracks(selectedTrackIndex, correspondingTrackIndex)
    def handle_add_track(self, trackDescriptor : TrackDescriptor):
@ -491,14 +403,13 @@ class PatternDetailsScreen(Screen):
        trackType = trackDescriptor.getType()
        index = trackDescriptor.getIndex()
        subIndex = trackDescriptor.getSubIndex()
        codec = trackDescriptor.getCodec()
        language = trackDescriptor.getLanguage()
        title = trackDescriptor.getTitle()
        row = (index,
               trackType.label(),
               subIndex,
-                codec.label(),
+                " ",
                language.label(),
                title,
                'Yes' if TrackDisposition.DEFAULT in dispoSet else 'No',
@ -513,10 +424,7 @@ class PatternDetailsScreen(Screen):
            row_key, col_key = self.tracksTable.coordinate_to_cell_key(self.tracksTable.cursor_coordinate)
-            self.tracksTable.update_cell(row_key, self.column_key_track_audio_layout,
+            self.tracksTable.update_cell(row_key, self.column_key_track_audio_layout, trackDescriptor.getAudioLayout().label())
                                            trackDescriptor.getAudioLayout().label()
                                            if trackDescriptor.getType() == TrackType.AUDIO else ' ')
            self.tracksTable.update_cell(row_key, self.column_key_track_language, trackDescriptor.getLanguage().label())
            self.tracksTable.update_cell(row_key, self.column_key_track_title, trackDescriptor.getTitle())
            self.tracksTable.update_cell(row_key, self.column_key_track_default, 'Yes' if TrackDisposition.DEFAULT in trackDescriptor.getDispositionSet() else 'No')
--- a/bin/ffx/process.py
+++ b/bin/ffx/process.py
@ -0,0 +1,9 @@
 import subprocess
 from typing import List
 def executeProcess(commandSequence: List[str], directory: str = None):
    # process = subprocess.Popen([t.encode('utf-8') for t in commandSequence], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    process = subprocess.Popen(commandSequence, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding='utf-8', cwd = directory)
    output, error = process.communicate()
    # return output.decode('utf-8'), error.decode('utf-8'), process.returncode
    return output, error, process.returncode
--- a/bin/ffx/settings_screen.py
+++ b/bin/ffx/settings_screen.py
@ -1,7 +1,6 @@
-from textual.app import ComposeResult
+from textual.app import App, ComposeResult
 from textual.screen import Screen
-from textual.widgets import Footer, Placeholder
+from textual.widgets import Header, Footer, Placeholder, Label
 class SettingsScreen(Screen):
    def __init__(self):
--- a/bin/ffx/show_controller.py
+++ b/bin/ffx/show_controller.py
--- a/bin/ffx/show_delete_screen.py
+++ b/bin/ffx/show_delete_screen.py
--- a/bin/ffx/show_descriptor.py
+++ b/bin/ffx/show_descriptor.py
@ -32,8 +32,7 @@ class ShowDescriptor():
            self.__logger = self.__context['logger']
        else:
            self.__context = {}
-            self.__logger = logging.getLogger('FFX')
+            self.__logger = logging.getLogger('FFX').addHandler(logging.NullHandler())
            self.__logger.addHandler(logging.NullHandler())       
        if ShowDescriptor.ID_KEY in kwargs.keys():
                if type(kwargs[ShowDescriptor.ID_KEY]) is not int:
--- a/bin/ffx/show_details_screen.py
+++ b/bin/ffx/show_details_screen.py
@ -1,10 +1,13 @@
 import click
 from datetime import datetime
 from textual.screen import Screen
 from textual.widgets import Header, Footer, Static, Button, DataTable, Input
 from textual.containers import Grid
 from textual.widgets._data_table import CellDoesNotExist
 from ffx.model.show import Show
 from ffx.model.pattern import Pattern
 from .pattern_details_screen import PatternDetailsScreen
@ -13,15 +16,9 @@ from .pattern_delete_screen import PatternDeleteScreen
 from .show_controller import ShowController
 from .pattern_controller import PatternController
 from .tmdb_controller import TmdbController
 from .shifted_season_controller import ShiftedSeasonController
 from .show_descriptor import ShowDescriptor
 from .shifted_season_details_screen import ShiftedSeasonDetailsScreen
 from .shifted_season_delete_screen import ShiftedSeasonDeleteScreen
 from ffx.model.shifted_season import ShiftedSeason
 from .helper import filterFilename
@ -31,8 +28,8 @@ class ShowDetailsScreen(Screen):
    CSS = """
    Grid {
-        grid-size: 5 16;
+        grid-size: 5 14;
-        grid-rows: 2 2 2 2 2 2 2 2 2 2 2 9 2 9 2 2;
+        grid-rows: 2 2 2 2 2 2 2 2 2 2 2 6 2 2;
        grid-columns: 30 30 30 30 30;
        height: 100%;
        width: 100%;
@ -45,20 +42,9 @@ class ShowDetailsScreen(Screen):
    Button {
        border: none;
    }
    DataTable {
        column-span: 2;
-        min-height: 8;
+        min-height: 5;
    }
    DataTable .datatable--cursor {
        background: darkorange;
        color: black;
    }
    DataTable .datatable--header {
        background: steelblue;
        color: white;
    }
    #toplabel {
@ -100,7 +86,6 @@ class ShowDetailsScreen(Screen):
        self.__sc = ShowController(context = self.context)
        self.__pc = PatternController(context = self.context)
        self.__tc = TmdbController()
        self.__ssc = ShiftedSeasonController(context = self.context)
        self.__showDescriptor = self.__sc.getShowDescriptor(showId) if showId is not None else None
@ -119,43 +104,11 @@ class ShowDetailsScreen(Screen):
            s.close()
    def updateShiftedSeasons(self):
        self.shiftedSeasonsTable.clear()
        if not self.__showDescriptor is None:
            showId = int(self.__showDescriptor.getId())
            shiftedSeason: ShiftedSeason
            for shiftedSeason in self.__ssc.getShiftedSeasonSiblings(showId=showId):
                shiftedSeasonObj = shiftedSeason.getObj()
                firstEpisode = shiftedSeasonObj['first_episode']
                firstEpisodeStr = str(firstEpisode) if firstEpisode != -1 else ''
                lastEpisode = shiftedSeasonObj['last_episode']
                lastEpisodeStr = str(lastEpisode) if lastEpisode != -1 else ''
                row = (shiftedSeasonObj['original_season'],
                        firstEpisodeStr,
                        lastEpisodeStr,
                        shiftedSeasonObj['season_offset'],
                        shiftedSeasonObj['episode_offset'])
                self.shiftedSeasonsTable.add_row(*map(str, row))
    def on_mount(self):
-        if self.__showDescriptor is not None:
+        if not self.__showDescriptor is None:
            showId = int(self.__showDescriptor.getId())
-            self.query_one("#id_static", Static).update(str(showId))
+            self.query_one("#id_static", Static).update(str(self.__showDescriptor.getId()))
            self.query_one("#name_input", Input).value = str(self.__showDescriptor.getName())
            self.query_one("#year_input", Input).value = str(self.__showDescriptor.getYear())
@ -164,7 +117,7 @@ class ShowDetailsScreen(Screen):
            self.query_one("#indicator_season_digits_input", Input).value = str(self.__showDescriptor.getIndicatorSeasonDigits())
            self.query_one("#indicator_episode_digits_input", Input).value = str(self.__showDescriptor.getIndicatorEpisodeDigits())
-            
+            showId = int(self.__showDescriptor.getId())
            #raise click.ClickException(f"show_id {showId}")
            patternList = self.loadPatterns(showId)
            # raise click.ClickException(f"patternList {patternList}")
@ -172,8 +125,6 @@ class ShowDetailsScreen(Screen):
                row = (pattern['pattern'],)
                self.patternTable.add_row(*map(str, row))
            self.updateShiftedSeasons()
        else:
            self.query_one("#index_season_digits_input", Input).value = "2"
@ -204,46 +155,12 @@ class ShowDetailsScreen(Screen):
        return selectedPattern
    def getSelectedShiftedSeasonObjFromInput(self):
        shiftedSeasonObj = {}
        try:
            # Fetch the currently selected row when 'Enter' is pressed
            #selected_row_index = self.table.cursor_row
            row_key, col_key = self.shiftedSeasonsTable.coordinate_to_cell_key(self.shiftedSeasonsTable.cursor_coordinate)
            if row_key is not None:
                selected_row_data = self.shiftedSeasonsTable.get_row(row_key)
                shiftedSeasonObj['original_season'] = int(selected_row_data[0])
                shiftedSeasonObj['first_episode'] = int(selected_row_data[1]) if selected_row_data[1].isnumeric() else -1
                shiftedSeasonObj['last_episode'] = int(selected_row_data[2]) if selected_row_data[2].isnumeric() else -1
                shiftedSeasonObj['season_offset'] = int(selected_row_data[3]) if selected_row_data[3].isnumeric() else 0
                shiftedSeasonObj['episode_offset'] = int(selected_row_data[4]) if selected_row_data[4].isnumeric() else 0
                if self.__showDescriptor is not None:
                    showId = int(self.__showDescriptor.getId())
                    shiftedSeasonId = self.__ssc.findShiftedSeason(showId,
                                                                    originalSeason=shiftedSeasonObj['original_season'],
                                                                    firstEpisode=shiftedSeasonObj['first_episode'],
                                                                    lastEpisode=shiftedSeasonObj['last_episode'])
                    if shiftedSeasonId is not None:
                        shiftedSeasonObj['id'] = shiftedSeasonId
        except CellDoesNotExist:
            pass
        return shiftedSeasonObj
    def action_add_pattern(self):
        if not self.__showDescriptor is None:
-            self.app.push_screen(PatternDetailsScreen(showId = self.__showDescriptor.getId()), self.handle_add_pattern)
+            self.app.push_screen(PatternDetailsScreen(showId = self.__showDescriptor.getId()), self.handle_add_pattern) # <-
    def handle_add_pattern(self, screenResult):
@ -291,7 +208,7 @@ class ShowDetailsScreen(Screen):
            self.app.push_screen(PatternDeleteScreen(patternId = selectedPatternId, showId = self.__showDescriptor.getId()), self.handle_remove_pattern)
-    def handle_remove_pattern(self, pattern):
+    def handle_remove_pattern(self, screenResult):
        try:
            row_key, col_key = self.patternTable.coordinate_to_cell_key(self.patternTable.cursor_coordinate)
@ -311,18 +228,6 @@ class ShowDetailsScreen(Screen):
        self.patternTable.cursor_type = 'row'
        self.shiftedSeasonsTable = DataTable(classes="five")
        self.column_key_original_season = self.shiftedSeasonsTable.add_column("Original Season", width=30)
        self.column_key_first_episode = self.shiftedSeasonsTable.add_column("First Episode", width=30)
        self.column_key_last_episode = self.shiftedSeasonsTable.add_column("Last Episode", width=30)
        self.column_key_season_offset = self.shiftedSeasonsTable.add_column("Season Offset", width=30)
        self.column_key_episode_offset = self.shiftedSeasonsTable.add_column("Episode Offset", width=30)
        self.shiftedSeasonsTable.cursor_type = 'row'
        yield Header()
        with Grid():
@ -370,29 +275,14 @@ class ShowDetailsScreen(Screen):
            yield Static(" ", classes="five")
            # 11
            yield Static("Shifted seasons", classes="two")
            if self.__showDescriptor is not None:
                yield Button("Add", id="button_add_shifted_season")
                yield Button("Edit", id="button_edit_shifted_season")
                yield Button("Delete", id="button_delete_shifted_season")
            else:
                yield Static(" ")
                yield Static(" ")
                yield Static(" ")
            # 12
            yield self.shiftedSeasonsTable
            # 13
            yield Static("File patterns", classes="five")
-            # 14
+            # 12
            yield self.patternTable
-            # 15
+            # 13
            yield Static(" ", classes="five")
-            # 16
+            # 14
            yield Button("Save", id="save_button")
            yield Button("Cancel", id="cancel_button")
@ -400,7 +290,7 @@ class ShowDetailsScreen(Screen):
        yield Footer()
-    def getShowDescriptorFromInput(self) -> ShowDescriptor:
+    def getShowDescriptorFromInput(self):
        kwargs = {}
@ -464,29 +354,8 @@ class ShowDetailsScreen(Screen):
            showDescriptor = self.getShowDescriptorFromInput()
            if not showDescriptor is None:
-                showName, showYear = self.__tc.getShowNameAndYear(showDescriptor.getId())
+                showResult = self.__tc.queryShow(showDescriptor.getId())
-
+                firstAirDate = datetime.strptime(showResult['first_air_date'], '%Y-%m-%d')
                self.query_one("#name_input", Input).value = filterFilename(showName)
                self.query_one("#year_input", Input).value = str(showYear)
        if event.button.id == "button_add_shifted_season":
            if not self.__showDescriptor is None:
                self.app.push_screen(ShiftedSeasonDetailsScreen(showId = self.__showDescriptor.getId()), self.handle_update_shifted_season)
        if event.button.id == "button_edit_shifted_season":
            selectedShiftedSeasonObj = self.getSelectedShiftedSeasonObjFromInput()
            if 'id' in selectedShiftedSeasonObj.keys():
                self.app.push_screen(ShiftedSeasonDetailsScreen(showId = self.__showDescriptor.getId(), shiftedSeasonId=selectedShiftedSeasonObj['id']), self.handle_update_shifted_season)
        if event.button.id == "button_delete_shifted_season":
            selectedShiftedSeasonObj = self.getSelectedShiftedSeasonObjFromInput()
            if 'id' in selectedShiftedSeasonObj.keys():
                self.app.push_screen(ShiftedSeasonDeleteScreen(showId = self.__showDescriptor.getId(), shiftedSeasonId=selectedShiftedSeasonObj['id']), self.handle_delete_shifted_season)
    def handle_update_shifted_season(self, screenResult):
        self.updateShiftedSeasons()
-    def handle_delete_shifted_season(self, screenResult):
+                self.query_one("#name_input", Input).value = filterFilename(showResult['name'])
-        self.updateShiftedSeasons()
+                self.query_one("#year_input", Input).value = str(firstAirDate.year)
--- a/bin/ffx/shows_screen.py
+++ b/bin/ffx/shows_screen.py
@ -1,7 +1,11 @@
 import click
 from textual.screen import Screen
-from textual.widgets import Header, Footer, Static, DataTable
+from textual.widgets import Header, Footer, Placeholder, Label, ListView, ListItem, Static, DataTable, Button
 from textual.containers import Grid
 from ffx.model.show import Show
 from .show_controller import ShowController
 from .show_details_screen import ShowDetailsScreen
@ -9,6 +13,8 @@ from .show_delete_screen import ShowDeleteScreen
 from ffx.show_descriptor import ShowDescriptor
 from .help_screen import HelpScreen
 from textual.widgets._data_table import CellDoesNotExist
@ -24,16 +30,6 @@ class ShowsScreen(Screen):
        padding: 1;
    }
    DataTable .datatable--cursor {
        background: darkorange;
        color: black;
    }
    DataTable .datatable--header {
        background: steelblue;
        color: white;
    }
    #top {
        height: 1;
    }
--- a/bin/ffx/tag_controller.py
+++ b/bin/ffx/tag_controller.py
--- a/bin/ffx/tag_delete_screen.py
+++ b/bin/ffx/tag_delete_screen.py
--- a/bin/ffx/tag_details_screen.py
+++ b/bin/ffx/tag_details_screen.py
@ -30,21 +30,10 @@ class TagDetailsScreen(Screen):
    Select {
        border: none;
    }
    DataTable {
        min-height: 6;
    }
    DataTable .datatable--cursor {
        background: darkorange;
        color: black;
    }
    DataTable .datatable--header {
        background: steelblue;
        color: white;
    }
    #toplabel {
        height: 1;
    }
--- a/bin/ffx/test/_basename_combinator_1.py
+++ b/bin/ffx/test/_basename_combinator_1.py
--- a/bin/ffx/test/basename_combinator.py
+++ b/bin/ffx/test/basename_combinator.py
--- a/bin/ffx/test/basename_combinator_0.py
+++ b/bin/ffx/test/basename_combinator_0.py
--- a/bin/ffx/test/basename_combinator_2.py
+++ b/bin/ffx/test/basename_combinator_2.py
--- a/bin/ffx/test/combinator.py
+++ b/bin/ffx/test/combinator.py
--- a/bin/ffx/test/disposition_combinator_2.py
+++ b/bin/ffx/test/disposition_combinator_2.py
--- a/bin/ffx/test/disposition_combinator_2_0.py
+++ b/bin/ffx/test/disposition_combinator_2_0.py
--- a/bin/ffx/test/disposition_combinator_2_1.py
+++ b/bin/ffx/test/disposition_combinator_2_1.py
@ -0,0 +1,114 @@
 import os, sys, importlib, glob, inspect
 from ffx.track_disposition import TrackDisposition
 from .disposition_combinator_2 import DispositionCombinator2
 class DispositionCombinator21(DispositionCombinator2):
    VARIANT = 'D10'
    def __init__(self, context = None,
                    createPresets: bool = False):
        super().__init__(context)
        self.__createPresets = createPresets
    def getVariant(self):
        return DispositionCombinator21.VARIANT
    def getPayload(self):
        if self.__createPresets:
            subtrack0 = set()
            subtrack1 = set([TrackDisposition.DEFAULT])
        else:
            subtrack0 = set([TrackDisposition.DEFAULT])
            subtrack1 = set()
        #NOTE: Current ffmpeg version will not set most of the dispositions on arbitrary tracks
        # so some checks for preserved dispositions are omitted for now
        if self.__createPresets:
            # subtrack0.add(TrackDisposition.COMMENT) # COMMENT
            subtrack1.add(TrackDisposition.FORCED) # DESCRIPTIONS
        return (subtrack0,
                subtrack1)
    def createAssertFunc(self):
        if self.__createPresets:
            if self._context['use_jellyfin']:
                def f(assertObj: dict):                        
                        if not 'tracks' in assertObj.keys():
                            raise KeyError("assertObj does not contain key 'tracks'")
                        trackDescriptors = assertObj['tracks']
                        # source subIndex 1
                        assert not (trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
                        assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.FORCED)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set 'forced' disposition"
                        # source subIndex 0
                        assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not set default disposition"
                        # assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.COMMENT)
                        # ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved set 'comment' disposition"
            else:
                def f(assertObj: dict):
                        if not 'tracks' in assertObj.keys():
                            raise KeyError("assertObj does not contain key 'tracks'")
                        trackDescriptors = assertObj['tracks']
                        # source subIndex 0
                        assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not set default disposition"
                        # assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT)
                        # ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set 'comment' disposition"
                        # source subIndex 1
                        assert not (trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
                        assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.FORCED)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved set 'forced' disposition"
        else:
            if self._context['use_jellyfin']:
                def f(assertObj: dict):                        
                        if not 'tracks' in assertObj.keys():
                            raise KeyError("assertObj does not contain key 'tracks'")
                        trackDescriptors = assertObj['tracks']
                        # source subIndex 1
                        assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
                        # source subIndex 0
                        assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not set default disposition"
            else:
                def f(assertObj: dict):
                        if not 'tracks' in assertObj.keys():
                            raise KeyError("assertObj does not contain key 'tracks'")
                        trackDescriptors = assertObj['tracks']
                        # source subIndex 0
                        assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not set default disposition"
                        # source subIndex 1
                        assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
        return f
    def shouldFail(self):
        return False
--- a/bin/ffx/test/disposition_combinator_2_2.py
+++ b/bin/ffx/test/disposition_combinator_2_2.py
--- a/bin/ffx/test/disposition_combinator_2_3
+++ b/bin/ffx/test/disposition_combinator_2_3
--- a/bin/ffx/test/disposition_combinator_3.py
+++ b/bin/ffx/test/disposition_combinator_3.py
--- a/bin/ffx/test/disposition_combinator_3_0.py
+++ b/bin/ffx/test/disposition_combinator_3_0.py
--- a/bin/ffx/test/disposition_combinator_3_1.py
+++ b/bin/ffx/test/disposition_combinator_3_1.py
@ -0,0 +1,147 @@
 import os, sys, importlib, glob, inspect
 from ffx.track_disposition import TrackDisposition
 from .disposition_combinator_3 import DispositionCombinator3
 class DispositionCombinator31(DispositionCombinator3):
    VARIANT = 'D100'
    def __init__(self, context = None,
                    createPresets: bool = False):
        super().__init__(context)
        self.__createPresets = createPresets
    def getVariant(self):
        return DispositionCombinator31.VARIANT
    def getPayload(self):
        if self.__createPresets:
            subtrack0 = set()
            subtrack1 = set()
            subtrack2 = set([TrackDisposition.DEFAULT])
        else:
            subtrack0 = set([TrackDisposition.DEFAULT])
            subtrack1 = set()
            subtrack2 = set()
        #NOTE: Current ffmpeg version will not set most of the dispositions on arbitrary tracks
        # so some checks for preserved dispositions are omitted for now
        if self.__createPresets:
            # subtrack0.add(TrackDisposition.COMMENT) # COMMENT
            subtrack1.add(TrackDisposition.FORCED) # DESCRIPTIONS
            # subtrack2.add(TrackDisposition.HEARING_IMPAIRED) # HEARING_IMPAIRED
        return (subtrack0,
                subtrack1,
                subtrack2)
    def createAssertFunc(self):
        if self.__createPresets:
            if self._context['use_jellyfin']:
                def f(assertObj: dict):
                        if not 'tracks' in assertObj.keys():
                            raise KeyError("assertObj does not contain key 'tracks'")
                        trackDescriptors = assertObj['tracks']
                        # source subIndex 1
                        assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
                        assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.FORCED)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved descriptions disposition"
                        # source subIndex 2
                        assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
                        # assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED)
                        # ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved default disposition"
                        # source subIndex 0
                        assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not set default disposition"
                        # assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.COMMENT)
                        # ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved set default disposition"
            else:
                def f(assertObj: dict):
                        if not 'tracks' in assertObj.keys():
                            raise KeyError("assertObj does not contain key 'tracks'")
                        trackDescriptors = assertObj['tracks']
                        # source subIndex 0
                        assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not set default disposition"
                        # assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT)
                        # ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved default disposition"
                        # source subIndex 1
                        assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
                        assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.FORCED)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved default disposition"
                        # source subIndex 2
                        assert (not trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has set default disposition"
                        # assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED)
                        # ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved default disposition"
        else:
            if self._context['use_jellyfin']:
                def f(assertObj: dict):
                        if not 'tracks' in assertObj.keys():
                            raise KeyError("assertObj does not contain key 'tracks'")
                        trackDescriptors = assertObj['tracks']
                        # source subIndex 1
                        assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
                        # source subIndex 2
                        assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
                        # source subIndex 0
                        assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not set default disposition"
            else:
                def f(assertObj: dict):
                        if not 'tracks' in assertObj.keys():
                            raise KeyError("assertObj does not contain key 'tracks'")
                        trackDescriptors = assertObj['tracks']
                        # source subIndex 0
                        assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not set default disposition"
                        # source subIndex 1
                        assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
                        # source subIndex 2
                        assert (not trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has set default disposition"
        return f
    def shouldFail(self):
        return False
--- a/bin/ffx/test/disposition_combinator_3_2.py
+++ b/bin/ffx/test/disposition_combinator_3_2.py
@ -0,0 +1,132 @@
 import os, sys, importlib, glob, inspect
 from ffx.track_disposition import TrackDisposition
 from .disposition_combinator_3 import DispositionCombinator3
 class DispositionCombinator32(DispositionCombinator3):
    VARIANT = 'D010'
    def __init__(self, context = None,
                    createPresets: bool = False):
        super().__init__(context)
        self.__createPresets = createPresets
    def getVariant(self):
        return DispositionCombinator32.VARIANT
    def getPayload(self):
        if self.__createPresets:
            subtrack0 = set([TrackDisposition.DEFAULT])
            subtrack1 = set()
            subtrack2 = set()
        else:
            subtrack0 = set()
            subtrack1 = set([TrackDisposition.DEFAULT])
            subtrack2 = set()
        #NOTE: Current ffmpeg version will not set most of the dispositions on arbitrary tracks
        # so some checks for preserved dispositions are omitted for now
        if self.__createPresets:
            # subtrack0.add(TrackDisposition.COMMENT) # COMMENT
            # subtrack1.add(TrackDisposition.DESCRIPTIONS) # DESCRIPTIONS
            subtrack2.add(TrackDisposition.FORCED) # HEARING_IMPAIRED
        return (subtrack0,
                subtrack1,
                subtrack2)
    def createAssertFunc(self):
        if self.__createPresets:
            if self._context['use_jellyfin']:
                def f(assertObj: dict):                        
                        if not 'tracks' in assertObj.keys():
                            raise KeyError("assertObj does not contain key 'tracks'")
                        trackDescriptors = assertObj['tracks']
                        # source subIndex 0
                        assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
                        # assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT)
                        # ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set default disposition"
                        # source subIndex 2
                        assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
                        assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.FORCED)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved default disposition"
                        # source subIndex 1
                        assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not set default disposition"
                        # assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DESCRIPTIONS)
                        # ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved descriptions disposition"
            else:
                def f(assertObj: dict):
                        if not 'tracks' in assertObj.keys():
                            raise KeyError("assertObj does not contain key 'tracks'")
                        trackDescriptors = assertObj['tracks']
                        # source subIndex 0
                        assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
                        # assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT)
                        # ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set default disposition"
                        # source subIndex 1
                        assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not set default disposition"
                        # assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DESCRIPTIONS)
                        # ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved descriptions disposition"
                        # source subIndex 2
                        assert (not trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has set default disposition"
                        assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.FORCED)
                        ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved default disposition"
        else:
            if self._context['use_jellyfin']:
                def f(assertObj: dict):                        
                        if not 'tracks' in assertObj.keys():
                            raise KeyError("assertObj does not contain key 'tracks'")
                        trackDescriptors = assertObj['tracks']
                        # source subIndex 0
                        assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
                        # source subIndex 2
                        assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
                        # source subIndex 1
                        assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not set default disposition"
            else:
                def f(assertObj: dict):
                        if not 'tracks' in assertObj.keys():
                            raise KeyError("assertObj does not contain key 'tracks'")
                        trackDescriptors = assertObj['tracks']
                        # source subIndex 0
                        assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
                        # source subIndex 1
                        assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not set default disposition"
                        # source subIndex 2
                        assert (not trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has set default disposition"
        return f
    def shouldFail(self):
        return False
--- a/bin/ffx/test/disposition_combinator_3_3.py
+++ b/bin/ffx/test/disposition_combinator_3_3.py
@ -0,0 +1,132 @@
 import os, sys, importlib, glob, inspect
 from ffx.track_disposition import TrackDisposition
 from .disposition_combinator_3 import DispositionCombinator3
 class DispositionCombinator33(DispositionCombinator3):
    VARIANT = 'D001'
    def __init__(self, context = None,
                    createPresets: bool = False):
        super().__init__(context)
        self.__createPresets = createPresets
    def getVariant(self):
        return DispositionCombinator33.VARIANT
    def getPayload(self):
        if self.__createPresets:
            subtrack0 = set()
            subtrack1 = set([TrackDisposition.DEFAULT])
            subtrack2 = set()
        else:
            subtrack0 = set()
            subtrack1 = set()
            subtrack2 = set([TrackDisposition.DEFAULT])
        #NOTE: Current ffmpeg version will not set most of the dispositions on arbitrary tracks
        # so some checks for preserved dispositions are omitted for now
        if self.__createPresets:
            # subtrack0.add(TrackDisposition.COMMENT) # COMMENT
            subtrack1.add(TrackDisposition.FORCED) # DESCRIPTIONS
            # subtrack2.add(TrackDisposition.HEARING_IMPAIRED) # HEARING_IMPAIRED
        return (subtrack0,
                subtrack1,
                subtrack2)
    def createAssertFunc(self):
        if self.__createPresets:
            if self._context['use_jellyfin']:
                def f(assertObj: dict):                        
                        if not 'tracks' in assertObj.keys():
                            raise KeyError("assertObj does not contain key 'tracks'")
                        trackDescriptors = assertObj['tracks']
                        # source subIndex 0
                        assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
                        # assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT)
                        # ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set default disposition"
                        # source subIndex 2
                        assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
                        # assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED)
                        # ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved default disposition"
                        # source subIndex 1
                        assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not set default disposition"
                        assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.FORCED)
                        ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved descriptions disposition"
            else:
                def f(assertObj: dict):
                        if not 'tracks' in assertObj.keys():
                            raise KeyError("assertObj does not contain key 'tracks'")
                        trackDescriptors = assertObj['tracks']
                        # source subIndex 0
                        assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
                        # assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT)
                        # ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set default disposition"
                        # source subIndex 1
                        assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
                        assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.FORCED)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved descriptions disposition"
                        # source subIndex 2
                        assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not set default disposition"
                        # assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED)
                        # ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved default disposition"
        else:
            if self._context['use_jellyfin']:
                def f(assertObj: dict):                        
                        if not 'tracks' in assertObj.keys():
                            raise KeyError("assertObj does not contain key 'tracks'")
                        trackDescriptors = assertObj['tracks']
                        # source subIndex 0
                        assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
                        # source subIndex 2
                        assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
                        # source subIndex 1
                        assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not set default disposition"
            else:
                def f(assertObj: dict):
                        if not 'tracks' in assertObj.keys():
                            raise KeyError("assertObj does not contain key 'tracks'")
                        trackDescriptors = assertObj['tracks']
                        # source subIndex 0
                        assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
                        # source subIndex 1
                        assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
                        # source subIndex 2
                        assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
                        ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not set default disposition"
        return f
    def shouldFail(self):
        return False
--- a/bin/ffx/test/disposition_combinator_3_4.py
+++ b/bin/ffx/test/disposition_combinator_3_4.py
--- a/bin/ffx/test/helper.py
+++ b/bin/ffx/test/helper.py
@ -9,7 +9,6 @@ from ffx.media_descriptor import MediaDescriptor
 from ffx.track_type import TrackType
 from ffx.helper import dictCache
 from ffx.configuration_controller import ConfigurationController
 SHORT_SUBTITLE_SEQUENCE = [{'start': 1, 'end': 2, 'text': 'yolo'},
@ -231,8 +230,7 @@ def createMediaTestFile(mediaDescriptor: MediaDescriptor,
                                    f"{mediaTagKey}={mediaTagValue}"]
            subIndexCounter[trackType] += 1
-    #TODO: Optimize too many runs
+    ffxContext = {'logger': logger}
    ffxContext = {'config': ConfigurationController(), 'logger': logger}
    fc = FfxController(ffxContext, mediaDescriptor)
    commandTokens += (generatorTokens
@ -257,9 +255,10 @@ def createMediaTestFile(mediaDescriptor: MediaDescriptor,
    commandTokens += [outputPath]
-    ctx = {'logger': logger}
+    if not logger is None:
        logger.debug(f"createMediaTestFile(): Command sequence: {commandTokens}")
-    out, err, rc = executeProcess(commandTokens, context = ctx)
+    out, err, rc = executeProcess(commandTokens)
    if not logger is None:
        if out:
--- a/bin/ffx/test/indicator_combinator.py
+++ b/bin/ffx/test/indicator_combinator.py
--- a/bin/ffx/test/jellyfin_combinator.py
+++ b/bin/ffx/test/jellyfin_combinator.py
@ -0,0 +1,33 @@
 import os, sys, importlib, glob, inspect, itertools
 class JellyfinCombinator():
    IDENTIFIER = 'jellyfin'
    def __init__(self, context = None):
        self._context = context
        self._logger = context['logger']
        self._reportLogger = context['report_logger']
    def getIdentifier(self):
        return JellyfinCombinator.IDENTIFIER
    @staticmethod    
    def list():
        basePath = os.path.dirname(__file__)
        return [os.path.basename(p)[20:-3]
                for p
                in glob.glob(f"{ basePath }/jellyfin_combinator_*.py", recursive = True)
                if p != __file__]
    @staticmethod
    def getClassReference(identifier):
        importlib.import_module(f"ffx.test.jellyfin_combinator_{ identifier }")
        for name, obj in inspect.getmembers(sys.modules[f"ffx.test.jellyfin_combinator_{ identifier }"]):
            #HINT: Excluding MediaCombinator as it seems to be included by import (?)
            if inspect.isclass(obj) and name != 'JellyfinCombinator' and name.startswith('JellyfinCombinator'):
                return obj
    @staticmethod
    def getAllClassReferences():
        return [JellyfinCombinator.getClassReference(i) for i in JellyfinCombinator.list()]
--- a/bin/ffx/test/jellyfin_combinator_0.py
+++ b/bin/ffx/test/jellyfin_combinator_0.py
@ -0,0 +1,34 @@
 import os, sys, importlib, glob, inspect, itertools
 from ffx.track_type import TrackType
 from ffx.track_descriptor import TrackDescriptor
 from ffx.media_descriptor import MediaDescriptor
 from .jellyfin_combinator import JellyfinCombinator
 class JellyfinCombinator0(JellyfinCombinator):
    VARIANT = 'J0'
    # def __init__(self, SubCombinators: dict = {}, context = None):
    def __init__(self, context = None):
        self._context = context
        self._logger = context['logger']
        self._reportLogger = context['report_logger']
        # self._SubCombinators = SubCombinators
    def getVariant(self):
        return JellyfinCombinator0.VARIANT
    def getPayload(self):
        return False
    def assertFunc(self, testObj = {}):
        pass
    def shouldFail(self):
        return False
--- a/bin/ffx/test/jellyfin_combinator_1.py
+++ b/bin/ffx/test/jellyfin_combinator_1.py
@ -0,0 +1,34 @@
 import os, sys, importlib, glob, inspect, itertools
 from ffx.track_type import TrackType
 from ffx.track_descriptor import TrackDescriptor
 from ffx.media_descriptor import MediaDescriptor
 from .jellyfin_combinator import JellyfinCombinator
 class JellyfinCombinator1(JellyfinCombinator):
    VARIANT = 'J1'
    # def __init__(self, SubCombinators: dict = {}, context = None):
    def __init__(self, context = None):
        self._context = context
        self._logger = context['logger']
        self._reportLogger = context['report_logger']
        # self._SubCombinators = SubCombinations
    def getVariant(self):
        return JellyfinCombinator1.VARIANT
    def getPayload(self):
        return True
    def assertFunc(self, testObj = {}):
        pass
    def shouldFail(self):
        return False
--- a/bin/ffx/test/label_combinator.py
+++ b/bin/ffx/test/label_combinator.py
--- a/bin/ffx/test/label_combinator_0.py
+++ b/bin/ffx/test/label_combinator_0.py
--- a/bin/ffx/test/label_combinator_1.py
+++ b/bin/ffx/test/label_combinator_1.py
--- a/bin/ffx/test/media_combinator.py
+++ b/bin/ffx/test/media_combinator.py
--- a/bin/ffx/test/media_combinator_0.py
+++ b/bin/ffx/test/media_combinator_0.py
@ -6,6 +6,7 @@ from ffx.track_descriptor import TrackDescriptor
 from ffx.media_descriptor import MediaDescriptor
 from .media_combinator import MediaCombinator
 from .jellyfin_combinator import JellyfinCombinator
 from .media_tag_combinator import MediaTagCombinator
--- a/bin/ffx/test/media_combinator_1.py
+++ b/bin/ffx/test/media_combinator_1.py
@ -6,6 +6,7 @@ from ffx.track_descriptor import TrackDescriptor
 from ffx.media_descriptor import MediaDescriptor
 from .media_combinator import MediaCombinator
 from .jellyfin_combinator import JellyfinCombinator
 from .media_tag_combinator import MediaTagCombinator
--- a/bin/ffx/test/media_combinator_2.py
+++ b/bin/ffx/test/media_combinator_2.py
@ -0,0 +1,166 @@
 import os, sys, importlib, glob, inspect, itertools, click
 from ffx.track_type import TrackType
 from ffx.track_descriptor import TrackDescriptor
 from ffx.media_descriptor import MediaDescriptor
 from .media_combinator import MediaCombinator
 from .disposition_combinator_2 import DispositionCombinator2
 from .track_tag_combinator_2 import TrackTagCombinator2
 from .jellyfin_combinator import JellyfinCombinator
 from .media_tag_combinator import MediaTagCombinator
 class MediaCombinator2(MediaCombinator):
    VARIANT = 'VASS'
    def __init__(self, context = None,
                    createPresets: bool = False):
        super().__init__(context)
        self.__createPresets = createPresets
    def getVariant(self):
        return MediaCombinator2.VARIANT
    def getPayload(self,
                    subtitleDispositionTuple = (set(), set()),
                    subtitleTagTuple = ({}, {})):
        kwargs = {}
        kwargs[TrackDescriptor.CONTEXT_KEY] = self._context
        kwargs[TrackDescriptor.INDEX_KEY] = 0
        kwargs[TrackDescriptor.SOURCE_INDEX_KEY] = 0
        kwargs[TrackDescriptor.TRACK_TYPE_KEY] = TrackType.VIDEO
        kwargs[TrackDescriptor.SUB_INDEX_KEY] = 0
        trackDescriptor0 = TrackDescriptor(**kwargs)
        kwargs = {}
        kwargs[TrackDescriptor.CONTEXT_KEY] = self._context
        kwargs[TrackDescriptor.INDEX_KEY] = 1
        kwargs[TrackDescriptor.SOURCE_INDEX_KEY] = 1
        kwargs[TrackDescriptor.TRACK_TYPE_KEY] = TrackType.AUDIO
        kwargs[TrackDescriptor.SUB_INDEX_KEY] = 0
        trackDescriptor1 = TrackDescriptor(**kwargs)
        kwargs = {}
        kwargs[TrackDescriptor.CONTEXT_KEY] = self._context
        kwargs[TrackDescriptor.INDEX_KEY] = 2
        kwargs[TrackDescriptor.SOURCE_INDEX_KEY] = 2
        kwargs[TrackDescriptor.TRACK_TYPE_KEY] = TrackType.SUBTITLE
        kwargs[TrackDescriptor.SUB_INDEX_KEY] = 0
        kwargs[TrackDescriptor.DISPOSITION_SET_KEY] = subtitleDispositionTuple[0]
        kwargs[TrackDescriptor.TAGS_KEY] = subtitleTagTuple[0]
        trackDescriptor2 = TrackDescriptor(**kwargs)
        kwargs = {}
        kwargs[TrackDescriptor.CONTEXT_KEY] = self._context
        kwargs[TrackDescriptor.INDEX_KEY] = 3
        kwargs[TrackDescriptor.SOURCE_INDEX_KEY] = 3
        kwargs[TrackDescriptor.TRACK_TYPE_KEY] = TrackType.SUBTITLE
        kwargs[TrackDescriptor.SUB_INDEX_KEY] = 1
        kwargs[TrackDescriptor.DISPOSITION_SET_KEY] = subtitleDispositionTuple[1]
        kwargs[TrackDescriptor.TAGS_KEY] = subtitleTagTuple[1]
        trackDescriptor3 = TrackDescriptor(**kwargs)
        kwargs = {}
        kwargs[MediaDescriptor.CONTEXT_KEY] = self._context
        kwargs[MediaDescriptor.TRACK_DESCRIPTOR_LIST_KEY] =  [trackDescriptor0,
                trackDescriptor1,
                trackDescriptor2,
                trackDescriptor3]
        mediaDescriptor = MediaDescriptor(**kwargs)
        # mediaDescriptor.reindexSubIndices()
        return mediaDescriptor
    def assertFunc(self, testObj = {}):
        pass
    def shouldFail(self):
        return False
    def getYield(self):
        for MTC in MediaTagCombinator.getAllClassReferences():
            for DC2 in DispositionCombinator2.getAllClassReferences():
                for TC2 in TrackTagCombinator2.getAllClassReferences():
                    for J in JellyfinCombinator.getAllClassReferences():
                        j = J(self._context)
                        self._context['use_jellyfin'] = j.getPayload()
                        dc2 = DC2(self._context)
                        tc2 = TC2(self._context)
                        mtc = MTC(self._context)
                        yObj = {}
                        yObj['identifier'] = self.getIdentifier()
                        yObj['variants'] = [self.getVariant(),
                                                f"S:{dc2.getVariant()}",
                                                f"S:{tc2.getVariant()}",
                                                mtc.getVariant(),
                                                j.getVariant()]
                        yObj['payload'] = self.getPayload(dc2.getPayload(),
                                                          tc2.getPayload())
                        yObj['assertSelectors'] = ['M', 'SD', 'ST', 'MT', 'J']
                        yObj['assertFuncs'] = [self.assertFunc,
                                                    dc2.createAssertFunc(),
                                                    tc2.createAssertFunc(),
                                                    mtc.createAssertFunc(),
                                                    j.assertFunc]
                        yObj['shouldFail'] = (self.shouldFail()
                                                    | dc2.shouldFail()
                                                    | tc2.shouldFail()
                                                    | mtc.shouldFail()
                                                    | j.shouldFail())
                        yieldObj = {'target': yObj}
                        if self.__createPresets:
                            dc2_p = DC2(self._context, createPresets = True)
                            tc2_p = TC2(self._context, createPresets = True)
                            mtc_p = MTC(self._context, createPresets = True)
                            yObj_p = {}
                            yObj_p['identifier'] = self.getIdentifier()
                            yObj_p['variants'] = [self.getVariant(),
                                                    f"S:{dc2_p.getVariant()}",
                                                    f"S:{tc2_p.getVariant()}",
                                                    mtc_p.getVariant(),
                                                    j.getVariant()]
                            yObj_p['payload'] = self.getPayload(dc2_p.getPayload(),
                                                                tc2_p.getPayload())
                            yObj_p['assertSelectors'] = ['M', 'SD', 'ST', 'MT', 'J']
                            yObj_p['assertFuncs'] = [self.assertFunc,
                                                        dc2_p.createAssertFunc(),
                                                        tc2_p.createAssertFunc(),
                                                        mtc_p.createAssertFunc(),
                                                        j.assertFunc]
                            yObj_p['shouldFail'] = (self.shouldFail()
                                                        | dc2_p.shouldFail()
                                                        | tc2_p.shouldFail()
                                                        | mtc_p.shouldFail()
                                                        | j.shouldFail())
                            yieldObj['preset'] = yObj_p
                        yield yieldObj
--- a/bin/ffx/test/media_combinator_3.py
+++ b/bin/ffx/test/media_combinator_3.py
@ -9,7 +9,7 @@ from .media_combinator import MediaCombinator
 from .disposition_combinator_3 import DispositionCombinator3
 from .track_tag_combinator_3 import TrackTagCombinator3
-from .permutation_combinator_3 import PermutationCombinator3
+from .jellyfin_combinator import JellyfinCombinator
 from .media_tag_combinator import MediaTagCombinator
@ -103,6 +103,10 @@ class MediaCombinator3(MediaCombinator):
        for MTC in MediaTagCombinator.getAllClassReferences():
            for DC3 in DispositionCombinator3.getAllClassReferences():
                for TC3 in TrackTagCombinator3.getAllClassReferences():
                    for J in JellyfinCombinator.getAllClassReferences():
                        j = J(self._context)
                        self._context['use_jellyfin'] = j.getPayload()
                        dc3 = DC3(self._context)
                        tc3 = TC3(self._context)
@ -115,21 +119,24 @@ class MediaCombinator3(MediaCombinator):
                        yObj['variants'] = [self.getVariant(),
                                                f"S:{dc3.getVariant()}",
                                                f"S:{tc3.getVariant()}",
-                                                mtc.getVariant()]
+                                                mtc.getVariant(),
                                                j.getVariant()]
                        yObj['payload'] = self.getPayload(dc3.getPayload(),
                                                            tc3.getPayload())
-                        yObj['assertSelectors'] = ['M', 'SD', 'ST', 'MT']
+                        yObj['assertSelectors'] = ['M', 'SD', 'ST', 'MT', 'J']
                        yObj['assertFuncs'] = [self.assertFunc,
                                                    dc3.createAssertFunc(),
                                                    tc3.createAssertFunc(),
-                                                    mtc.createAssertFunc()]
+                                                    mtc.createAssertFunc(),
                                                    j.assertFunc]
                        yObj['shouldFail'] = (self.shouldFail()
                                                    | dc3.shouldFail()
                                                    | tc3.shouldFail()
-                                                    | mtc.shouldFail())
+                                                    | mtc.shouldFail()
                                                    | j.shouldFail())
                        yieldObj = {'target': yObj}
                        if self.__createPresets:
@ -145,21 +152,24 @@ class MediaCombinator3(MediaCombinator):
                            yObj_p['variants'] = [self.getVariant(),
                                                    f"S:{dc3_p.getVariant()}",
                                                    f"S:{tc3_p.getVariant()}",
-                                                    mtc_p.getVariant()]
+                                                    mtc_p.getVariant(),
                                                    j.getVariant()]
                            yObj_p['payload'] = self.getPayload(dc3_p.getPayload(),
                                                                tc3_p.getPayload())
-                            yObj_p['assertSelectors'] = ['M', 'SD', 'ST', 'MT']
+                            yObj_p['assertSelectors'] = ['M', 'SD', 'ST', 'MT', 'J']
                            yObj_p['assertFuncs'] = [self.assertFunc,
                                                        dc3_p.createAssertFunc(),
                                                        tc3_p.createAssertFunc(),
-                                                        mtc_p.createAssertFunc()]
+                                                        mtc_p.createAssertFunc(),
                                                        j.assertFunc]
                            yObj_p['shouldFail'] = (self.shouldFail()
                                                        | dc3_p.shouldFail()
                                                        | tc3_p.shouldFail()
-                                                        | mtc_p.shouldFail())
+                                                        | mtc_p.shouldFail()
                                                        | j.shouldFail())
                            yieldObj['preset'] = yObj_p
                        yield yieldObj
--- a/bin/ffx/test/media_combinator_4.py
+++ b/bin/ffx/test/media_combinator_4.py
@ -9,7 +9,7 @@ from .media_combinator import MediaCombinator
 from .disposition_combinator_2 import DispositionCombinator2
 from .track_tag_combinator_2 import TrackTagCombinator2
-from .permutation_combinator_2 import PermutationCombinator2
+from .jellyfin_combinator import JellyfinCombinator
 from .media_tag_combinator import MediaTagCombinator
@ -83,6 +83,10 @@ class MediaCombinator4(MediaCombinator):
        for MTC in MediaTagCombinator.getAllClassReferences():
            for DC2 in DispositionCombinator2.getAllClassReferences():
                for TC2 in TrackTagCombinator2.getAllClassReferences():
                    for J in JellyfinCombinator.getAllClassReferences():
                        j = J(self._context)
                        self._context['use_jellyfin'] = j.getPayload()
                        dc2 = DC2(self._context)
                        tc2 = TC2(self._context)
@ -95,21 +99,24 @@ class MediaCombinator4(MediaCombinator):
                        yObj['variants'] = [self.getVariant(),
                                                f"A:{dc2.getVariant()}",
                                                f"A:{tc2.getVariant()}",
-                                                mtc.getVariant()]
+                                                mtc.getVariant(),
                                                j.getVariant()]
                        yObj['payload'] = self.getPayload(dc2.getPayload(),
                                                            tc2.getPayload())
-                        yObj['assertSelectors'] = ['M', 'AD', 'AT', 'MT']
+                        yObj['assertSelectors'] = ['M', 'AD', 'AT', 'MT', 'J']
                        yObj['assertFuncs'] = [self.assertFunc,
                                                    dc2.createAssertFunc(),
                                                    tc2.createAssertFunc(),
-                                                    mtc.createAssertFunc()]
+                                                    mtc.createAssertFunc(),
                                                    j.assertFunc]
                        yObj['shouldFail'] = (self.shouldFail()
                                                | dc2.shouldFail()
                                                | tc2.shouldFail()
-                                                | mtc.shouldFail())
+                                                | mtc.shouldFail()
                                                | j.shouldFail())
                        yieldObj = {'target': yObj}
                        if self.__createPresets:
@ -125,21 +132,24 @@ class MediaCombinator4(MediaCombinator):
                            yObj_p['variants'] = [self.getVariant(),
                                                    f"A:{dc2_p.getVariant()}",
                                                    f"A:{tc2_p.getVariant()}",
-                                                    mtc_p.getVariant()]
+                                                    mtc_p.getVariant(),
                                                    j.getVariant()]
                            yObj_p['payload'] = self.getPayload(dc2_p.getPayload(),
                                                                tc2_p.getPayload())
-                            yObj_p['assertSelectors'] = ['M', 'AD', 'AT', 'MT']
+                            yObj_p['assertSelectors'] = ['M', 'AD', 'AT', 'MT', 'J']
                            yObj_p['assertFuncs'] = [self.assertFunc,
                                                        dc2_p.createAssertFunc(),
                                                        tc2_p.createAssertFunc(),
-                                                        mtc_p.createAssertFunc()]
+                                                        mtc_p.createAssertFunc(),
                                                        j.assertFunc]
                            yObj_p['shouldFail'] = (self.shouldFail()
                                                    | dc2_p.shouldFail()
                                                    | tc2_p.shouldFail()
-                                                    | mtc_p.shouldFail())
+                                                    | mtc_p.shouldFail()
                                                    | j.shouldFail())
                            yieldObj['preset'] = yObj_p
                        yield yieldObj
--- a/bin/ffx/test/media_combinator_5.py
+++ b/bin/ffx/test/media_combinator_5.py
@ -9,7 +9,7 @@ from .media_combinator import MediaCombinator
 from .disposition_combinator_2 import DispositionCombinator2
 from .track_tag_combinator_2 import TrackTagCombinator2
-from .permutation_combinator_2 import PermutationCombinator2
+from .jellyfin_combinator import JellyfinCombinator
 from .media_tag_combinator import MediaTagCombinator
@ -93,6 +93,10 @@ class MediaCombinator5(MediaCombinator):
        for MTC in MediaTagCombinator.getAllClassReferences():
            for DC2 in DispositionCombinator2.getAllClassReferences():
                for TC2 in TrackTagCombinator2.getAllClassReferences():
                    for J in JellyfinCombinator.getAllClassReferences():
                        j = J(self._context)
                        self._context['use_jellyfin'] = j.getPayload()
                        dc2 = DC2(self._context)
                        tc2 = TC2(self._context)
@ -105,21 +109,24 @@ class MediaCombinator5(MediaCombinator):
                        yObj['variants'] = [self.getVariant(),
                                                f"A:{dc2.getVariant()}",
                                                f"A:{tc2.getVariant()}",
-                                                mtc.getVariant()]
+                                                mtc.getVariant(),
                                                j.getVariant()]
                        yObj['payload'] = self.getPayload(dc2.getPayload(),
                                                          tc2.getPayload())
-                        yObj['assertSelectors'] = ['M', 'AD', 'AT', 'MT']
+                        yObj['assertSelectors'] = ['M', 'AD', 'AT', 'MT', 'J']
                        yObj['assertFuncs'] = [self.assertFunc,
                                                    dc2.createAssertFunc(),
                                                    tc2.createAssertFunc(),
-                                                    mtc.createAssertFunc()]
+                                                    mtc.createAssertFunc(),
                                                    j.assertFunc]
                        yObj['shouldFail'] = (self.shouldFail()
                                                    | dc2.shouldFail()
                                                    | tc2.shouldFail()
-                                                    | mtc.shouldFail())
+                                                    | mtc.shouldFail()
                                                    | j.shouldFail())
                        yieldObj = {'target': yObj}
                        if self.__createPresets:
@ -135,21 +142,24 @@ class MediaCombinator5(MediaCombinator):
                            yObj_p['variants'] = [self.getVariant(),
                                                    f"A:{dc2_p.getVariant()}",
                                                    f"A:{tc2_p.getVariant()}",
-                                                    mtc_p.getVariant()]
+                                                    mtc_p.getVariant(),
                                                    j.getVariant()]
                            yObj_p['payload'] = self.getPayload(dc2_p.getPayload(),
                                                                tc2_p.getPayload())
-                            yObj_p['assertSelectors'] = ['M', 'AD', 'AT', 'MT']
+                            yObj_p['assertSelectors'] = ['M', 'AD', 'AT', 'MT', 'J']
                            yObj_p['assertFuncs'] = [self.assertFunc,
                                                        dc2_p.createAssertFunc(),
                                                        tc2_p.createAssertFunc(),
-                                                        mtc_p.createAssertFunc()]
+                                                        mtc_p.createAssertFunc(),
                                                        j.assertFunc]
                            yObj_p['shouldFail'] = (self.shouldFail()
                                                        | dc2_p.shouldFail()
                                                        | tc2_p.shouldFail()
-                                                        | mtc_p.shouldFail())
+                                                        | mtc_p.shouldFail()
                                                        | j.shouldFail())
                            yieldObj['preset'] = yObj_p
                        yield yieldObj
--- a/bin/ffx/test/media_combinator_6.py
+++ b/bin/ffx/test/media_combinator_6.py
@ -9,7 +9,7 @@ from .media_combinator import MediaCombinator
 from .disposition_combinator_2 import DispositionCombinator2
 from .track_tag_combinator_2 import TrackTagCombinator2
-from .permutation_combinator_2 import PermutationCombinator2
+from .jellyfin_combinator import JellyfinCombinator
 from .media_tag_combinator import MediaTagCombinator
@ -109,7 +109,11 @@ class MediaCombinator6(MediaCombinator):
                for TC2_A in TrackTagCombinator2.getAllClassReferences():
                    for DC2_S in DispositionCombinator2.getAllClassReferences():
                        for TC2_S in TrackTagCombinator2.getAllClassReferences():
-
+                            for J in JellyfinCombinator.getAllClassReferences():
                                j = J(self._context)
                                self._context['use_jellyfin'] = j.getPayload()
                                dc2a = DC2_A(self._context)
                                tc2a = TC2_A(self._context)
                                dc2s = DC2_S(self._context)
@ -125,27 +129,30 @@ class MediaCombinator6(MediaCombinator):
                                                        f"A:{tc2a.getVariant()}",
                                                        f"S:{dc2s.getVariant()}",
                                                        f"S:{tc2s.getVariant()}",
-                                                        mtc.getVariant()]
+                                                        mtc.getVariant(),
                                                        j.getVariant()]
                                yObj['payload'] = self.getPayload(dc2a.getPayload(),
                                                                    tc2a.getPayload(),
                                                                    dc2s.getPayload(),
                                                                    tc2s.getPayload())
-                                yObj['assertSelectors'] = ['M', 'AD', 'AT', 'SD', 'ST', 'MT']
+                                yObj['assertSelectors'] = ['M', 'AD', 'AT', 'SD', 'ST', 'MT', 'J']
                                yObj['assertFuncs'] = [self.assertFunc,
                                                            dc2a.createAssertFunc(),
                                                            tc2a.createAssertFunc(),
                                                            dc2s.createAssertFunc(),
                                                            tc2s.createAssertFunc(),
-                                                            mtc.createAssertFunc()]
+                                                            mtc.createAssertFunc(),
                                                            j.assertFunc]
                                yObj['shouldFail'] = (self.shouldFail()
                                                            | dc2a.shouldFail()
                                                            | tc2a.shouldFail()
                                                            | dc2s.shouldFail()
                                                            | tc2s.shouldFail()
-                                                            | mtc.shouldFail())
+                                                            | mtc.shouldFail()
                                                            | j.shouldFail())
                                yieldObj = {'target': yObj}
                                if self.__createPresets:
@ -165,27 +172,30 @@ class MediaCombinator6(MediaCombinator):
                                                            f"A:{tc2a_p.getVariant()}",
                                                            f"S:{dc2s_p.getVariant()}",
                                                            f"S:{tc2s_p.getVariant()}",
-                                                            mtc_p.getVariant()]
+                                                            mtc_p.getVariant(),
                                                            j.getVariant()]
                                    yObj_p['payload'] = self.getPayload(dc2a_p.getPayload(),
                                                                        tc2a_p.getPayload(),
                                                                        dc2s_p.getPayload(),
                                                                        tc2s_p.getPayload())
-                                    yObj_p['assertSelectors'] = ['M', 'AD', 'AT', 'SD', 'ST', 'MT']
+                                    yObj_p['assertSelectors'] = ['M', 'AD', 'AT', 'SD', 'ST', 'MT', 'J']
                                    yObj_p['assertFuncs'] = [self.assertFunc,
                                                                dc2a_p.createAssertFunc(),
                                                                tc2a_p.createAssertFunc(),
                                                                dc2s_p.createAssertFunc(),
                                                                tc2s_p.createAssertFunc(),
-                                                                mtc_p.createAssertFunc()]
+                                                                mtc_p.createAssertFunc(),
                                                                j.assertFunc]
                                    yObj_p['shouldFail'] = (self.shouldFail()
                                                                | dc2a_p.shouldFail()
                                                                | tc2a_p.shouldFail()
                                                                | dc2s_p.shouldFail()
                                                                | tc2s_p.shouldFail()
-                                                                | mtc_p.shouldFail())
+                                                                | mtc_p.shouldFail()
                                                                | j.shouldFail())
                                    yieldObj['preset'] = yObj_p
                                yield yieldObj
--- a/bin/ffx/test/media_combinator_7.py
+++ b/bin/ffx/test/media_combinator_7.py
@ -11,8 +11,7 @@ from .disposition_combinator_2 import DispositionCombinator2
 from .disposition_combinator_3 import DispositionCombinator3
 from .track_tag_combinator_2 import TrackTagCombinator2
 from .track_tag_combinator_3 import TrackTagCombinator3
-from .permutation_combinator_2 import PermutationCombinator2
+from .jellyfin_combinator import JellyfinCombinator
 from .permutation_combinator_3 import PermutationCombinator3
 from .media_tag_combinator import MediaTagCombinator
 class MediaCombinator7(MediaCombinator):
@ -31,8 +30,6 @@ class MediaCombinator7(MediaCombinator):
    def getPayload(self,
                    audioPermutation,
                    subtitlePermutation,
                    audioDispositionTuple = (set(), set()),
                    audioTagTuple = ({}, {}),
                    subtitleDispositionTuple = (set(), set(), set()),
@ -119,112 +116,100 @@ class MediaCombinator7(MediaCombinator):
    def getYield(self):
        pc2 = PermutationCombinator2(self._context)
        pc3 = PermutationCombinator3(self._context)
        for MTC in MediaTagCombinator.getAllClassReferences():
            for DC2_A in DispositionCombinator2.getAllClassReferences():
                for TC2_A in TrackTagCombinator2.getAllClassReferences():
                    for DC3_S in DispositionCombinator3.getAllClassReferences():
                        for TC3_S in TrackTagCombinator3.getAllClassReferences():
-                            for p2y in pc2.getYield():
+                            for J in JellyfinCombinator.getAllClassReferences():
-                                for p3y in pc3.getYield():
+                
-
+                                j = J(self._context)
-                                    dc2a = DC2_A(self._context)
+                                self._context['use_jellyfin'] = j.getPayload()
-                                    tc2a = TC2_A(self._context)
+                                
-                                    dc3s = DC3_S(self._context)
+                                dc2a = DC2_A(self._context)
-                                    tc3s = TC3_S(self._context)
+                                tc2a = TC2_A(self._context)
-
+                                dc3s = DC3_S(self._context)
-                                    mtc = MTC(self._context)
+                                tc3s = TC3_S(self._context)
-
+
-                                    yObj = {}
+                                mtc = MTC(self._context)
-
+
-                                    yObj['identifier'] = self.getIdentifier()
+                                yObj = {}
-                                    yObj['variants'] = [self.getVariant(),
+
-                                                            f"A:{p2y['variant']}",
+                                yObj['identifier'] = self.getIdentifier()
-                                                            f"S:{p3y['variant']}",
+                                yObj['variants'] = [self.getVariant(),
-                                                            f"A:{dc2a.getVariant()}",
+                                                        f"A:{dc2a.getVariant()}",
-                                                            f"A:{tc2a.getVariant()}",
+                                                        f"A:{tc2a.getVariant()}",
-                                                            f"S:{dc3s.getVariant()}",
+                                                        f"S:{dc3s.getVariant()}",
-                                                            f"S:{tc3s.getVariant()}",
+                                                        f"S:{tc3s.getVariant()}",
-                                                            mtc.getVariant()]
+                                                        mtc.getVariant(),
-
+                                                        j.getVariant()]
-                                    yObj['payload'] = self.getPayload(p2y['permutation'],
+
-                                                                      p3y['permutation'],
+                                yObj['payload'] = self.getPayload(dc2a.getPayload(),
-                                                                      dc2a.getPayload(),
+                                                                    tc2a.getPayload(),
-                                                                        tc2a.getPayload(),
+                                                                    dc3s.getPayload(),
-                                                                        dc3s.getPayload(),
+                                                                    tc3s.getPayload())
-                                                                        tc3s.getPayload())
+
-
+                                yObj['assertSelectors'] = ['M', 'AD', 'AT', 'SD', 'ST', 'MT', 'J']
-                                    yObj['assertSelectors'] = ['M', 'AP', 'SP', 'AD', 'AT', 'SD', 'ST', 'MT']
+
-
+                                yObj['assertFuncs'] = [self.assertFunc,
-                                    yObj['assertFuncs'] = [self.assertFunc,
+                                                            dc2a.createAssertFunc(),
-                                                                p2y['assertFunc'],
+                                                            tc2a.createAssertFunc(),
-                                                                p3y['assertFunc'],
+                                                            dc3s.createAssertFunc(),
-                                                                dc2a.createAssertFunc(),
+                                                            tc3s.createAssertFunc(),
-                                                                tc2a.createAssertFunc(),
+                                                            mtc.createAssertFunc(),
-                                                                dc3s.createAssertFunc(),
+                                                            j.assertFunc]
-                                                                tc3s.createAssertFunc(),
+
-                                                                mtc.createAssertFunc()]
+                                yObj['shouldFail'] = (self.shouldFail()
-
+                                                            | dc2a.shouldFail()
-                                    yObj['shouldFail'] = (self.shouldFail()
+                                                            | tc2a.shouldFail()
-                                                                | p2y['shouldFail']
+                                                            | dc3s.shouldFail()
-                                                                | p3y['shouldFail']
+                                                            | tc3s.shouldFail()
-                                                                | dc2a.shouldFail()
+                                                            | mtc.shouldFail()
-                                                                | tc2a.shouldFail()
+                                                            | j.shouldFail())
-                                                                | dc3s.shouldFail()
+                                yieldObj = {'target': yObj}
-                                                                | tc3s.shouldFail()
+
-                                                                | mtc.shouldFail())
+                                if self.__createPresets:
-                                    yieldObj = {'target': yObj}
+
-
+                                    dc2a_p = DC2_A(self._context, createPresets = True)
-                                    if self.__createPresets:
+                                    tc2a_p = TC2_A(self._context, createPresets = True)
-
+                                    dc3s_p = DC3_S(self._context, createPresets = True)
-                                        dc2a_p = DC2_A(self._context, createPresets = True)
+                                    tc3s_p = TC3_S(self._context, createPresets = True)
-                                        tc2a_p = TC2_A(self._context, createPresets = True)
+
-                                        dc3s_p = DC3_S(self._context, createPresets = True)
+                                    mtc_p = MTC(self._context, createPresets = True)
-                                        tc3s_p = TC3_S(self._context, createPresets = True)
+
-
+                                    yObj_p = {}
-                                        mtc_p = MTC(self._context, createPresets = True)
+
-
+                                    yObj_p['identifier'] = self.getIdentifier()
-                                        yObj_p = {}
+                                    yObj_p['variants'] = [self.getVariant(),
-
+                                                            f"A:{dc2a_p.getVariant()}",
-                                        yObj_p['identifier'] = self.getIdentifier()
+                                                            f"A:{tc2a_p.getVariant()}",
-                                        yObj_p['variants'] = [self.getVariant(),
+                                                            f"S:{dc3s_p.getVariant()}",
-                                                                f"A:{p2y['variant']}",
+                                                            f"S:{tc3s_p.getVariant()}",
-                                                                f"S:{p3y['variant']}",
+                                                            mtc_p.getVariant(),
-                                                                f"A:{dc2a_p.getVariant()}",
+                                                            j.getVariant()]
-                                                                f"A:{tc2a_p.getVariant()}",
+
-                                                                f"S:{dc3s_p.getVariant()}",
+                                    yObj_p['payload'] = self.getPayload(dc2a_p.getPayload(),
-                                                                f"S:{tc3s_p.getVariant()}",
+                                                                        tc2a_p.getPayload(),
-                                                                mtc_p.getVariant()]
+                                                                        dc3s_p.getPayload(),
-
+                                                                        tc3s_p.getPayload())
-                                        yObj_p['payload'] = self.getPayload(p2y['permutation'],
+
-                                                                            p3y['permutation'],
+                                    yObj_p['assertSelectors'] = ['M', 'AD', 'AT', 'SD', 'ST', 'MT', 'J']
-                                                                            dc2a_p.getPayload(),
+
-                                                                            tc2a_p.getPayload(),
+                                    yObj_p['assertFuncs'] = [self.assertFunc,
-                                                                            dc3s_p.getPayload(),
+                                                                dc2a_p.createAssertFunc(),
-                                                                            tc3s_p.getPayload())
+                                                                tc2a_p.createAssertFunc(),
-
+                                                                dc3s_p.createAssertFunc(),
-                                        yObj_p['assertSelectors'] = ['M', 'AP', 'SP', 'AD', 'AT', 'SD', 'ST', 'MT']
+                                                                tc3s_p.createAssertFunc(),
-
+                                                                mtc_p.createAssertFunc(),
-                                        yObj_p['assertFuncs'] = [self.assertFunc,
+                                                                j.assertFunc]
-                                                                    p2y['assertFunc'],
+
-                                                                    p3y['assertFunc'],
+                                    yObj_p['shouldFail'] = (self.shouldFail()
-                                                                    dc2a_p.createAssertFunc(),
+                                                                | dc2a_p.shouldFail()
-                                                                    tc2a_p.createAssertFunc(),
+                                                                | tc2a_p.shouldFail()
-                                                                    dc3s_p.createAssertFunc(),
+                                                                | dc3s_p.shouldFail()
-                                                                    tc3s_p.createAssertFunc(),
+                                                                | tc3s_p.shouldFail()
-                                                                    mtc_p.createAssertFunc()]
+                                                                | mtc_p.shouldFail()
-
+                                                                | j.shouldFail())
-                                        yObj_p['shouldFail'] = (self.shouldFail()
+                                    yieldObj['preset'] = yObj_p
-                                                                    | p2y['shouldFail']
+
-                                                                    | p3y['shouldFail']
+                                yield yieldObj
                                                                    | dc2a_p.shouldFail()
                                                                    | tc2a_p.shouldFail()
                                                                    | dc3s_p.shouldFail()
                                                                    | tc3s_p.shouldFail()
                                                                    | mtc_p.shouldFail())
                                        yieldObj['preset'] = yObj_p
                                    yield yieldObj
--- a/bin/ffx/test/media_tag_combinator.py
+++ b/bin/ffx/test/media_tag_combinator.py
--- a/bin/ffx/test/media_tag_combinator_0.py
+++ b/bin/ffx/test/media_tag_combinator_0.py
--- a/bin/ffx/test/media_tag_combinator_1.py
+++ b/bin/ffx/test/media_tag_combinator_1.py
--- a/bin/ffx/test/media_tag_combinator_2.py
+++ b/bin/ffx/test/media_tag_combinator_2.py
--- a/bin/ffx/test/release_combinator.py
+++ b/bin/ffx/test/release_combinator.py
--- a/bin/ffx/test/scenario.py
+++ b/bin/ffx/test/scenario.py
@ -10,7 +10,7 @@ from ffx.database import databaseContext
 class Scenario():
    """Scenarios
-    Scenario1: MediaTags, Stream-Kombinationen, Dispositions und StreamTags per Kombinatoren
+    Scenario1: Jellyfin, MediaTags, Stream-Kombinationen, Dispositions und StreamTags per Kombinatoren
    Scenario2: <pattern> mit 3 Files x Scenario1
@ -25,7 +25,8 @@ class Scenario():
    tmdb lookup: Set Showname as prefix, append episode name
    pattern lookup: Set/update tags/dispositions; Filter/Reorder Tracks
-
+    jellyfin reordering: default track last (2)
    MediaTag-Kombinationen (2)
    0: nichs
@ -102,10 +103,6 @@ class Scenario():
        self._testDbFilePath = os.path.join(self._testDirectory, 'test.db')
        self.createEmptyTestDatabase()
        # Convenience
        self._niceness = self._context['resource_limits']['niceness'] if 'resource_limits' in self._context.keys() and 'niceness' in self._context['resource_limits'].keys() else 99
        self._cpuPercent = self._context['resource_limits']['cpu_percent'] if 'resource_limits' in self._context.keys() and 'cpu_percent' in self._context['resource_limits'].keys() else 99
    def createEmptyTestDatabase(self):
--- a/bin/ffx/test/scenario_1.py
+++ b/bin/ffx/test/scenario_1.py
@ -29,6 +29,7 @@ class Scenario1(Scenario):
    def __init__(self, context):
        context['use_jellyfin'] = True
        context['use_tmdb'] = False
        context['use_pattern'] = False
@ -64,12 +65,9 @@ class Scenario1(Scenario):
        expectedFilename = f"{expectedBasename}.{Scenario1.EXPECTED_FILE_EXTENSION}"
-        if self._context['test_variant'] and not variantIdentifier.startswith(self._context['test_variant']):
+        if self._context['test_variant'] and variantIdentifier != self._context['test_variant']:
            return
        if (self._context['test_limit'] and (self._context['test_passed_counter'] + self._context['test_failed_counter'])
                    >= self._context['test_limit']):
            return
        self._logger.debug(f"Running Job: {variantLabel}")
@ -95,25 +93,30 @@ class Scenario1(Scenario):
        commandSequence = [sys.executable,
                            self._ffxExecutablePath]
-        if self._context['verbosity']:
+        # if self._context['verbosity']:
-            commandSequence += ['--verbose',
+        #     commandSequence += ['--verbose',
-                                str(self._context['verbosity'])]
+        #                         str(self._context['verbosity'])]
        commandSequence += ['convert',
                            mediaFilePath,
-                            '--no-prompt',
+                            '--no-prompt']
                            '--no-signature']
        if variantFilenameLabel:
            commandSequence += ['--label', variantFilenameLabel]
        if not testContext['use_jellyfin']:
            commandSequence += ['--no-jellyfin']
        commandSequence += ['--no-pattern']
        commandSequence += ['--no-tmdb']
        out, err, rc = executeProcess(commandSequence, directory = self._testDirectory, context = self._context)
-        if out and self._context['verbosity'] >= 9:
+        self._logger.debug(f"{variantLabel}: Test sequence: {commandSequence}")
        out, err, rc = executeProcess(commandSequence, directory = self._testDirectory)
        if out:
            self._logger.debug(f"{variantLabel}: Process output: {out}")
        if rc:
            self._logger.debug(f"{variantLabel}: Process returned ERROR {rc} ({err})")
--- a/bin/ffx/test/scenario_2.py
+++ b/bin/ffx/test/scenario_2.py
@ -27,6 +27,7 @@ class Scenario2(Scenario):
    def __init__(self, context):
        context['use_jellyfin'] = True
        context['use_tmdb'] = False
        context['use_pattern'] = False
@ -55,12 +56,16 @@ class Scenario2(Scenario):
        assertFuncList = targetYieldObj['assertFuncs']
        shouldFail = targetYieldObj['shouldFail']
        try:
            jellyfinSelectorIndex = assertSelectorList.index('J')
            jellyfinVariant = variantList[jellyfinSelectorIndex]
            testContext['use_jellyfin'] = jellyfinVariant == 'J1'
        except ValueError:
            jellyfinSelectorIndex = -1
        if self._context['test_variant'] and not variantIdentifier.startswith(self._context['test_variant']):
            return
-        if (self._context['test_limit'] and (self._context['test_passed_counter'] + self._context['test_failed_counter'])
+        #if self._context['test_variant'] and variantIdentifier != self._context['test_variant']:
-                    >= self._context['test_limit']):
+        if self._context['test_variant'] and not variantIdentifier.startswith(self._context['test_variant']):
            return
        self._logger.debug(f"Running Job: {variantLabel}")
@ -78,20 +83,20 @@ class Scenario2(Scenario):
        # Phase 2: Run ffx
        commandSequence = [sys.executable,
-                            self._ffxExecutablePath]
+                            self._ffxExecutablePath,
-        
+                            'convert',
        if self._context['verbosity']:
            commandSequence += ['--verbose',
                                str(self._context['verbosity'])]
        commandSequence += ['convert',
                            mediaFilePath,
-                            '--no-prompt',
+                            '--no-prompt']
-                            '--no-signature']
+
        if not testContext['use_jellyfin']:
            commandSequence += ['--no-jellyfin']
-        out, err, rc = executeProcess(commandSequence, directory = self._testDirectory, context = self._context)
+        self._logger.debug(f"{variantLabel}: Test sequence: {commandSequence}")
-        if out and self._context['verbosity'] >= 9:
+        out, err, rc = executeProcess(commandSequence, directory = self._testDirectory)
        if out:
            self._logger.debug(f"{variantLabel}: Process output: {out}")
        if rc:
            self._logger.debug(f"{variantLabel}: Process returned ERROR {rc} ({err})")
@ -122,6 +127,10 @@ class Scenario2(Scenario):
                resultFileProperties = FileProperties(testContext, resultFile)
                resultMediaDescriptor = resultFileProperties.getMediaDescriptor()
                if testContext['use_jellyfin']:
                    sourceMediaDescriptor.applyJellyfinOrder()
                resultMediaDescriptor.applySourceIndices(sourceMediaDescriptor)
                resultMediaTracks = resultMediaDescriptor.getAllTrackDescriptors()
                for assertIndex in range(len(assertSelectorList)):
--- a/bin/ffx/test/scenario_4.py
+++ b/bin/ffx/test/scenario_4.py
@ -5,9 +5,7 @@ from .scenario import Scenario
 from ffx.test.helper import createMediaTestFile
 from ffx.process import executeProcess
 from ffx.database import databaseContext
 from ffx.test.helper import createEmptyDirectory
 from ffx.helper import getEpisodeFileBasename
 from ffx.file_properties import FileProperties
@ -35,7 +33,7 @@ class Scenario4(Scenario):
    TEST_FILE_LABEL = 'rotsh'
    TEST_FILE_EXTENSION = 'mkv'
-    TEST_PATTERN = f"{TEST_FILE_LABEL}_{FileProperties.SE_INDICATOR_PATTERN}.{TEST_FILE_EXTENSION}"
+    TEST_PATTERN = f"{TEST_FILE_LABEL}_{FileProperties.SEASON_EPISODE_INDICATOR_MATCH}.{TEST_FILE_EXTENSION}"
    EXPECTED_FILE_EXTENSION = 'webm'
@ -112,23 +110,25 @@ class Scenario4(Scenario):
        assertFuncList = presetYieldObj['assertFuncs']
        shouldFail = presetYieldObj['shouldFail']
        try:
            jellyfinSelectorIndex = assertSelectorList.index('J')
            jellyfinVariant = variantList[jellyfinSelectorIndex]
            testContext['use_jellyfin'] = jellyfinVariant == 'J1'
        except ValueError:
            jellyfinSelectorIndex = -1
        if self._context['test_variant'] and not variantIdentifier.startswith(self._context['test_variant']):
            return
-        if (self._context['test_limit'] and (self._context['test_passed_counter'] + self._context['test_failed_counter'])
+        if self._context['test_variant'] and variantIdentifier != self._context['test_variant']:
                    >= self._context['test_limit']):
            return
        self._logger.debug(f"Running Job: {variantLabel}")
        for l in presetMediaDescriptor.getConfiguration(label = 'presetMediaDescriptor'):
            self._logger.debug(l)
        for l in sourceMediaDescriptor.getConfiguration(label = 'sourceMediaDescriptor'):
            self._logger.debug(l)
        self._logger.debug(f"Running Job: {variantLabel}")
        # Phase 1: Setup source files
@ -164,23 +164,23 @@ class Scenario4(Scenario):
        # Phase 3: Run ffx
        commandSequence = [sys.executable,
-                            self._ffxExecutablePath]
+                            self._ffxExecutablePath,
-        
+                            '--database-file',
        if self._context['verbosity']:
            commandSequence += ['--verbose',
                                str(self._context['verbosity'])]
        commandSequence += ['--database-file',
                            self._testDbFilePath,
                            'convert']
        commandSequence += [tfo['filename'] for tfo in testFileList]
-        commandSequence += ['--no-prompt', '--no-signature']
+        commandSequence += ['--no-prompt']
-        out, err, rc = executeProcess(commandSequence, directory = self._testDirectory, context = self._context)
+        if not testContext['use_jellyfin']:
            commandSequence += ['--no-jellyfin']
-        if out and self._context['verbosity'] >= 9:
+        self._logger.debug(f"{variantLabel}: Test sequence: {commandSequence}")
-            self._logger.debug(f"{variantLabel}: Process output: {out}")
+
        out, err, rc = executeProcess(commandSequence, directory = self._testDirectory)
        # if out:
        #     self._logger.debug(f"{variantLabel}: Process output: {out}")
        if rc:
            self._logger.debug(f"{variantLabel}: Process returned ERROR {rc} ({err})")
@ -207,10 +207,9 @@ class Scenario4(Scenario):
                    tmdbEpisodeResult = self.__tc.queryEpisode(Scenario4.TEST_SHOW_IDENTIFIER,
                                                                tfo['season'], tfo['episode']) 
-                    expectedFileBasename = getEpisodeFileBasename(self.__testShowDescriptor.getFilenamePrefix(),
+                    expectedFileBasename = TmdbController.getEpisodeFileBasename(self.__testShowDescriptor.getFilenamePrefix(),
                                                                    tmdbEpisodeResult['name'],
-                                                                    tfo['season'], tfo['episode'],
+                                                                    tfo['season'], tfo['episode']) 
                                                                    context=testContext) 
                    expectedFilename = f"{expectedFileBasename}.{Scenario4.EXPECTED_FILE_EXTENSION}"
                    expectedFilePath = os.path.join(self._testDirectory, expectedFilename)
@ -228,6 +227,9 @@ class Scenario4(Scenario):
                    for l in rmd.getConfiguration(label = 'resultMediaDescriptor'):
                        self._logger.debug(l)
                    if testContext['use_jellyfin']:
                        sourceMediaDescriptor.applyJellyfinOrder()
                    # num tracks differ
                    rmd.applySourceIndices(sourceMediaDescriptor)
@ -256,13 +258,14 @@ class Scenario4(Scenario):
            self._context['test_passed_counter'] += 1
-            self._reportLogger.info(f"\n{variantLabel}: Test passed\n")
+            self._reportLogger.info(f"{variantLabel}: Test passed")
        except AssertionError as ae:
            self._context['test_failed_counter'] += 1
-            self._reportLogger.error(f"\n{variantLabel}: Test FAILED ({ae})\n")
+            self._reportLogger.error(f"{variantLabel}: Test FAILED ({ae})")
        # exit()
    def run(self):
--- a/bin/ffx/test/show_combinator.py
+++ b/bin/ffx/test/show_combinator.py
--- a/bin/ffx/test/title_combinator.py
+++ b/bin/ffx/test/title_combinator.py
--- a/bin/ffx/test/track_tag_combinator_2.py
+++ b/bin/ffx/test/track_tag_combinator_2.py
--- a/bin/ffx/test/track_tag_combinator_2_0.py
+++ b/bin/ffx/test/track_tag_combinator_2_0.py
--- a/bin/ffx/test/track_tag_combinator_2_1.py
+++ b/bin/ffx/test/track_tag_combinator_2_1.py
--- a/bin/ffx/test/track_tag_combinator_2_2.py
+++ b/bin/ffx/test/track_tag_combinator_2_2.py
--- a/bin/ffx/test/track_tag_combinator_2_3.py
+++ b/bin/ffx/test/track_tag_combinator_2_3.py
--- a/bin/ffx/test/track_tag_combinator_3.py
+++ b/bin/ffx/test/track_tag_combinator_3.py
--- a/bin/ffx/test/track_tag_combinator_3_0.py
+++ b/bin/ffx/test/track_tag_combinator_3_0.py
--- a/bin/ffx/test/track_tag_combinator_3_1.py
+++ b/bin/ffx/test/track_tag_combinator_3_1.py
--- a/bin/ffx/test/track_tag_combinator_3_2.py
+++ b/bin/ffx/test/track_tag_combinator_3_2.py
--- a/bin/ffx/test/track_tag_combinator_3_3.py
+++ b/bin/ffx/test/track_tag_combinator_3_3.py
--- a/bin/ffx/test/track_tag_combinator_3_4.py
+++ b/bin/ffx/test/track_tag_combinator_3_4.py
--- a/bin/ffx/tmdb_controller.py
+++ b/bin/ffx/tmdb_controller.py
@ -1,6 +1,4 @@
-import os, requests, time, logging
+import os, click, requests, json, time, logging
 from datetime import datetime
 class TMDB_REQUEST_EXCEPTION(Exception):
    def __init__(self, statusCode, statusMessage):
@ -25,12 +23,8 @@ class TmdbController():
    def __init__(self, context = None):
        self.__context = context
-
+        self.__logger = (context['logger'] if context is not None and 'logger' in context.keys()
-        if context is None:
+                            else logging.getLogger('FFX').addHandler(logging.NullHandler()))
            self.__logger = logging.getLogger('FFX')
            self.__logger.addHandler(logging.NullHandler())
        else:
            self.__logger = context['logger']
        self.__tmdbApiKey = os.environ.get('TMDB_API_KEY', None)
        if self.__tmdbApiKey is None:
@ -101,14 +95,6 @@ class TmdbController():
        return self.getTmdbRequest(tmdbUrl)
    def getShowNameAndYear(self, showId: int):
        showResult = self.queryShow(int(showId))
        firstAirDate = datetime.strptime(showResult['first_air_date'], '%Y-%m-%d')
        return str(showResult['name']), int(firstAirDate.year)
    def queryEpisode(self, showId, season, episode):
        """
        First level keys in the response object:
@ -132,3 +118,61 @@ class TmdbController():
        tmdbUrl = f"https://api.themoviedb.org/3/tv/{showId}/season/{season}/episode/{episode}{urlParams}"
        return self.getTmdbRequest(tmdbUrl)
    @staticmethod
    def getEpisodeFileBasename(showName,
                                episodeName,
                                season,
                                episode,
                                indexSeasonDigits = 2,
                                indexEpisodeDigits = 2,
                                indicatorSeasonDigits = 2,
                                indicatorEpisodeDigits = 2):
        """
        One Piece:
        indexSeasonDigits = 0,
        indexEpisodeDigits = 4,
        indicatorSeasonDigits = 2,
        indicatorEpisodeDigits = 4
        Three-Body:
        indexSeasonDigits = 0,
        indexEpisodeDigits = 2,
        indicatorSeasonDigits = 2,
        indicatorEpisodeDigits = 2
        Dragonball:
        indexSeasonDigits = 0,
        indexEpisodeDigits = 3,
        indicatorSeasonDigits = 2,
        indicatorEpisodeDigits = 3
        Boruto:
        indexSeasonDigits = 0,
        indexEpisodeDigits = 4,
        indicatorSeasonDigits = 2,
        indicatorEpisodeDigits = 4
        """
        filenameTokens = [str(showName), ' - ']
        if indexSeasonDigits:
            filenameTokens += ['{num:{fill}{width}}'.format(num=season, fill='0', width=indexSeasonDigits)]
        if indexEpisodeDigits:
            filenameTokens += ['{num:{fill}{width}}'.format(num=episode, fill='0', width=indexEpisodeDigits)]
        if indexSeasonDigits or indexEpisodeDigits:
            filenameTokens += [' ']
        filenameTokens += [episodeName]
        if indicatorSeasonDigits or indicatorEpisodeDigits:
            filenameTokens += [' - ']
        if indicatorSeasonDigits:
            filenameTokens += ['S{num:{fill}{width}}'.format(num=season, fill='0', width=indicatorSeasonDigits)]
        if indicatorEpisodeDigits:
            filenameTokens += ['E{num:{fill}{width}}'.format(num=episode, fill='0', width=indicatorEpisodeDigits)]
        return ''.join(filenameTokens)
    def importShow(self, showId: int):
        pass
--- a/bin/ffx/track_controller.py
+++ b/bin/ffx/track_controller.py
@ -5,6 +5,7 @@ from ffx.model.track import Track
 from .track_type import TrackType
 from .track_disposition import TrackDisposition
 from .iso_language import IsoLanguage
 from .track_type import TrackType
@ -29,7 +30,7 @@ class TrackController():
            s = self.Session()
            track = Track(pattern_id = patId,
                            track_type = int(trackDescriptor.getType().index()),
-                            codec_name = str(trackDescriptor.getCodec().identifier()),
+                            codec_name = str(trackDescriptor.getCodec()),
                            index = int(trackDescriptor.getIndex()),
                            source_index = int(trackDescriptor.getSourceIndex()),
                            disposition_flags = int(TrackDisposition.toFlags(trackDescriptor.getDispositionSet())),
@ -65,10 +66,8 @@ class TrackController():
                track : Track = q.first()
                track.index = int(trackDescriptor.getIndex())
                track.track_type = int(trackDescriptor.getType().index())
-                track.codec_name = str(trackDescriptor.getCodec().identifier())
+                track.codec_name = str(trackDescriptor.getCodec())
                track.audio_layout = int(trackDescriptor.getAudioLayout().index())
                track.disposition_flags = int(TrackDisposition.toFlags(trackDescriptor.getDispositionSet()))
@ -104,34 +103,13 @@ class TrackController():
            s = self.Session()
            q = s.query(Track).filter(Track.pattern_id == int(patternId))
-            return sorted([t for t in q.all()], key=lambda d: d.getIndex())
+            return [a for a in q.all()]
        except Exception as ex:
            raise click.ClickException(f"TrackController.findTracks(): {repr(ex)}")
        finally:
            s.close()
    def findSiblingDescriptors(self, patternId):
        """Finds all stored tracks related to a pattern, packs them in descriptors
        and also setting sub indices and returns list of descriptors"""
        siblingTracks = self.findTracks(patternId)
        siblingDescriptors = []
        subIndexCounter = {}
        st: Track
        for st in siblingTracks:
            trackType = st.getType()
            if not trackType in subIndexCounter.keys():
                subIndexCounter[trackType] = 0
            siblingDescriptors.append(st.getDescriptor(subIndex=subIndexCounter[trackType]))
            subIndexCounter[trackType] += 1
        return siblingDescriptors
    #TODO: mit optionalem Parameter lösen ^
    def findVideoTracks(self, patternId):
@ -255,8 +233,8 @@ class TrackController():
            s.close()
-#     def setDefaultSubTrack(self, trackType, subIndex):
+    def setDefaultSubTrack(self, trackType, subIndex):
-#             pass
+            pass
-# 
+
-#     def setForcedSubTrack(self, trackType, subIndex):
+    def setForcedSubTrack(self, trackType, subIndex):
-#             pass
+            pass
--- a/bin/ffx/track_delete_screen.py
+++ b/bin/ffx/track_delete_screen.py
@ -1,13 +1,18 @@
 import click
 from textual import events
 from textual.app import App, ComposeResult
 from textual.screen import Screen
 from textual.widgets import Header, Footer, Static, Button
 from textual.containers import Grid
 from ffx.model.pattern import Pattern
 from ffx.model.track import Track
 from ffx.track_descriptor import TrackDescriptor
 from .track_controller import TrackController
 from .track_type import TrackType
 # Screen[dict[int, str, int]]
 class TrackDeleteScreen(Screen):
--- a/bin/ffx/track_descriptor.py
+++ b/bin/ffx/track_descriptor.py
@ -1,11 +1,9 @@
 import logging
 from typing import Self
 from .iso_language import IsoLanguage
 from .track_type import TrackType
 from .audio_layout import AudioLayout
 from .track_disposition import TrackDisposition
 from .track_codec import TrackCodec
 from .helper import dictDiff, setDiff
@ -25,14 +23,14 @@ class TrackDescriptor:
    TAGS_KEY = "tags"
    TRACK_TYPE_KEY = "track_type"
-    CODEC_KEY = "codec_name"
+    CODEC_NAME_KEY = "codec_name"
    AUDIO_LAYOUT_KEY = "audio_layout"
    FFPROBE_INDEX_KEY = "index"
    FFPROBE_DISPOSITION_KEY = "disposition"
    FFPROBE_TAGS_KEY = "tags"
    FFPROBE_CODEC_TYPE_KEY = "codec_type"
-    FFPROBE_CODEC_KEY = "codec_name"
+    FFPROBE_CODEC_NAME_KEY = "codec_name"
    CODEC_PGS = 'hdmv_pgs_subtitle'
@ -47,8 +45,7 @@ class TrackDescriptor:
            self.__logger = self.__context['logger']
        else:
            self.__context = {}
-            self.__logger = logging.getLogger('FFX')
+            self.__logger = logging.getLogger('FFX').addHandler(logging.NullHandler())
            self.__logger.addHandler(logging.NullHandler())
        if TrackDescriptor.ID_KEY in kwargs.keys():
            if type(kwargs[TrackDescriptor.ID_KEY]) is not int:
@ -112,14 +109,14 @@ class TrackDescriptor:
        else:
            self.__trackType = TrackType.UNKNOWN
-        if TrackDescriptor.CODEC_KEY in kwargs.keys():
+        if TrackDescriptor.CODEC_NAME_KEY in kwargs.keys():
-            if type(kwargs[TrackDescriptor.CODEC_KEY]) is not TrackCodec:
+            if type(kwargs[TrackDescriptor.CODEC_NAME_KEY]) is not str:
                raise TypeError(
-                    f"TrackDesciptor.__init__(): Argument {TrackDescriptor.CODEC_KEY} is required to be of type TrackCodec"
+                    f"TrackDesciptor.__init__(): Argument {TrackDescriptor.CODEC_NAME_KEY} is required to be of type str"
                )
-            self.__trackCodec = kwargs[TrackDescriptor.CODEC_KEY]
+            self.__codecName = kwargs[TrackDescriptor.CODEC_NAME_KEY]
        else:
-            self.__trackCodec = TrackCodec.UNKNOWN
+            self.__codecName = ''
        if TrackDescriptor.TAGS_KEY in kwargs.keys():
            if type(kwargs[TrackDescriptor.TAGS_KEY]) is not dict:
@ -216,8 +213,7 @@ class TrackDescriptor:
            kwargs[TrackDescriptor.SUB_INDEX_KEY] = subIndex
            kwargs[TrackDescriptor.TRACK_TYPE_KEY] = trackType
-
+            kwargs[TrackDescriptor.CODEC_NAME_KEY] = str(streamObj[TrackDescriptor.FFPROBE_CODEC_NAME_KEY])
            kwargs[TrackDescriptor.CODEC_KEY] = TrackCodec.identify(streamObj[TrackDescriptor.FFPROBE_CODEC_KEY])
            kwargs[TrackDescriptor.DISPOSITION_SET_KEY] = (
                {
@ -275,9 +271,9 @@ class TrackDescriptor:
    def getType(self):
        return self.__trackType
-
+    
-    def getCodec(self) -> TrackCodec:
+    def getCodec(self):
-        return self.__trackCodec
+        return self.__codecName
    def getLanguage(self):
        if "language" in self.__trackTags.keys():
@ -285,21 +281,12 @@ class TrackDescriptor:
        else:
            return IsoLanguage.UNDEFINED
    def setLanguage(self, language: IsoLanguage):
        if not type(language) is IsoLanguage:
            raise TypeError('language has to be of type IsoLanguage')
        self.__trackTags["language"] = language
    def getTitle(self):
        if "title" in self.__trackTags.keys():
            return str(self.__trackTags["title"])
        else:
            return ""
    def setTitle(self, title: str):
        self.__trackTags["title"] = str(title)
    def getAudioLayout(self):
        return self.__audioLayout
@ -309,9 +296,6 @@ class TrackDescriptor:
    def getDispositionSet(self):
        return self.__dispositionSet
    def setDispositionSet(self, dispositionSet: set):
        self.__dispositionSet = dispositionSet
    def getDispositionFlag(self, disposition: TrackDisposition) -> bool:
        return bool(disposition in self.__dispositionSet)
@ -321,7 +305,7 @@ class TrackDescriptor:
        else:
            self.__dispositionSet.discard(disposition)
-    def compare(self, vsTrackDescriptor: Self):
+    def compare(self, vsTrackDescriptor):
        compareResult = {}
--- a/bin/ffx/track_details_screen.py
+++ b/bin/ffx/track_details_screen.py
@ -1,17 +1,19 @@
-import click
+import click, time
 from textual import events
 from textual.app import App, ComposeResult
 from textual.screen import Screen
 from textual.widgets import Header, Footer, Static, Button, SelectionList, Select, DataTable, Input
 from textual.containers import Grid
 from ffx.model.pattern import Pattern
 from ffx.model.track import Track
 from .track_controller import TrackController
 from .pattern_controller import PatternController
 from .tag_controller import TagController
 from .track_type import TrackType
 from .track_codec import TrackCodec
 from .iso_language import IsoLanguage
 from .track_disposition import TrackDisposition
@ -52,21 +54,10 @@ class TrackDetailsScreen(Screen):
    Select {
        border: none;
    }
    DataTable {
        min-height: 6;
    }
    DataTable .datatable--cursor {
        background: darkorange;
        color: black;
    }
    DataTable .datatable--header {
        background: steelblue;
        color: white;
    }
    #toplabel {
        height: 1;
    }
@ -108,7 +99,6 @@ class TrackDetailsScreen(Screen):
        self.__isNew = trackDescriptor is None
        if self.__isNew:
            self.__trackType = trackType
            self.__trackCodec = TrackCodec.UNKNOWN
            self.__audioLayout = AudioLayout.LAYOUT_UNDEFINED
            self.__index = index
            self.__subIndex = subIndex
@ -116,7 +106,6 @@ class TrackDetailsScreen(Screen):
            self.__pattern : Pattern = self.__pc.getPattern(patternId) if patternId is not None else {}
        else:
            self.__trackType = trackDescriptor.getType()
            self.__trackCodec = trackDescriptor.getCodec()
            self.__audioLayout = trackDescriptor.getAudioLayout()
            self.__index = trackDescriptor.getIndex()
            self.__subIndex = trackDescriptor.getSubIndex()
@ -175,8 +164,8 @@ class TrackDetailsScreen(Screen):
        self.trackTagsTable = DataTable(classes="five")
        # Define the columns with headers
-        self.column_key_track_tag_key = self.trackTagsTable.add_column("Key", width=50)
+        self.column_key_track_tag_key = self.trackTagsTable.add_column("Key", width=10)
-        self.column_key_track_tag_value = self.trackTagsTable.add_column("Value", width=100)
+        self.column_key_track_tag_value = self.trackTagsTable.add_column("Value", width=125)
        self.trackTagsTable.cursor_type = 'row'
@ -210,11 +199,8 @@ class TrackDetailsScreen(Screen):
            yield Select.from_values([t.label() for t in TrackType], classes="four", id="type_select")
            # 7
-            if self.__trackType == TrackType.AUDIO:
+            yield Static("Audio Layout")
-                yield Static("Audio Layout")
+            yield Select.from_values([t.label() for t in AudioLayout], classes="four", id="audio_layout_select")
                yield Select.from_values([t.label() for t in AudioLayout], classes="four", id="audio_layout_select")
            else:
                yield Static(" ", classes="five")    
            # 8
            yield Static(" ", classes="five")
@ -290,13 +276,7 @@ class TrackDetailsScreen(Screen):
        kwargs[TrackDescriptor.SUB_INDEX_KEY] = self.__subIndex #!
        kwargs[TrackDescriptor.TRACK_TYPE_KEY] = TrackType.fromLabel(self.query_one("#type_select", Select).value)
-
+        kwargs[TrackDescriptor.AUDIO_LAYOUT_KEY] = AudioLayout.fromLabel(self.query_one("#audio_layout_select", Select).value)
        kwargs[TrackDescriptor.CODEC_KEY] = self.__trackCodec
        if self.__trackType == TrackType.AUDIO:
            kwargs[TrackDescriptor.AUDIO_LAYOUT_KEY] = AudioLayout.fromLabel(self.query_one("#audio_layout_select", Select).value)
        else:
            kwargs[TrackDescriptor.AUDIO_LAYOUT_KEY] = AudioLayout.LAYOUT_UNDEFINED
        trackTags = {}
        language = self.query_one("#language_select", Select).value
--- a/bin/ffx/track_disposition.py
+++ b/bin/ffx/track_disposition.py
@ -66,11 +66,3 @@ class TrackDisposition(Enum):
            return matchingDispositions[0]
        else:
            return None
    @staticmethod
    def fromIndicator(indicator: str):
        matchingDispositions = [d for d in TrackDisposition if d.indicator() == str(indicator)]
        if matchingDispositions:
            return matchingDispositions[0]
        else:
            return None
--- a/Show More
+++ b/Show More