Tests passed, Config-File

.gitignore

@@ -1,3 +1,4 @@
 __pycache__
 junk/
 .vscode/launch.json
+.ipynb_checkpoints/

bin/check.py

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

bin/dd.py

@@ -1,6 +0,0 @@
-from ffx.helper import dictDiff
-
-a = {'name': 'yolo', 'mass': 56}
-b = {'name': 'zolo', 'mass': 58}
-
-print(dictDiff(a, b))

bin/ffx.py

@@ -1,35 +1,80 @@
 #! /usr/bin/python3
 
-import os, sys, subprocess, json, click, time, re
+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.show_controller import ShowController
 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.1.2'
+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
-def ffx(ctx):
+@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['database'] = databaseContext()
+
+    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
@@ -45,8 +90,6 @@ def help():
     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)
@@ -59,52 +102,103 @@ def inspect(ctx, 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('-sd', '--subtitle-directory', type=str, default='', help='Load subtitles from here')
-# @click.option('-sp', '--subtitle-prefix', type=str, default='', help='Subtitle filename prefix')
-# 
-# @click.option("-o", "--output-directory", type=str, default='')
-# 
-# @click.option("--dry-run", is_flag=True, default=False)
-# 
-# 
-# def unmux(ctx,
-#             label,
-#             paths,
-#             subtitle_directory,
-#             subtitle_prefix,
-#             output_directory,
-#             dry_run):
-# 
-#     existingSourcePaths = [p for p in paths if os.path.isfile(p)]
-#     click.echo(f"\nUnmuxing {len(existingSourcePaths)} files")
-# 
-#     for sourcePath in existingSourcePaths:
-# 
-#         sd = getStreamDescriptor(sourcePath)
-# 
-#         print(f"\nFile {sourcePath}\n")
-# 
-#         for v in sd['video']:
-#             
-#             if v['codec_name'] == 'h264':
-# 
-#                 commandSequence = ['ffmpeg', '-i', sourcePath, '-map', '0:v:0', '-c', 'copy', '-f', 'h264']
-#                 executeProcess()
-# 
-#         for a in sd['audio']:
-#             print(f"A: {a}\n")
-#         for s in sd['subtitle']:
-#             print(f"S: {s}\n")
+@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()
@@ -118,6 +212,49 @@ def shows(ctx):
     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
 
@@ -130,39 +267,39 @@ def shows(ctx):
 @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('-a', '--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', '--ac3-bitrate', 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', '--dts-bitrate', 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('-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('-sd', '--subtitle-directory', type=str, default='', help='Load subtitles from here')
-@click.option('-sp', '--subtitle-prefix', type=str, default='', help='Subtitle filename prefix')
+@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('-as', '--audio-language', type=str, multiple=True, help='Audio stream language(s)')
-@click.option('-at', '--audio-title', type=str, multiple=True, help='Audio stream title(s)')
+@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('-da', '--default-audio', type=int, default=-1, help='Index of default audio stream')
-@click.option('-da', '--forced-audio', type=int, default=-1, help='Index of forced audio stream')
+@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('-ss', '--subtitle-language', type=str, multiple=True, help='Subtitle stream language(s)')
-@click.option('-st', '--subtitle-title', type=str, multiple=True, help='Subtitle stream title(s)')
+@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('-ds', '--default-subtitle', type=int, default=-1, help='Index of default subtitle stream')
-@click.option('-fs', '--forced-subtitle', type=int, default=-1, help='Index of forced subtitle stream') # (including default audio stream tag)
+@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("-o", "--output-directory", type=str, default='')
+@click.option("--output-directory", type=str, default='')
 
-@click.option("-d", "--denoise", is_flag=True, default=False)
-
-@click.option("-t", "--no-tmdb", is_flag=True, default=False)
-@click.option("-j", "--no-jellyfin", is_flag=True, default=False)
-
-@click.option("--dry-run", is_flag=True, default=False)
+@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,
@@ -171,8 +308,9 @@ def convert(ctx,
             quality,
             preset,
             stereo_bitrate,
-            ac3_bitrate,
-            dts_bitrate,
+            ac3,
+            dts,
+
             subtitle_directory,
             subtitle_prefix,
 
@@ -191,7 +329,9 @@ def convert(ctx,
             denoise,
             no_tmdb,
             no_jellyfin,
-            dry_run):
+            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.
@@ -203,12 +343,12 @@ def convert(ctx,
     
     context = ctx.obj
     
-    context['dry_run'] = True # dry_run
-    
     context['video_encoder'] = VideoEncoder.fromLabel(video_encoder)
 
-    context['jellyfin'] = not no_jellyfin
-    context['tmdb'] = not no_tmdb
+    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']:
@@ -220,13 +360,15 @@ def convert(ctx,
     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_bitrate) if str(ac3_bitrate).endswith('k') else f"{ac3_bitrate}k"
-    context['bitrates']['dts'] = str(dts_bitrate) if str(dts_bitrate).endswith('k') else f"{dts_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']}")
@@ -238,13 +380,15 @@ def convert(ctx,
         cTokens = crop.split(',')
         if cTokens and len(cTokens) == 2:
             context['crop_start'] = int(cTokens[0])
-            context['crop_lenght'] = int(cTokens[1])
+            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()
+    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
  
@@ -258,6 +402,7 @@ def convert(ctx,
         sourceFileBasename = '.'.join(sourcePathTokens[:-1])
         sourceFilenameExtension = sourcePathTokens[-1]
 
+        if ctx.obj['verbosity'] > 0:
             click.echo(f"\nProcessing file {sourcePath}")
 
 
@@ -265,81 +410,54 @@ def convert(ctx,
         sourceMediaDescriptor = mediaFileProperties.getMediaDescriptor()
 
         #HINT: This is None if the filename did not match anything in database
-        currentPattern = mediaFileProperties.getPattern()
+        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 = ''
+        # fileBasename = ''
 
         if currentPattern is None:
             
             # Case no pattern matching
 
-            # 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 
-            try:
-                sourceMediaDescriptor.getDefaultVideoTrack()
-            except ValueError:
-                defaultVideoTrackSubIndex = click.prompt("More than one default video stream detected! Please select stream", type=int)
-                sourceMediaDescriptor.setDefaultSubTrack(TrackType.VIDEO, defaultVideoTrackSubIndex)
-            try:
-                sourceMediaDescriptor.getForcedVideoTrack()
-            except ValueError:
-                forcedVideoTrackSubIndex = click.prompt("More than one forced video stream detected! Please select stream", type=int)
-                sourceMediaDescriptor.setForcedSubTrack(TrackType.VIDEO, forcedVideoTrackSubIndex)
-            try:
-                sourceMediaDescriptor.getDefaultAudioTrack()
-            except ValueError:
-                defaultAudioTrackSubIndex = click.prompt("More than one default audio stream detected! Please select stream", type=int)
-                sourceMediaDescriptor.setDefaultSubTrack(TrackType.AUDIO, defaultAudioTrackSubIndex)
-            try:
-                sourceMediaDescriptor.getForcedAudioTrack()
-            except ValueError:
-                forcedAudioTrackSubIndex = click.prompt("More than one forced audio stream detected! Please select stream", type=int)
-                sourceMediaDescriptor.setForcedSubTrack(TrackType.AUDIO, forcedAudioTrackSubIndex)
-            try:
-                sourceMediaDescriptor.getDefaultSubtitleTrack()
-            except ValueError:
-                defaultSubtitleTrackSubIndex = click.prompt("More than one default subtitle stream detected! Please select stream", type=int)
-                sourceMediaDescriptor.setDefaultSubTrack(TrackType.SUBTITLE, defaultSubtitleTrackSubIndex)
-            try:
-                sourceMediaDescriptor.getForcedSubtitleTrack()
-            except ValueError:
-                forcedSubtitleTrackSubIndex = click.prompt("More than one forced subtitle stream detected! Please select stream", type=int)
-                sourceMediaDescriptor.setForcedSubTrack(TrackType.SUBTITLE, forcedSubtitleTrackSubIndex)
+            # fileBasename = currentShowDescriptor.getFilenamePrefix()
+
+            checkUniqueDispositions(context, sourceMediaDescriptor)
 
             if context['import_subtitles']:
-                sourceMediaDescriptor.importSubtitles(context['subtitle_directory'], context['subtitle_prefix'])
+                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)
 
-            # mappingTokens = fc.generateMetadataTokens()
-            # click.echo(f"Metadata Tokens: {mappingTokens}")
-         
-            dispositionTokens = fc.generateDispositionTokens()
-            click.echo(f"Disposition Tokens: {dispositionTokens}")
-
-            audioTokens = fc.generateAudioEncodingTokens()
-            click.echo(f"Audio Tokens: {audioTokens}")
 
         else:
 
             # Case pattern matching
 
-            targetMediaDescriptor = currentPattern.getMediaDescriptor()
-            currentShowDescriptor = currentPattern.getShowDescriptor()
+            targetMediaDescriptor = currentPattern.getMediaDescriptor(ctx.obj)
+
+            checkUniqueDispositions(context, targetMediaDescriptor)
 
 
-            if context['tmdb']:
+            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}")
+                click.echo(f"tmdbEpisodeResult={tmdbEpisodeResult}")
 
                 if tmdbEpisodeResult:
-                    fileBasename = tc.getEpisodeFileBasename(currentShowDescriptor.getFilenamePrefix(),
+                    sourceFileBasename = TmdbController.getEpisodeFileBasename(currentShowDescriptor.getFilenamePrefix(),
                                                             tmdbEpisodeResult['name'],
                                                             mediaFileProperties.getSeason(),
                                                             mediaFileProperties.getEpisode(),
@@ -347,47 +465,60 @@ def convert(ctx,
                                                             currentShowDescriptor.getIndexEpisodeDigits(),
                                                             currentShowDescriptor.getIndicatorSeasonDigits(),
                                                             currentShowDescriptor.getIndicatorEpisodeDigits()) 
-
-                    
             else:
-                fileBasename = currentShowDescriptor.getFilenamePrefix()
-
-            click.echo(f"fileBasename={fileBasename}")
+                sourceFileBasename = currentShowDescriptor.getFilenamePrefix()
 
             if context['import_subtitles']:
-                targetMediaDescriptor.importSubtitles(context['subtitle_directory'], context['subtitle_prefix'])
+                targetMediaDescriptor.importSubtitles(context['subtitle_directory'],
+                                                        context['subtitle_prefix'],
+                                                        mediaFileProperties.getSeason(),
+                                                        mediaFileProperties.getEpisode())
 
-            targetMediaDescriptor.setJellyfinOrder(context['jellyfin'])
+            # 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()]}")
 
-            click.echo(f"Input mapping tokens: {targetMediaDescriptor.getInputMappingTokens()}")
+            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)
 
-            mappingTokens = fc.generateMetadataTokens()
-            click.echo(f"Metadata Tokens: {mappingTokens}")
-            
-            dispositionTokens = fc.generateDispositionTokens()
-            click.echo(f"Disposition Tokens: {dispositionTokens}")
-
-            audioTokens = fc.generateAudioEncodingTokens()
-            click.echo(f"Audio Tokens: {audioTokens}")
 
+            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 []
 
-            targetFilename = fileBasename if context['tmdb'] else mediaFileProperties.assembleTargetFileBasename(label if label else fileBasename,
+            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)
+                                                                                        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'],
@@ -395,9 +526,10 @@ def convert(ctx,
                         preset,
                         denoise)
 
-#     #click.confirm('Warning! This file is not compliant to the defined source schema! Do you want to continue?', abort=True)
+    #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}")
 
 

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

bin/ffx/dashboard_screen.py

@@ -1,16 +0,0 @@
-from textual.app import App, ComposeResult
-from textual.screen import Screen
-from textual.widgets import Header, Footer, Placeholder, Label
-
-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()

bin/ffx/database.py

@@ -11,17 +11,21 @@ from ffx.model.media_tag import MediaTag
 from ffx.model.track_tag import TrackTag
 
 
-def databaseContext():
+def databaseContext(databasePath: str = ''):
 
     databaseContext = {}
 
-    # Initialize DB
+    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:///{os.path.join(ffxVarDir, 'ffx.db')}"
+    databaseContext['url'] = f"sqlite:///{databasePath}"
     databaseContext['engine'] = create_engine(databaseContext['url'])
     databaseContext['session'] = sessionmaker(bind=databaseContext['engine'])
 

bin/ffx/ffx_controller.py

@@ -8,7 +8,7 @@ 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
 
 class FfxController():
 
@@ -53,6 +53,8 @@ class FfxController():
         self.__sourceMediaDescriptor = sourceMediaDescriptor
         self.__targetMediaDescriptor = targetMediaDescriptor
 
+        self.__logger = context['logger']
+
 
     def generateAV1Tokens(self, quality, preset, subIndex : int = 0):
 
@@ -107,7 +109,8 @@ class FfxController():
 
 
     def generateOutputTokens(self, filepath, format, ext):
-        return ['-f', format, f"{filepath}.{ext}"]
+        outputFilePath = f"{filepath}.{ext}"
+        return ['-f', format, outputFilePath]
 
 
     def generateAudioEncodingTokens(self):
@@ -116,7 +119,8 @@ 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 = [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:
@@ -165,27 +169,38 @@ class FfxController():
         return audioTokens
 
 
+    # -disposition:s:0 default -disposition:s:1 0
     def generateDispositionTokens(self):
-        """Source media descriptor is optional"""
 
-        sourceTrackDescriptors = [] if self.__sourceMediaDescriptor is None else self.__sourceMediaDescriptor.getAllTrackDescriptors()
-        targetTrackDescriptors = self.__targetMediaDescriptor.getReorderedTrackDescriptors()
+        targetTrackDescriptors = self.__targetMediaDescriptor.getAllTrackDescriptors()
+
+        sourceTrackDescriptors = ([] if self.__sourceMediaDescriptor is None
+                                    else self.__sourceMediaDescriptor.getAllTrackDescriptors())
+        # if not self.__sourceMediaDescriptor is None:
+        #     sourceTrackDescriptors = self.__sourceMediaDescriptor.getAllTrackDescriptors()
+        # else:
+        #     sourceTrackDescriptors = []
 
         dispositionTokens = []
 
-        # for subStreamIndex in range(len(subDescriptor)):
-        for trackDescriptor in targetTrackDescriptors:
+        for trackIndex in range(len(targetTrackDescriptors)):
 
-            # Calculate source sub index. This applies only if a source media descriptor is defined.
-            if sourceTrackDescriptors:
-                changedTargetTrackDescriptor : TrackDescriptor = targetTrackDescriptors[trackDescriptor.getIndex()]
-                changedTargetTrackSourceIndex = changedTargetTrackDescriptor.getSourceIndex()
-                subIndex = sourceTrackDescriptors[changedTargetTrackSourceIndex].getSubIndex()
-            else:
-                subIndex = trackDescriptor.getSubIndex()
+            td = targetTrackDescriptors[trackIndex]
 
-            streamIndicator = trackDescriptor.getType().indicator()
-            dispositionSet = trackDescriptor.getDispositionSet()
+            #HINT: No dispositions for pgs subtitle tracks that have no external file source
+            if (td.getExternalSourceFilePath()
+                        or td.getCodec() != TrackDescriptor.CODEC_PGS):
+
+                subIndex = td.getSubIndex()
+                streamIndicator = td.getType().indicator()
+                
+
+                sourceDispositionSet = sourceTrackDescriptors[td.getSourceIndex()].getDispositionSet() if sourceTrackDescriptors else set()
+
+                #TODO: Alles discarden was im targetDescriptor vorhanden ist (?)
+                sourceDispositionSet.discard(TrackDisposition.DEFAULT)
+
+                dispositionSet = td.getDispositionSet() | sourceDispositionSet
 
                 if dispositionSet:
                     dispositionTokens += [f"-disposition:{streamIndicator}:{subIndex}", '+'.join([d.label() for d in dispositionSet])]
@@ -196,154 +211,22 @@ class FfxController():
 
 
     def generateMetadataTokens(self):
-        """Source media descriptor is mandatory"""
 
-        mappingTokens = []
+        metadataTokens = []
 
-        # click.echo(f"source media descriptor: track indices={[d.getIndex() for d in sourceMediaDescriptor.getAllTrackDescriptors()]}")
-        # click.echo(f"target media descriptor: track indices={[d.getIndex() for d in targetMediaDescriptor.getAllTrackDescriptors()]}")
+        for tagKey, tagValue in self.__targetMediaDescriptor.getTags().items():
+            metadataTokens += [f"-metadata:g",
+                                f"{tagKey}={tagValue}"]
 
-                            # +jellyfin                     -jellyfin
-        mediaDifferences = self.__targetMediaDescriptor.compare(self.__sourceMediaDescriptor)
+        #HINT: With current ffmpeg version track metadata tags are not passed to the outfile
+        for td in self.__targetMediaDescriptor.getAllTrackDescriptors():
 
-        # media diff {'tracks': {'changed': {4: {'tags': {'added': {'Yolo'}}}}}}
+            for tagKey, tagValue in td.getTags().items():
             
-        click.echo(f"media diff {mediaDifferences}")
+                metadataTokens += [f"-metadata:s:{td.getType().indicator()}:{td.getSubIndex()}",
+                                    f"{tagKey}={tagValue}"]
 
-        if MediaDescriptor.TAGS_KEY in mediaDifferences.keys():
-
-            sourceTags = self.__sourceMediaDescriptor.getTags()
-            targetTags = self.__targetMediaDescriptor.getTags()
-
-
-            if DIFF_REMOVED_KEY in mediaDifferences[MediaDescriptor.TAGS_KEY].keys():
-                # for removedTagKey in mediaDifferences[MediaDescriptor.TAGS_KEY][DIFF_REMOVED_KEY]:
-                    # row = (f"removed media tag: key='{removedTagKey}' value='{sourceTags[removedTagKey]}'",)
-                    # self.differencesTable.add_row(*map(str, row))
-                mappingTokens += [f"-map_metadata:g", "-1"]
-                
-                for targetMediaTagKey in targetTags:
-                    mappingTokens += [f"-metadata:g", f"{targetMediaTagKey}={targetTags[targetMediaTagKey]}"]
-
-            else:
-
-                if DIFF_ADDED_KEY in mediaDifferences[MediaDescriptor.TAGS_KEY].keys():
-                    for addedTagKey in mediaDifferences[MediaDescriptor.TAGS_KEY][DIFF_ADDED_KEY]:
-                        # row = (f"added media tag: key='{addedTagKey}' value='{targetTags[addedTagKey]}'",)
-                        click.echo(f"added metadata key='{addedTagKey}' value='{targetTags[addedTagKey]}'->'{targetTags[addedTagKey]}'")
-                        # self.differencesTable.add_row(*map(str, row))
-                        #pass 
-                        mappingTokens += [f"-metadata:g", f"{addedTagKey}={targetTags[addedTagKey]}"]
-
-
-
-                if DIFF_CHANGED_KEY in mediaDifferences[MediaDescriptor.TAGS_KEY].keys():
-                    for changedTagKey in mediaDifferences[MediaDescriptor.TAGS_KEY][DIFF_CHANGED_KEY]:
-                        #row = (f"changed media tag: key='{changedTagKey}' value='{sourceTags[changedTagKey]}'->'{targetTags[changedTagKey]}'",)
-                        click.echo(f"changed metadata key='{changedTagKey}' value='{sourceTags[changedTagKey]}'->'{targetTags[changedTagKey]}'")
-                        # self.differencesTable.add_row(*map(str, row))
-                        #pass
-                        mappingTokens += [f"-metadata:g", f"{changedTagKey}={targetTags[changedTagKey]}"]
-
-        if MediaDescriptor.TRACKS_KEY in mediaDifferences.keys():
-
-            sourceTrackDescriptors = self.__sourceMediaDescriptor.getAllTrackDescriptors()
-            targetTrackDescriptors = self.__targetMediaDescriptor.getReorderedTrackDescriptors()
-
-            if DIFF_ADDED_KEY in mediaDifferences[MediaDescriptor.TRACKS_KEY].keys():
-                addedTracksIndices = mediaDifferences[MediaDescriptor.TRACKS_KEY][DIFF_ADDED_KEY]
-                raise click.ClickException(f"FfxController.generateMetadataTokens(): Adding tracks is not supported. Track indices {addedTracksIndices}")
-
-                #raise click.ClickException(f"add track {mediaDifferences[MediaDescriptor.TRACKS_KEY][DIFF_ADDED_KEY]}")
-                #for addedTrackIndex in mediaDifferences[MediaDescriptor.TRACKS_KEY][DIFF_ADDED_KEY]:
-                    #addedTrack : Track = targetTrackDescriptors[addedTrackIndex]                        
-                    # row = (f"added {addedTrack.getType().label()} track: index={addedTrackIndex} lang={addedTrack.getLanguage().threeLetter()}",)
-                    # self.differencesTable.add_row(*map(str, row))  
-
-            if DIFF_REMOVED_KEY in mediaDifferences[MediaDescriptor.TRACKS_KEY].keys():
-                removedTracksIndices = mediaDifferences[MediaDescriptor.TRACKS_KEY][DIFF_ADDED_KEY].keys()
-                raise click.ClickException(f"FfxController.generateMetadataTokens(): Removing tracks is not supported. Track indices {removedTracksIndices}")
-                #for removedTrackIndex in mediaDifferences[MediaDescriptor.TRACKS_KEY][DIFF_REMOVED_KEY]:
-                    # row = (f"removed track: index={removedTrackIndex}",)
-                    # self.differencesTable.add_row(*map(str, row))  
-
-            # media diff {'tracks': {'changed': {4: {'tags': {'added': {'Yolo'}}}}}}
-            if DIFF_CHANGED_KEY in mediaDifferences[MediaDescriptor.TRACKS_KEY].keys():
-                for changedTrackIndex in mediaDifferences[MediaDescriptor.TRACKS_KEY][DIFF_CHANGED_KEY].keys():
-
-                    changedTargetTrackDescriptor : TrackDescriptor = targetTrackDescriptors[changedTrackIndex]
-                    changedTargetTrackSourceIndex = changedTargetTrackDescriptor.getSourceIndex()
-                    changedTargetSourceSubIndex = sourceTrackDescriptors[changedTargetTrackSourceIndex].getSubIndex()
-                    # changedSourceTrackDescriptor : TrackDescriptor = sourceTrackDescriptors[changedTargetTrackSourceIndex]
-                    # changedSourceTrackSubIndex = changedSourceTrackDescriptor.getSubIndex()
-
-                    changedTrackDiff : dict = mediaDifferences[MediaDescriptor.TRACKS_KEY][DIFF_CHANGED_KEY][changedTrackIndex]                        
-
-                    if MediaDescriptor.TAGS_KEY in changedTrackDiff.keys():
-
-
-                        if DIFF_REMOVED_KEY in changedTrackDiff[MediaDescriptor.TAGS_KEY]:
-                            #for removedTagKey in changedTrackDiff[MediaDescriptor.TAGS_KEY][DIFF_REMOVED_KEY]:
-                                # row = (f"changed {changedTargetTrackDescriptor.getType().label()} track index={changedTrackIndex} removed key={removedTagKey}",)
-                                # self.differencesTable.add_row(*map(str, row))
-                                
-                                #addedTagValue = targetTrackDescriptors[changedTargetTrackSourceIndex].getTags()[addedTagKey]
-
-                            mappingTokens += [f"-map_metadata:s:{changedTargetTrackDescriptor.getType().indicator()}:{changedTargetSourceSubIndex}", "-1"]
-                            
-                            for targetTrackTagKey, targetTrackTagValue in changedTargetTrackDescriptor.getTags():
-                                mappingTokens += [f"-metadata:s:{changedTargetTrackDescriptor.getType().indicator()}:{changedTargetSourceSubIndex}",
-                                                        f"{targetTrackTagKey}={targetTrackTagValue}"]
-
-                        else:
-
-                            # media diff {'tracks': {'changed': {4: {'tags': {'added': {'Yolo'}}}}}}
-                            if DIFF_ADDED_KEY in changedTrackDiff[MediaDescriptor.TAGS_KEY]:
-                                for addedTagKey in changedTrackDiff[MediaDescriptor.TAGS_KEY][DIFF_ADDED_KEY]:
-
-                                    addedTagValue = targetTrackDescriptors[changedTargetTrackSourceIndex].getTags()[addedTagKey]
-                                    
-                                    # addedTagValue = changedTrackDiff[MediaDescriptor.TAGS_KEY][DIFF_ADDED_KEY][addedTagKey]
-
-                                    # click.echo(f"addedTagValue={addedTagValue}")
-                                    # click.echo(f"sourceTrackDescriptors: subindex={[s.getSubIndex() for s in sourceTrackDescriptors]} sourceindex={[s.getSourceIndex() for s in sourceTrackDescriptors]} tags={[s.getTags() for s in sourceTrackDescriptors]}")
-                                    # click.echo(f"targetTrackDescriptors: subindex={[t.getSubIndex() for t in targetTrackDescriptors]} sourceindex={[t.getSourceIndex() for t in targetTrackDescriptors]} tags={[t.getTags() for t in targetTrackDescriptors]}")
-                                    # click.echo(f"changed track_index={changedTrackIndex} indicator={changedTargetTrackDescriptor.getType().indicator()} key={addedTagKey} value={addedTagValue} source_index={changedSourceTrackIndex}")
-                                    
-                                    mappingTokens += [f"-metadata:s:{changedTargetTrackDescriptor.getType().indicator()}:{changedTargetSourceSubIndex}",
-                                                        f"{addedTagKey}={addedTagValue}"]
-
-                            # media diff {'tracks': {'changed': {4: {'tags': {'added': {'Yolo'}}}}}}
-                            if DIFF_CHANGED_KEY in changedTrackDiff[MediaDescriptor.TAGS_KEY]:
-                                for changedTagKey in changedTrackDiff[MediaDescriptor.TAGS_KEY][DIFF_CHANGED_KEY]:
-
-                                    changedTagValue = targetTrackDescriptors[changedTargetTrackSourceIndex].getTags()[changedTagKey]
-                                    # sourceSubIndex = sourceTrackDescriptors[changedTargetTrackSourceIndex].getSubIndex()
-                                    # addedTagValue = changedTrackDiff[MediaDescriptor.TAGS_KEY][DIFF_ADDED_KEY][addedTagKey]
-
-                                    # click.echo(f"addedTagValue={addedTagValue}")
-                                    # click.echo(f"sourceTrackDescriptors: subindex={[s.getSubIndex() for s in sourceTrackDescriptors]} sourceindex={[s.getSourceIndex() for s in sourceTrackDescriptors]} tags={[s.getTags() for s in sourceTrackDescriptors]}")
-                                    # click.echo(f"targetTrackDescriptors: subindex={[t.getSubIndex() for t in targetTrackDescriptors]} sourceindex={[t.getSourceIndex() for t in targetTrackDescriptors]} tags={[t.getTags() for t in targetTrackDescriptors]}")
-                                    # click.echo(f"changed track_index={changedTrackIndex} indicator={changedTargetTrackDescriptor.getType().indicator()} key={addedTagKey} value={addedTagValue} source_index={changedSourceTrackIndex}")
-                                    
-                                    mappingTokens += [f"-metadata:s:{changedTargetTrackDescriptor.getType().indicator()}:{changedTargetSourceSubIndex}",
-                                                        f"{changedTagKey}={changedTagValue}"]
-
-                    # if TrackDescriptor.DISPOSITION_SET_KEY in changedTrackDiff.keys():
-
-                    #     if DIFF_ADDED_KEY in changedTrackDiff[TrackDescriptor.DISPOSITION_SET_KEY]:
-                    #         for addedDisposition in changedTrackDiff[TrackDescriptor.DISPOSITION_SET_KEY][DIFF_ADDED_KEY]:
-                    #             # row = (f"changed {changedTargetTrackDescriptor.getType().label()} track index={changedTrackIndex} added disposition={addedDisposition.label()}",)
-                    #             # self.differencesTable.add_row(*map(str, row))
-                    #             pass
-
-                    #     if DIFF_REMOVED_KEY in changedTrackDiff[TrackDescriptor.DISPOSITION_SET_KEY]:
-                    #         for removedDisposition in changedTrackDiff[TrackDescriptor.DISPOSITION_SET_KEY][DIFF_REMOVED_KEY]:
-                    #             # row = (f"changed {changedTargetTrackDescriptor.getType().label()} track index={changedTrackIndex} removed disposition={removedDisposition.label()}",)
-                    #             # self.differencesTable.add_row(*map(str, row))
-                    #             pass
-
-        return mappingTokens
+        return metadataTokens
 
 
     def runJob(self,
@@ -354,6 +237,7 @@ class FfxController():
                 preset: int = DEFAULT_AV1_PRESET,
                 denoise: bool = False):
 
+        # self.__targetMediaDescriptor order OK
 
         commandTokens = FfxController.COMMAND_TOKENS + ['-i', sourcePath]
 
@@ -381,7 +265,7 @@ class FfxController():
                                                             FfxController.DEFAULT_FILE_FORMAT,
                                                             FfxController.DEFAULT_FILE_EXTENSION)
 
-            click.echo(f"Command: {' '.join(commandSequence)}")
+            self.__logger.debug(f"FfxController.runJon() commandSequence:{' '.join(commandSequence)}")
 
             if not self.__context['dry_run']:
                 executeProcess(commandSequence)
@@ -390,15 +274,15 @@ class FfxController():
         if videoEncoder == VideoEncoder.VP9:
 
             commandSequence1 = (commandTokens
-                                    + self.__targetMediaDescriptor.getInputMappingTokens()
+                                    + self.__targetMediaDescriptor.getInputMappingTokens(only_video=True)
                                     + self.generateVP9Pass1Tokens(int(quality)))
 
             if self.__context['perform_crop']:
-                commandSequence1 += FfxController.generateCropTokens()
+                commandSequence1 += self.generateCropTokens()
 
             commandSequence1 += FfxController.NULL_TOKENS
 
-            click.echo(f"Command 1: {' '.join(commandSequence1)}")
+            self.__logger.debug(f"FfxController.runJon() commandSequence1:{' '.join(commandSequence1)}")
 
             if os.path.exists(FfxController.TEMP_FILE_NAME):
                 os.remove(FfxController.TEMP_FILE_NAME)
@@ -420,13 +304,40 @@ class FfxController():
             commandSequence2 += self.generateVP9Pass2Tokens(int(quality)) + self.generateAudioEncodingTokens()
 
             if self.__context['perform_crop']:
-                commandSequence2 += FfxController.generateCropTokens()
+                commandSequence2 += self.generateCropTokens()
 
             commandSequence2 += self.generateOutputTokens(targetPath,
                                                             FfxController.DEFAULT_FILE_FORMAT,
                                                             FfxController.DEFAULT_FILE_EXTENSION)
 
-            click.echo(f"Command 2: {' '.join(commandSequence2)}")
+            self.__logger.debug(f"FfxController.runJon() commandSequence2:{' '.join(commandSequence2)}")
 
             if not self.__context['dry_run']:            
-                executeProcess(commandSequence2)
+                out, err, rc = executeProcess(commandSequence2)
+                if rc:
+                    raise click.ClickException(f"Command resulted in error: rc={rc} error={err}")
+
+
+
+    def createEmptyFile(self,
+                        path: str = 'output.mp4',
+                        sizeX: int = 1280,
+                        sizeY: int = 720,
+                        rate: int = 25,
+                        length: int = 10):
+
+        commandTokens = FfxController.COMMAND_TOKENS
+
+        commandTokens += ['-f',
+                            'lavfi',
+                            '-i',
+                            f"color=size={sizeX}x{sizeY}:rate={rate}:color=black",
+                            '-f',
+                            'lavfi',
+                            '-i',
+                            'anullsrc=channel_layout=stereo:sample_rate=44100',
+                            '-t',
+                            str(length),
+                            path]
+
+        out, err, rc = executeProcess(commandTokens)

bin/ffx/file_properties.py

@@ -23,6 +23,8 @@ class FileProperties():
 
         self.context = context
 
+        self.__logger = context['logger']
+
         # Separate basedir, basename and extension for current source file
         self.__sourcePath = sourcePath
 
@@ -41,24 +43,35 @@ class FileProperties():
 
         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
 
-        matchedGroups = matchResult['match'].groups() if matchResult else {}
-        seIndicator = matchedGroups[0] if matchedGroups else self.__sourceFilename
+        if matchResult:
+            databaseMatchedGroups = matchResult['match'].groups()
+            self.__season = databaseMatchedGroups[0]
+            self.__episode = databaseMatchedGroups[1]
  
-        se_match = re.search(FileProperties.SEASON_EPISODE_INDICATOR_MATCH, seIndicator)
-        e_match = re.search(FileProperties.EPISODE_INDICATOR_MATCH, seIndicator)
+        else:
+            self.__logger.debug(f"FileProperties.__init__(): Checking file name for indicator {self.__sourceFilename}")
 
-        self.__season = -1
-        self.__episode = -1
+            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):
@@ -167,7 +180,7 @@ class FileProperties():
 
 
     def getMediaDescriptor(self):
-        return MediaDescriptor.fromFfprobe(self.getFormatData(), self.getStreamData())
+        return MediaDescriptor.fromFfprobe(self.context, self.getFormatData(), self.getStreamData())
 
 
     def getShowId(self) -> int:
@@ -186,6 +199,13 @@ class FileProperties():
         return int(self.__episode)
 
 
+    def getFilename(self):
+        return self.__sourceFilename
+
+    def getFileBasename(self):
+        return self.__sourceFileBasename
+
+
     def assembleTargetFileBasename(self,
                                 label: str = "",
                                 quality: int = -1,
@@ -204,9 +224,10 @@ class FileProperties():
 
         # targetFilenameExtension = FfxController.DEFAULT_FILE_EXTENSION if extension is None else str(extension)
 
-        if not label:
-            targetFilenameTokens = [self.__sourceFileBasename]
-        else:                
+        click.echo(f"assembleTargetFileBasename(): label={label} is {'truthy' if label else 'falsy'}")
+
+        if label:
+
             targetFilenameTokens = [label]
 
             if fileIndex > -1:
@@ -216,6 +237,10 @@ class FileProperties():
             elif self.__episode > -1:
                 targetFilenameTokens += [f"E{self.__episode:0{episode_digits}d}"]
 
+        else:                
+            targetFilenameTokens = [self.__sourceFileBasename]
+
+
         if quality != -1:
             targetFilenameTokens += [f"q{quality}"]
 
@@ -226,6 +251,7 @@ class FileProperties():
 
         targetFilename = '_'.join(targetFilenameTokens)
 
-        click.echo(f"Target filename: {targetFilename}")
+        #self.__logger.debug(f"assembleTargetFileBasename(): Target filename: {targetFilename}")
+        click.echo(f"assembleTargetFileBasename(): Target filename: {targetFilename}")
 
         return targetFilename

bin/ffx/helper.py

@@ -1,3 +1,5 @@
+import click
+
 DIFF_ADDED_KEY = 'added'
 DIFF_REMOVED_KEY = 'removed'
 DIFF_CHANGED_KEY = 'changed'
@@ -27,6 +29,14 @@ def dictDiff(a : dict, b : dict):
 
     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:
 
@@ -42,6 +52,10 @@ def setDiff(a : set, b : set) -> set:
 
     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

bin/ffx/media_controller.py

@@ -0,0 +1,47 @@
+import click, re
+
+from ffx.model.pattern import Pattern
+from ffx.media_descriptor import MediaDescriptor
+
+from ffx.tag_controller import TagController
+from ffx.track_controller import TrackController
+
+class MediaController():
+    
+    def __init__(self, context):
+        
+        self.context = context
+        self.Session = self.context['database']['session'] # convenience
+
+        self.__logger = context['logger']
+
+        self.__tc = TrackController(context = context)
+        self.__tac = TagController(context = context)
+
+    def setPatternMediaDescriptor(self, mediaDescriptor: MediaDescriptor, patternId: int):
+
+        try:
+
+            pid = int(patternId)
+
+            s = self.Session()
+            q = s.query(Pattern).filter(Pattern.id == pid)
+
+            if q.count():
+                pattern = q.first
+
+                for mediaTagKey, mediaTagValue in mediaDescriptor.getTags():
+                    self.__tac.updateMediaTag(pid, mediaTagKey, mediaTagValue)
+                for trackDescriptor in mediaDescriptor.getAllTrackDescriptors():
+                    self.__tc.addTrack(trackDescriptor, patternId = pid)
+
+                s.commit()
+                return True
+            else:
+                return False
+
+        except Exception as ex:
+            self.__logger.error(f"MediaController.setPatternMediaDescriptor(): {repr(ex)}")
+            raise click.ClickException(f"MediaController.setPatternMediaDescriptor(): {repr(ex)}")
+        finally:
+            s.close()

bin/ffx/media_descriptor.py

@@ -1,6 +1,4 @@
-import os
-import re
-import click
+import os, re, click, logging
 
 from typing import List, Self
 
@@ -27,7 +25,7 @@ class MediaDescriptor:
     FFPROBE_TAGS_KEY = "tags"
     FFPROBE_CODEC_TYPE_KEY = "codec_type"
 
-    JELLYFIN_ORDER_FLAG_KEY = "jellyfin_order"
+    # JELLYFIN_ORDER_FLAG_KEY = "jellyfin_order"
 
     EXCLUDED_MEDIA_TAGS = ["creation_time"]
 
@@ -36,6 +34,17 @@ class MediaDescriptor:
 
     def __init__(self, **kwargs):
 
+        if MediaDescriptor.CONTEXT_KEY in kwargs.keys():
+            if type(kwargs[MediaDescriptor.CONTEXT_KEY]) is not dict:
+                raise TypeError(
+                    f"MediaDescriptor.__init__(): Argument {MediaDescriptor.CONTEXT_KEY} is required to be of type dict"
+                )
+            self.__context = kwargs[MediaDescriptor.CONTEXT_KEY]
+            self.__logger = self.__context['logger']
+        else:
+            self.__context = {}
+            self.__logger = logging.getLogger('FFX').addHandler(logging.NullHandler())
+
         if MediaDescriptor.TAGS_KEY in kwargs.keys():
             if type(kwargs[MediaDescriptor.TAGS_KEY]) is not dict:
                 raise TypeError(
@@ -61,95 +70,16 @@ class MediaDescriptor:
         else:
             self.__trackDescriptors = []
 
-        if MediaDescriptor.CLEAR_TAGS_FLAG_KEY in kwargs.keys():
-            if type(kwargs[MediaDescriptor.CLEAR_TAGS_FLAG_KEY]) is not bool:
-                raise TypeError(
-                    f"MediaDescriptor.__init__(): Argument {MediaDescriptor.CLEAR_TAGS_FLAG_KEY} is required to be of type bool"
-                )
-            self.__clearTags = kwargs[MediaDescriptor.CLEAR_TAGS_FLAG_KEY]
-        else:
-            self.__clearTags = False
+        # if MediaDescriptor.JELLYFIN_ORDER_FLAG_KEY in kwargs.keys():
+        #     if type(kwargs[MediaDescriptor.JELLYFIN_ORDER_FLAG_KEY]) is not bool:
+        #         raise TypeError(
+        #             f"MediaDescriptor.__init__(): Argument {MediaDescriptor.JELLYFIN_ORDER_FLAG_KEY} is required to be of type bool"
+        #         )
+        #     self.__jellyfinOrder = kwargs[MediaDescriptor.JELLYFIN_ORDER_FLAG_KEY]
+        # else:
+        #     self.__jellyfinOrder = False
+        self.__jellyfinOrder = self.__context['use_jellyfin'] if 'use_jellyfin' in self.__context.keys() else False
 
-        if MediaDescriptor.JELLYFIN_ORDER_FLAG_KEY in kwargs.keys():
-            if type(kwargs[MediaDescriptor.JELLYFIN_ORDER_FLAG_KEY]) is not bool:
-                raise TypeError(
-                    f"MediaDescriptor.__init__(): Argument {MediaDescriptor.JELLYFIN_ORDER_FLAG_KEY} is required to be of type bool"
-                )
-            self.__jellyfinOrder = kwargs[MediaDescriptor.JELLYFIN_ORDER_FLAG_KEY]
-        else:
-            self.__jellyfinOrder = False
-
-    def getDefaultVideoTrack(self):
-        videoDefaultTracks = [
-            v
-            for v in self.getVideoTracks()
-            if TrackDisposition.DEFAULT in v.getDispositionSet()
-        ]
-        if len(videoDefaultTracks) > 1:
-            raise ValueError(
-                "MediaDescriptor.getDefaultVideoTrack(): More than one default video track is not supported"
-            )
-        return videoDefaultTracks[0] if videoDefaultTracks else None
-
-    def getForcedVideoTrack(self):
-        videoForcedTracks = [
-            v
-            for v in self.getVideoTracks()
-            if TrackDisposition.FORCED in v.getDispositionSet()
-        ]
-        if len(videoForcedTracks) > 1:
-            raise ValueError(
-                "MediaDescriptor.getForcedVideoTrack(): More than one forced video track is not supported"
-            )
-        return videoForcedTracks[0] if videoForcedTracks else None
-
-    def getDefaultAudioTrack(self):
-        audioDefaultTracks = [
-            a
-            for a in self.getAudioTracks()
-            if TrackDisposition.DEFAULT in a.getDispositionSet()
-        ]
-        if len(audioDefaultTracks) > 1:
-            raise ValueError(
-                "MediaDescriptor.getDefaultAudioTrack(): More than one default audio track is not supported"
-            )
-        return audioDefaultTracks[0] if audioDefaultTracks else None
-
-    def getForcedAudioTrack(self):
-        audioForcedTracks = [
-            a
-            for a in self.getAudioTracks()
-            if TrackDisposition.FORCED in a.getDispositionSet()
-        ]
-        if len(audioForcedTracks) > 1:
-            raise ValueError(
-                "MediaDescriptor.getForcedAudioTrack(): More than one forced audio track is not supported"
-            )
-        return audioForcedTracks[0] if audioForcedTracks else None
-
-    def getDefaultSubtitleTrack(self):
-        subtitleDefaultTracks = [
-            s
-            for s in self.getSubtitleTracks()
-            if TrackDisposition.DEFAULT in s.getDispositionSet()
-        ]
-        if len(subtitleDefaultTracks) > 1:
-            raise ValueError(
-                "MediaDescriptor.getDefaultSubtitleTrack(): More than one default subtitle track is not supported"
-            )
-        return subtitleDefaultTracks[0] if subtitleDefaultTracks else None
-
-    def getForcedSubtitleTrack(self):
-        subtitleForcedTracks = [
-            s
-            for s in self.getSubtitleTracks()
-            if TrackDisposition.FORCED in s.getDispositionSet()
-        ]
-        if len(subtitleForcedTracks) > 1:
-            raise ValueError(
-                "MediaDescriptor.getForcedSubtitleTrack(): More than one forced subtitle track is not supported"
-            )
-        return subtitleForcedTracks[0] if subtitleForcedTracks else None
 
     def setDefaultSubTrack(self, trackType: TrackType, subIndex: int):
         for t in self.getAllTrackDescriptors():
@@ -165,62 +95,98 @@ class MediaDescriptor:
                     TrackDisposition.FORCED, t.getSubIndex() == int(subIndex)
                 )
 
-    def checkDefaultAndForcedDispositions(self):
-        try:
-            self.getDefaultVideoTrack()
-            self.getForcedVideoTrack()
-            self.getDefaultAudioTrack()
-            self.getForcedAudioTrack()
-            self.getDefaultSubtitleTrack()
-            self.getForcedSubtitleTrack()
-            return True
-        except ValueError:
-            return False
+    def checkConfiguration(self):
 
-    def getReorderedTrackDescriptors(self):
+        videoTracks = self.getVideoTracks()
+        audioTracks = self.getAudioTracks()
+        subtitleTracks = self.getSubtitleTracks()
         
-        videoTracks = self.sortSubIndices(self.getVideoTracks())
-        audioTracks = self.sortSubIndices(self.getAudioTracks())
-        subtitleTracks = self.sortSubIndices(self.getSubtitleTracks())
+        if len([v for v in videoTracks if v.getDispositionFlag(TrackDisposition.DEFAULT)]) > 1:
+            raise ValueError('More than one default video track')
+        if len([a for a in audioTracks if a.getDispositionFlag(TrackDisposition.DEFAULT)]) > 1:
+            raise ValueError('More than one default audio track')
+        if len([s for s in subtitleTracks if s.getDispositionFlag(TrackDisposition.DEFAULT)]) > 1:
+            raise ValueError('More than one default subtitle track')
 
-        videoDefaultTrack = self.getDefaultVideoTrack()
-        self.getForcedVideoTrack()
-        audioDefaultTrack = self.getDefaultAudioTrack()
-        self.getForcedAudioTrack()
-        subtitleDefaultTrack = self.getDefaultSubtitleTrack()
-        self.getForcedSubtitleTrack()
+        if len([v for v in videoTracks if v.getDispositionFlag(TrackDisposition.FORCED)]) > 1:
+            raise ValueError('More than one forced video track')
+        if len([a for a in audioTracks if a.getDispositionFlag(TrackDisposition.FORCED)]) > 1:
+            raise ValueError('More than one forced audio track')
+        if len([s for s in subtitleTracks if s.getDispositionFlag(TrackDisposition.FORCED)]) > 1:
+            raise ValueError('More than one forced subtitle track')
 
-        if self.__jellyfinOrder:
-            if not videoDefaultTrack is None:
-                videoTracks.append(
-                    videoTracks.pop(videoTracks.index(videoDefaultTrack))
-                )
-            if not audioDefaultTrack is None:
-                audioTracks.append(
-                    audioTracks.pop(audioTracks.index(audioDefaultTrack))
-                )
-            if not subtitleDefaultTrack is None:
-                subtitleTracks.append(
-                    subtitleTracks.pop(subtitleTracks.index(subtitleDefaultTrack))
-                )
-
-        reorderedTrackDescriptors = videoTracks + audioTracks + subtitleTracks
-        orderedSourceTrackSequence = [
-            t.getSourceIndex() for t in reorderedTrackDescriptors
+        trackDescriptors = videoTracks + audioTracks + subtitleTracks
+        sourceIndices = [
+            t.getSourceIndex() for t in trackDescriptors
         ]
+        if len(set(sourceIndices)) < len(trackDescriptors):
+            raise ValueError('Multiple streams originating from the same source stream')
 
-        if len(set(orderedSourceTrackSequence)) < len(orderedSourceTrackSequence):
-            raise ValueError(
-                f"Multiple streams originating from the same source stream not supported"
-            )
 
-        return reorderedTrackDescriptors
+    def applySourceIndices(self, sourceMediaDescriptor: Self):
+        sourceTrackDescriptors = sourceMediaDescriptor.getAllTrackDescriptors()
+
+        numTrackDescriptors = len(self.__trackDescriptors)
+        if len(sourceTrackDescriptors) != numTrackDescriptors:
+            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 applyJellyfinOrder(self):
+        """Reorder subtracks in types with default the last, then make subindices flat again"""
+
+        # videoTracks = self.sortSubIndices(self.getVideoTracks())
+        # audioTracks = self.sortSubIndices(self.getAudioTracks())
+        # subtitleTracks = self.sortSubIndices(self.getSubtitleTracks())
+
+        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()
+
 
     @classmethod
-    def fromFfprobe(cls, formatData, streamData):
+    def fromFfprobe(cls, context, formatData, streamData):
 
         kwargs = {}
 
+        kwargs[MediaDescriptor.CONTEXT_KEY] = context
+
         if MediaDescriptor.FFPROBE_TAGS_KEY in formatData.keys():
             kwargs[MediaDescriptor.TAGS_KEY] = formatData[
                 MediaDescriptor.FFPROBE_TAGS_KEY
@@ -253,50 +219,69 @@ class MediaDescriptor:
     def getTags(self):
         return self.__mediaTags
 
+
     def sortSubIndices(
         self, descriptors: List[TrackDescriptor]
     ) -> List[TrackDescriptor]:
         subIndex = 0
-        for t in descriptors:
-            t.setSubIndex(subIndex)
+        for d in descriptors:
+            d.setSubIndex(subIndex)
             subIndex += 1
         return descriptors
 
+    def reindexSubIndices(self, trackDescriptors: list = []):
+        tdList = trackDescriptors if trackDescriptors else self.__trackDescriptors
+        subIndexCounter = {}
+        for td in tdList:
+            trackType = td.getType()
+            if trackType not in subIndexCounter.keys():
+                subIndexCounter[trackType] = 0
+            td.setSubIndex(subIndexCounter[trackType])
+            subIndexCounter[trackType] += 1
+
+    def sortIndices(
+        self, descriptors: List[TrackDescriptor]
+    ) -> List[TrackDescriptor]:
+        index = 0
+        for d in descriptors:
+            d.setIndex(index)
+            index += 1
+        return descriptors
+
+    def reindexIndices(self, trackDescriptors: list = []):
+        tdList = trackDescriptors if trackDescriptors else self.__trackDescriptors
+        for trackIndex in range(len(tdList)):
+            tdList[trackIndex].setIndex(trackIndex)
+
+
     def getAllTrackDescriptors(self) -> List[TrackDescriptor]:
         return self.getVideoTracks() + self.getAudioTracks() + self.getSubtitleTracks()
 
     def getVideoTracks(self) -> List[TrackDescriptor]:
         return [
-            v for v in self.__trackDescriptors.copy() if v.getType() == TrackType.VIDEO
+            v for v in self.__trackDescriptors if v.getType() == TrackType.VIDEO
         ]
 
     def getAudioTracks(self) -> List[TrackDescriptor]:
         return [
-            a for a in self.__trackDescriptors.copy() if a.getType() == TrackType.AUDIO
+            a for a in self.__trackDescriptors if a.getType() == TrackType.AUDIO
         ]
 
     def getSubtitleTracks(self) -> List[TrackDescriptor]:
         return [
             s
-            for s in self.__trackDescriptors.copy()
+            for s in self.__trackDescriptors
             if s.getType() == TrackType.SUBTITLE
         ]
 
-    def getJellyfin(self):
-        return self.__jellyfinOrder
-
-    def setJellyfinOrder(self, state):
-        self.__jellyfinOrder = state
-
-    def getClearTags(self):
-        return self.__clearTags
 
     def compare(self, vsMediaDescriptor: Self):
 
         if not isinstance(vsMediaDescriptor, self.__class__):
-            raise click.ClickException(
-                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__}"
+            self.__logger.error(errorMessage)
+            # raise click.ClickException(errorMessage)
+            click.Abort()
 
         vsTags = vsMediaDescriptor.getTags()
         tags = self.getTags()
@@ -317,7 +302,7 @@ class MediaDescriptor:
 
         # Target track configuration (from DB)
         # tracks = self.getAllTrackDescriptors()
-        tracks = self.getReorderedTrackDescriptors()
+        tracks = self.getAllTrackDescriptors() # filtern
         numTracks = len(tracks)
 
         # Current track configuration (of file)
@@ -369,16 +354,18 @@ class MediaDescriptor:
 
         return compareResult
 
+
     def getImportFileTokens(self, use_sub_index: bool = True):
 
-        reorderedTrackDescriptors = self.getReorderedTrackDescriptors()
+        # reorderedTrackDescriptors = self.getReorderedTrackDescriptors()
         importFileTokens = []
 
-        for rtd in reorderedTrackDescriptors:
+        #for rtd in reorderedTrackDescriptors:
+        for td in self.__trackDescriptors:
 
-            importedFilePath = rtd.getExternalSourceFilePath()
+            importedFilePath = td.getExternalSourceFilePath()
 
-            if not importedFilePath is None:
+            if importedFilePath:
                 importFileTokens += [
                     "-i",
                     importedFilePath,
@@ -386,39 +373,70 @@ class MediaDescriptor:
 
         return importFileTokens
 
-    def getInputMappingTokens(self, use_sub_index: bool = True):
 
-        reorderedTrackDescriptors = self.getReorderedTrackDescriptors()
+    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
-        for rtd in reorderedTrackDescriptors:
+        for trackIndex in range(len(self.__trackDescriptors)):
 
-            importedFilePath = rtd.getExternalSourceFilePath()
+            td = self.__trackDescriptors[trackIndex]
+
+            stdi = self.__trackDescriptors[td.getSourceIndex()].getIndex()
+            stdsi = self.__trackDescriptors[td.getSourceIndex()].getSubIndex()
+
+            # 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):
+
+                importedFilePath = td.getExternalSourceFilePath()
 
-            trackType = rtd.getType()
                 if use_sub_index:
-                if importedFilePath is None:
-                    inputMappingTokens += [
-                        "-map",
-                        f"0:{trackType.indicator()}:{rtd.getSubIndex()}",
-                    ]
-                else:
+
+                    if importedFilePath:
+
                         inputMappingTokens += [
                             "-map",
                             f"{filePointer}:{trackType.indicator()}:0",
                         ]
                         filePointer += 1
+
                     else:
-                inputMappingTokens += ["-map", f"0:{rtd.getIndex()}"]
+
+                        if td.getCodec() != TrackDescriptor.CODEC_PGS:
+                            inputMappingTokens += [
+                                "-map",
+                                f"0:{trackType.indicator()}:{stdsi}",
+                            ]
+
+                else:
+                    if td.getCodec() != TrackDescriptor.CODEC_PGS:
+                        inputMappingTokens += ["-map", f"0:{stdi}"]
 
         return inputMappingTokens
 
-    def searchSubtitleFiles(searchDirectory, prefix):
+
+    def searchSubtitleFiles(self, searchDirectory, prefix):
 
         sesl_match = re.compile(MediaDescriptor.SEASON_EPISODE_STREAM_LANGUAGE_MATCH)
 
-        availableFileSubtitleDescriptors = []
+        subtitleFileDescriptors = []
         for subtitleFilename in os.listdir(searchDirectory):
             if subtitleFilename.startswith(prefix) and subtitleFilename.endswith(
                 "." + MediaDescriptor.SUBTITLE_FILE_EXTENSION
@@ -432,48 +450,62 @@ class MediaDescriptor:
                         subtitleFileDescriptor["path"] = subtitleFilePath
                         subtitleFileDescriptor["season"] = int(sesl_result.group(1))
                         subtitleFileDescriptor["episode"] = int(sesl_result.group(2))
-                        subtitleFileDescriptor["stream"] = int(sesl_result.group(3))
+                        subtitleFileDescriptor["index"] = int(sesl_result.group(3))
                         subtitleFileDescriptor["language"] = sesl_result.group(4)
 
-                        availableFileSubtitleDescriptors.append(subtitleFileDescriptor)
+                        subtitleFileDescriptors.append(subtitleFileDescriptor)
 
-        click.echo(
-            f"Found {len(availableFileSubtitleDescriptors)} subtitles in files\n"
-        )
+        self.__logger.debug(f"searchSubtitleFiles(): Available subtitle files {subtitleFileDescriptors}")
 
-        return availableFileSubtitleDescriptors
+        return subtitleFileDescriptors
 
-    def importSubtitles(
-        self, searchDirectory, prefix, season: int = -1, episode: int = -1
-    ):
 
-        availableFileSubtitleDescriptors = self.searchSubtitleFiles(
-            searchDirectory, prefix
-        )
+    def importSubtitles(self, searchDirectory, prefix, season: int = -1, episode: int = -1):
+        
+        # click.echo(f"Season: {season} Episode: {episode}")
+        self.__logger.debug(f"importSubtitles(): Season: {season} Episode: {episode}")
+
+        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")
 
-        matchingFileSubtitleDescriptors = (
+        matchingSubtitleFileDescriptors = (
             sorted(
                 [
                     d
                     for d in availableFileSubtitleDescriptors
                     if d["season"] == int(season) and d["episode"] == int(episode)
                 ],
-                key=lambda d: d["stream"],
+                key=lambda d: d["index"],
             )
             if availableFileSubtitleDescriptors
             else []
         )
 
-        for mfsd in matchingFileSubtitleDescriptors:
-            matchingSubtitleTrackDescriptor = [
-                s for s in subtitleTracks if s.getIndex() == mfsd["stream"]
-            ]
+        # 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:
-                matchingSubtitleTrackDescriptor[0].setExternalSourceFilePath(
-                    mfsd["path"]
-                )
+                # click.echo(f"Found matching subtitle file {msfd["path"]}\n")
+                self.__logger.debug(f"importSubtitles(): Found matching subtitle file {msfd["path"]}")
+                matchingSubtitleTrackDescriptor[0].setExternalSourceFilePath(msfd["path"])
+
+
+    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()])}"
+        for td in self.getAllTrackDescriptors():
+            yield (f"{td.getIndex()}:{td.getType().indicator()}:{td.getSubIndex()} "
+                   + '|'.join([d.indicator() for d in td.getDispositionSet()])
+                   + ' ' + ' '.join([str(k)+'='+str(v) for k,v in td.getTags().items()]))

bin/ffx/media_details_screen.py

@@ -156,7 +156,8 @@ class MediaDetailsScreen(Screen):
         #HINT: This is None if the filename did not match anything in database
         self.__currentPattern = self.__mediaFileProperties.getPattern()
 
-        self.__targetMediaDescriptor = self.__currentPattern.getMediaDescriptor() if self.__currentPattern is not None else None
+        # keine tags vorhanden
+        self.__targetMediaDescriptor = self.__currentPattern.getMediaDescriptor(self.context) if self.__currentPattern is not None else None
 
         # Enumerating differences between media descriptors
         # from file (=current) vs from stored in database (=target)
@@ -451,7 +452,7 @@ class MediaDetailsScreen(Screen):
                 selected_track_data = self.tracksTable.get_row(row_key)
 
                 kwargs = {}
-                
+                kwargs[TrackDescriptor.CONTEXT_KEY] = self.context
                 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])
@@ -503,16 +504,21 @@ class MediaDetailsScreen(Screen):
         
         if patternDescriptor:
             patternId = self.__pc.addPattern(patternDescriptor)
-
+            if patternId:
                 self.highlightPattern(False)
 
+                for tagKey, tagValue in self.__currentMediaDescriptor.getTags().items():
+                    self.__tac.updateMediaTag(patternId, tagKey, tagValue)
+
                 for trackDescriptor in self.__currentMediaDescriptor.getAllTrackDescriptors():
                     self.__tc.addTrack(trackDescriptor, patternId = patternId)
 
 
     def action_new_pattern(self):
 
-        if not self.__currentMediaDescriptor.checkDefaultAndForcedDispositions():
+        try:
+            self.__currentMediaDescriptor.checkConfiguration()
+        except ValueError:
             return
 
         selectedShowDescriptor = self.getSelectedShowDescriptor()

bin/ffx/model/pattern.py

@@ -41,9 +41,9 @@ class Pattern(Base):
     def getShowId(self):
         return int(self.show_id)
 
-    def getShowDescriptor(self) -> ShowDescriptor:
-        click.echo(f"self.show {self.show} id={self.show_id}")
-        return self.show.getDescriptor()
+    def getShowDescriptor(self, context) -> ShowDescriptor:
+        # click.echo(f"self.show {self.show} id={self.show_id}")
+        return self.show.getDescriptor(context)
 
     def getId(self):
         return int(self.id)
@@ -55,14 +55,22 @@ class Pattern(Base):
         return {str(t.key):str(t.value) for t in self.media_tags}
 
 
-    def getMediaDescriptor(self):
+    def getMediaDescriptor(self, context):
 
         kwargs = {}
-        kwargs[MediaDescriptor.TAGS_KEY] = self.getTags()
 
+        kwargs[MediaDescriptor.CONTEXT_KEY] = context
+
+        kwargs[MediaDescriptor.TAGS_KEY] = self.getTags()
         kwargs[MediaDescriptor.TRACK_DESCRIPTOR_LIST_KEY] = []
 
+        # Set ordered subindices
+        subIndexCounter = {}
         for track in self.tracks:
-            kwargs[MediaDescriptor.TRACK_DESCRIPTOR_LIST_KEY].append(track.getDescriptor())
+            trackType = track.getType()
+            if not trackType in subIndexCounter.keys():
+                subIndexCounter[trackType] = 0
+            kwargs[MediaDescriptor.TRACK_DESCRIPTOR_LIST_KEY].append(track.getDescriptor(context, subIndex = subIndexCounter[trackType]))
+            subIndexCounter[trackType] += 1
 
         return MediaDescriptor(**kwargs)

bin/ffx/model/show.py

@@ -44,10 +44,10 @@ class Show(Base):
     indicator_episode_digits = Column(Integer, default=ShowDescriptor.DEFAULT_INDICATOR_EPISODE_DIGITS)
 
 
-    def getDescriptor(self):
+    def getDescriptor(self, context):
         
         kwargs = {}
-        
+        kwargs[ShowDescriptor.CONTEXT_KEY] = context
         kwargs[ShowDescriptor.ID_KEY] = int(self.id)
         kwargs[ShowDescriptor.NAME_KEY] = str(self.name)
         kwargs[ShowDescriptor.YEAR_KEY] = int(self.year)

bin/ffx/model/track.py

@@ -44,6 +44,7 @@ class Track(Base):
 
     disposition_flags = Column(Integer)
     
+    codec_name = Column(String)
     audio_layout = Column(Integer)
 
 
@@ -133,6 +134,7 @@ class Track(Base):
 
             return cls(pattern_id = patternId,
                         track_type = trackType,
+                        codec_name = streamObj[TrackDescriptor.FFPROBE_CODEC_NAME_KEY],
                         disposition_flags = sum([2**t.index() for (k,v) in streamObj[TrackDescriptor.FFPROBE_DISPOSITION_KEY].items()
                                                         if v and (t := TrackDisposition.find(k)) is not None]),
                         audio_layout = AudioLayout.identify(streamObj))
@@ -150,6 +152,9 @@ class Track(Base):
     def getType(self):
         return TrackType.fromIndex(self.track_type)
     
+    def getCodec(self):
+        return str(self.codec_name)
+
     def getIndex(self):
         return int(self.index) if self.index is not None else -1
 
@@ -184,10 +189,12 @@ class Track(Base):
             return bool(self.disposition_flags & 2**disposition.index())
 
 
-    def getDescriptor(self, subIndex : int = -1) -> TrackDescriptor:
+    def getDescriptor(self, context, subIndex : int = -1) -> TrackDescriptor:
 
         kwargs = {}
 
+        kwargs[TrackDescriptor.CONTEXT_KEY] = context
+
         kwargs[TrackDescriptor.ID_KEY] = self.getId()
         kwargs[TrackDescriptor.PATTERN_ID_KEY] = self.getPatternId()
 
@@ -198,6 +205,8 @@ class Track(Base):
             kwargs[TrackDescriptor.SUB_INDEX_KEY] = subIndex
 
         kwargs[TrackDescriptor.TRACK_TYPE_KEY] = self.getType()
+        kwargs[TrackDescriptor.CODEC_NAME_KEY] = self.getCodec()
+        
         kwargs[TrackDescriptor.DISPOSITION_SET_KEY] = self.getDispositionSet()
         kwargs[TrackDescriptor.TAGS_KEY] = self.getTags()
         

bin/ffx/pattern_controller.py

@@ -25,7 +25,7 @@ class PatternController():
                 s.commit()
                 return pattern.getId()
             else:
-                return None
+                return 0
 
         except Exception as ex:
             raise click.ClickException(f"PatternController.addPattern(): {repr(ex)}")
@@ -116,7 +116,8 @@ class PatternController():
             s.close()
 
 
-    def matchFilename(self, filename : str) -> re.Match:
+    def matchFilename(self, filename : str) -> dict:
+        """Returns dict {'match': <a regex match obj>, 'pattern': <ffx pattern obj>} or empty dict of no pattern was found"""
 
         try:
             s = self.Session()
@@ -126,7 +127,7 @@ class PatternController():
             
             for pattern in q.all():
                 patternMatch = re.search(str(pattern.pattern), str(filename))
-                if patternMatch:
+                if patternMatch is not None:
                     matchResult['match'] = patternMatch
                     matchResult['pattern'] = pattern
 
@@ -137,14 +138,14 @@ class PatternController():
         finally:
             s.close()
 
-    def getMediaDescriptor(self, patternId):
+    def getMediaDescriptor(self, context, patternId):
 
         try:
             s = self.Session()
             q = s.query(Pattern).filter(Pattern.id == int(patternId))
 
             if q.count():
-                return q.first().getMediaDescriptor()
+                return q.first().getMediaDescriptor(context)
             else:
                 return None
 

bin/ffx/pattern_details_screen.py

@@ -126,7 +126,7 @@ class PatternDetailsScreen(Screen):
 
             for tr in tracks:
 
-                td : TrackDescriptor = tr.getDescriptor()
+                td : TrackDescriptor = tr.getDescriptor(self.context)
 
                 trackType = td.getType()
                 if not trackType in typeCounter.keys():
@@ -292,7 +292,7 @@ class PatternDetailsScreen(Screen):
                 trackIndex = int(selected_track_data[0])
                 trackSubIndex = int(selected_track_data[2])
 
-                return self.__tc.getTrack(self.__pattern.getId(), trackIndex).getDescriptor(subIndex=trackSubIndex)
+                return self.__tc.getTrack(self.__pattern.getId(), trackIndex).getDescriptor(self.context, subIndex=trackSubIndex)
 
             else:
                 return None
@@ -345,8 +345,7 @@ class PatternDetailsScreen(Screen):
 
             else:
                 patternId = self.__pc.addPattern(patternDescriptor)
-                if patternId is not None:
-
+                if patternId:
                     self.dismiss(patternDescriptor)
                 else:
                     #TODO: Meldung

bin/ffx/process.py

@@ -1,6 +1,9 @@
 import subprocess
+from typing import List
 
-def executeProcess(commandSequence):
-    process = subprocess.Popen(commandSequence, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+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.decode('utf-8'), error.decode('utf-8'), process.returncode
+    return output, error, process.returncode

bin/ffx/show_controller.py

@@ -20,7 +20,7 @@ class ShowController():
 
             if q.count():
                 show: Show = q.first() 
-                return show.getDescriptor()
+                return show.getDescriptor(self.context)
 
         except Exception as ex:
             raise click.ClickException(f"ShowController.getShowDescriptor(): {repr(ex)}")

bin/ffx/show_descriptor.py

@@ -1,19 +1,10 @@
-import click
-
-from typing import List, Self
-
-from ffx.track_type import TrackType
-from ffx.track_disposition import TrackDisposition
-
-from ffx.track_descriptor import TrackDescriptor
-
-from ffx.helper import dictDiff, DIFF_ADDED_KEY, DIFF_CHANGED_KEY, DIFF_REMOVED_KEY
+import logging
 
 
 class ShowDescriptor():
     """This class represents the structural content of a media file including streams and metadata"""
 
-    # CONTEXT_KEY = 'context'
+    CONTEXT_KEY = 'context'
     
     ID_KEY = 'id'
     NAME_KEY = 'name'
@@ -32,6 +23,17 @@ class ShowDescriptor():
 
     def __init__(self, **kwargs):
 
+        if ShowDescriptor.CONTEXT_KEY in kwargs.keys():
+            if type(kwargs[ShowDescriptor.CONTEXT_KEY]) is not dict:
+                raise TypeError(
+                    f"ShowDescriptor.__init__(): Argument {ShowDescriptor.CONTEXT_KEY} is required to be of type dict"
+                )
+            self.__context = kwargs[ShowDescriptor.CONTEXT_KEY]
+            self.__logger = self.__context['logger']
+        else:
+            self.__context = {}
+            self.__logger = logging.getLogger('FFX').addHandler(logging.NullHandler())
+
         if ShowDescriptor.ID_KEY in kwargs.keys():
                 if type(kwargs[ShowDescriptor.ID_KEY]) is not int:
                         raise TypeError(f"ShowDescriptor.__init__(): Argument {ShowDescriptor.ID_KEY} is required to be of type int")
@@ -53,33 +55,34 @@ class ShowDescriptor():
         else:
                 self.__showYear = -1
 
+
         if ShowDescriptor.INDEX_SEASON_DIGITS_KEY in kwargs.keys():
                 if type(kwargs[ShowDescriptor.INDEX_SEASON_DIGITS_KEY]) is not int:
                         raise TypeError(f"ShowDescriptor.__init__(): Argument {ShowDescriptor.INDEX_SEASON_DIGITS_KEY} is required to be of type int")
                 self.__indexSeasonDigits = kwargs[ShowDescriptor.INDEX_SEASON_DIGITS_KEY]
         else:
-                self.__indexSeasonDigits = -1
+                self.__indexSeasonDigits = ShowDescriptor.DEFAULT_INDEX_SEASON_DIGITS
 
         if ShowDescriptor.INDEX_EPISODE_DIGITS_KEY in kwargs.keys():
                 if type(kwargs[ShowDescriptor.INDEX_EPISODE_DIGITS_KEY]) is not int:
                         raise TypeError(f"ShowDescriptor.__init__(): Argument {ShowDescriptor.INDEX_EPISODE_DIGITS_KEY} is required to be of type int")
                 self.__indexEpisodeDigits = kwargs[ShowDescriptor.INDEX_EPISODE_DIGITS_KEY]
         else:
-                self.__indexEpisodeDigits = -1
+                self.__indexEpisodeDigits = ShowDescriptor.DEFAULT_INDEX_EPISODE_DIGITS
 
         if ShowDescriptor.INDICATOR_SEASON_DIGITS_KEY in kwargs.keys():
                 if type(kwargs[ShowDescriptor.INDICATOR_SEASON_DIGITS_KEY]) is not int:
                         raise TypeError(f"ShowDescriptor.__init__(): Argument {ShowDescriptor.INDICATOR_SEASON_DIGITS_KEY} is required to be of type int")
                 self.__indicatorSeasonDigits = kwargs[ShowDescriptor.INDICATOR_SEASON_DIGITS_KEY]
         else:
-                self.__indicatorSeasonDigits = -1
+                self.__indicatorSeasonDigits = ShowDescriptor.DEFAULT_INDICATOR_SEASON_DIGITS
 
         if ShowDescriptor.INDICATOR_EPISODE_DIGITS_KEY in kwargs.keys():
                 if type(kwargs[ShowDescriptor.INDICATOR_EPISODE_DIGITS_KEY]) is not int:
                         raise TypeError(f"ShowDescriptor.__init__(): Argument {ShowDescriptor.INDICATOR_EPISODE_DIGITS_KEY} is required to be of type int")
                 self.__indicatorEpisodeDigits = kwargs[ShowDescriptor.INDICATOR_EPISODE_DIGITS_KEY]
         else:
-                self.__indicatorEpisodeDigits = -1
+                self.__indicatorEpisodeDigits = ShowDescriptor.DEFAULT_INDICATOR_EPISODE_DIGITS
 
 
     def getId(self):

bin/ffx/test/_basename_combinator_1.py

@@ -0,0 +1,64 @@
+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 .basename_combinator import BasenameCombinator
+
+from .indicator_combinator import IndicatorCombinator
+from .label_combinator import LabelCombinator
+
+class BasenameCombinator2(BasenameCombinator):
+    """documentation_site"""
+
+    VARIANT = 'B2'
+
+    # def __init__(self, SubCombinators: dict = {}, context = None):
+    def __init__(self, context = None):
+
+        self._context = context
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+    def getVariant(self):
+        return BasenameCombinator2.VARIANT
+
+    def getPayload(self):
+        return ''
+
+    def assertFunc(self, mediaDescriptor: MediaDescriptor):
+        pass
+
+    def shouldFail(self):
+        return False
+
+    def getYield(self):
+
+        for L in LabelCombinator.getAllClassReferences():
+#            for I in IndicatorCombinator.getAllClassReferences():
+#                for S in SiteCombinator.getAllClassReferences():
+#                    for T in TitleCombinator.getAllClassReferences():
+#
+
+            l = L(self._context)
+
+            yieldObj = {}
+
+            yieldObj['identifier'] = self.getIdentifier()
+
+            yieldObj['variants'] = [self.getVariant(),
+                                    l.getVariant()]
+
+            yieldObj['payload'] = {'label': l.getPayload()}
+
+            yieldObj['assertSelectors'] = ['B', 'L']
+
+            yieldObj['assertFuncs'] = [self.assertFunc,
+                                        l.assertFunc]
+
+            yieldObj['shouldFail'] = (self.shouldFail()
+                                        | l.shouldFail())
+
+            yield yieldObj

bin/ffx/test/basename_combinator.py

@@ -0,0 +1,35 @@
+import os, sys, importlib, glob, inspect, itertools
+
+class BasenameCombinator():
+
+    IDENTIFIER = 'basename'
+
+    BASENAME = 'media'
+
+    def __init__(self, context = None):
+        self._context = context
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+    def getIdentifier(self):
+        return BasenameCombinator.IDENTIFIER
+
+    @staticmethod    
+    def list():
+        basePath = os.path.dirname(__file__)
+        return [os.path.basename(p)[20:-3]
+                for p
+                in glob.glob(f"{ basePath }/basename_combinator_*.py", recursive = True)
+                if p != __file__]
+
+    @staticmethod
+    def getClassReference(identifier):
+        importlib.import_module(f"ffx.test.basename_combinator_{ identifier }")
+        for name, obj in inspect.getmembers(sys.modules[f"ffx.test.basename_combinator_{ identifier }"]):
+            #HINT: Excluding MediaCombinator as it seems to be included by import (?)
+            if inspect.isclass(obj) and name != 'BasenameCombinator' and name.startswith('BasenameCombinator'):
+                return obj
+
+    @staticmethod
+    def getAllClassReferences():
+        return [BasenameCombinator.getClassReference(i) for i in BasenameCombinator.list()]

bin/ffx/test/basename_combinator_0.py

@@ -0,0 +1,107 @@
+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 .basename_combinator import BasenameCombinator
+
+from .indicator_combinator import IndicatorCombinator
+from .label_combinator import LabelCombinator
+
+
+class BasenameCombinator0(BasenameCombinator):
+    """base[_indicator]"""
+
+    VARIANT = 'B0'
+
+    # def __init__(self, SubCombinators: dict = {}, context = None):
+    def __init__(self, context = None):
+        self._context = context
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+    def getVariant(self):
+        return BasenameCombinator0.VARIANT
+
+    def getPayload(self, indicator = '', label = ''):
+
+        basename = BasenameCombinator.BASENAME
+        expectedBasename = label if label else BasenameCombinator.BASENAME
+
+        if indicator:
+            basename += f"_{indicator}"
+            expectedBasename += f"_{indicator}"
+
+        return {'basename': basename,
+                'label': label,
+                'expectedBasename': expectedBasename}
+
+
+    def assertFunc(self, indicator = '', label = ''):
+
+        def f(testObj: dict = {}):
+
+            if not 'filenames' in testObj.keys():
+                raise KeyError("testObj does not contain key 'filenames'")
+
+            fNames = testObj['filenames']
+
+            assert len(fNames) == 1, "More than one result file was created"
+
+            resultFilename = fNames[0]
+
+            fTokens = resultFilename.split('.')
+
+            resultBasename = '.'.join(fTokens[:-1])
+            resultExtension = fTokens[-1]
+
+            if not indicator and not label:
+                
+                assert resultBasename == BasenameCombinator.BASENAME, f"Result basename is not {BasenameCombinator.BASENAME}"
+            if not indicator and     label:
+                assert resultBasename == label, f"Result basename is not {label}"
+            if     indicator and not label:
+                assert resultBasename == f"{BasenameCombinator.BASENAME}_{indicator}", f"Result basename is not {BasenameCombinator.BASENAME}_{indicator}"
+            if     indicator and     label:
+                assert resultBasename == f"{label}_{indicator}", f"Result basename is not {label}_{indicator}"
+
+        return f
+
+
+    def shouldFail(self):
+        return False
+
+    def getYield(self):
+
+        ic = IndicatorCombinator(self._context)
+
+        for L in LabelCombinator.getAllClassReferences():
+            for i in ic.getYield():
+
+                l = L(self._context)
+
+                indicator = i['indicator']
+                indicatorVariant = i['variant']
+
+                yieldObj = {}
+
+                yieldObj['identifier'] = self.getIdentifier()
+
+                yieldObj['variants'] = [self.getVariant(),
+                                        l.getVariant(),
+                                        indicatorVariant]
+
+                yieldObj['payload'] = self.getPayload(indicator = indicator,
+                                                        label = l.getPayload())
+
+                yieldObj['assertSelectors'] = ['B', 'L', 'I']
+
+                yieldObj['assertFuncs'] = [self.assertFunc(indicator, l.getPayload()), l.assertFunc, ic.assertFunc]
+
+                yieldObj['shouldFail'] = (self.shouldFail()
+                                            | l.shouldFail()
+                                            | ic.shouldFail())
+
+                yield yieldObj

bin/ffx/test/basename_combinator_2.py

@@ -0,0 +1,159 @@
+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 .basename_combinator import BasenameCombinator
+
+from .indicator_combinator import IndicatorCombinator
+from .label_combinator import LabelCombinator
+from .title_combinator import TitleCombinator
+from .release_combinator import ReleaseCombinator
+from .show_combinator import ShowCombinator
+
+
+class BasenameCombinator2(BasenameCombinator):
+    """show[_indicator]_group"""
+
+    VARIANT = 'B2'
+
+    # def __init__(self, SubCombinators: dict = {}, context = None):
+    def __init__(self, context = None):
+        self._context = context
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+    def getVariant(self):
+        return BasenameCombinator2.VARIANT
+
+#
+#    SHOW_LIST = [
+#        'Boruto: Naruto Next Generations (2017)',
+#        'The Rising of the Shield Hero (2019)',
+#        'Scrubs - Die Anfänger (2001)'
+#    ]
+#
+#    RELEASE_LIST = [
+#        ".GerEngSub.AAC.1080pINDICATOR.WebDL.x264-Tanuki",
+#        ".German.AC3.DL.1080pINDICATOR.BluRay.x264-AST4u",
+#        "-720pINDICATOR"
+#    ]
+
+
+    def getPayload(self,
+                    indicator = '',
+                    label = '',
+                    show = '',
+                    release = ''):
+
+        if label:
+            basename = label
+            expectedBasename = label
+            if indicator:
+                basename += f"_{indicator}"
+                expectedBasename += f"_{indicator}"
+        else:
+            basename = show+release
+            expectedBasename = basename
+
+        return {'basename': basename,
+                'label': label,
+                'expectedBasename': expectedBasename}
+
+
+    def createAssertFunc(self,
+                    indicator = '',
+                    label = '',
+                    show = '',
+                    release = ''):
+
+        def f(testObj: dict = {}):
+
+            if not 'filenames' in testObj.keys():
+                raise KeyError("testObj does not contain key 'filenames'")
+
+            fNames = testObj['filenames']
+
+            assert len(fNames) == 1, "More than one result file was created"
+
+            resultFilename = fNames[0]
+
+            fTokens = resultFilename.split('.')
+
+            resultBasename = '.'.join(fTokens[:-1])
+            resultExtension = fTokens[-1]
+
+            if not indicator and not label:
+                assert resultBasename == show+release, f"Result basename is not {show+release}"
+            elif not indicator and     label:
+                assert resultBasename == label, f"Result basename is not {label}"
+            elif     indicator and not label:
+                assert resultBasename == show+release, f"Result basename is not {show+release}"
+            elif     indicator and     label:
+                assert resultBasename == f"{label}_{indicator}", f"Result basename is not {label}_{indicator}"
+
+        return f
+
+
+    def shouldFail(self):
+        return False
+
+    def getYield(self):
+
+        ic = IndicatorCombinator(self._context)
+        sc = ShowCombinator(self._context)
+
+        for L in LabelCombinator.getAllClassReferences():
+            for iy in ic.getYield():
+
+                indicator = iy['indicator']
+                indicatorVariant = iy['variant']
+
+                rc = ReleaseCombinator(self._context, indicator=indicator)
+
+                for sy in sc.getYield():
+                    for ry in rc.getYield():
+
+                        l = L(self._context)
+
+                        show = sy['show']
+                        showVariant = sy['variant']
+
+                        release = ry['release']
+                        releaseVariant = ry['variant']
+
+                        yieldObj = {}
+
+                        yieldObj['identifier'] = self.getIdentifier()
+
+                        yieldObj['variants'] = [self.getVariant(),
+                                                l.getVariant(),
+                                                indicatorVariant,
+                                                showVariant,
+                                                releaseVariant]
+
+                        yieldObj['payload'] = self.getPayload(indicator = indicator,
+                                                                label = l.getPayload(),
+                                                                show = show,
+                                                                release = release)
+
+                        yieldObj['assertSelectors'] = ['B', 'L', 'I', 'S', 'R']
+
+                        yieldObj['assertFuncs'] = [self.createAssertFunc(indicator,
+                                                                    l.getPayload(),
+                                                                    show = show,
+                                                                    release = release),
+                                                    l.assertFunc,
+                                                    ic.assertFunc,
+                                                    sc.assertFunc,
+                                                    rc.assertFunc]
+
+                        yieldObj['shouldFail'] = (self.shouldFail()
+                                                    | l.shouldFail()
+                                                    | ic.shouldFail()
+                                                    | sc.shouldFail()
+                                                    | rc.shouldFail())
+
+                        yield yieldObj

bin/ffx/test/combinator.py

@@ -0,0 +1,13 @@
+class Combinator():
+
+    def __init__(self, SubCombinations: dict):
+        self._SubCombinators = SubCombinations
+
+    def getPayload(self):
+        pass
+
+    def assertFunc(self, testObj):
+        pass
+
+    def getYield(yieldObj: dict):
+        pass

bin/ffx/test/disposition_combinator_2.py

@@ -0,0 +1,35 @@
+import os, sys, importlib, glob, inspect, itertools
+
+class DispositionCombinator2():
+
+    IDENTIFIER = 'disposition2'
+
+    def __init__(self, context = None):
+        self._context = context
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+    def getIdentifier(self):
+        return DispositionCombinator2.IDENTIFIER
+    def getVariant(self):
+        return self._variant
+
+    @staticmethod    
+    def list():
+        basePath = os.path.dirname(__file__)
+        return [os.path.basename(p)[25:-3]
+                for p
+                in glob.glob(f"{ basePath }/disposition_combinator_2_*.py", recursive = True)
+                if p != __file__]
+
+    @staticmethod
+    def getClassReference(identifier):
+        importlib.import_module(f"ffx.test.disposition_combinator_2_{ identifier }")
+        for name, obj in inspect.getmembers(sys.modules[f"ffx.test.disposition_combinator_2_{ identifier }"]):
+            #HINT: Excluding DispositionCombination as it seems to be included by import (?)
+            if inspect.isclass(obj) and name != 'DispositionCombinator2' and name.startswith('DispositionCombinator2'):
+                return obj
+
+    @staticmethod
+    def getAllClassReferences():
+        return [DispositionCombinator2.getClassReference(i) for i in DispositionCombinator2.list()]

bin/ffx/test/disposition_combinator_2_0.py

@@ -0,0 +1,76 @@
+import os, sys, importlib, glob, inspect
+
+from ffx.track_disposition import TrackDisposition
+from .disposition_combinator_2 import DispositionCombinator2
+
+
+class DispositionCombinator20(DispositionCombinator2):
+
+    # COMMENT
+    # DESCRIPTIONS
+
+    VARIANT = 'D00'
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+    def getVariant(self):
+        return DispositionCombinator20.VARIANT
+
+
+    def getPayload(self):
+
+        subtrack0 = set()
+        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.FORCED) # COMMENT
+            # subtrack1.add(TrackDisposition.DESCRIPTIONS) # DESCRIPTIONS
+
+        return (subtrack0,
+                subtrack1)
+
+    def createAssertFunc(self):
+
+        if self.__createPresets:
+
+            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.FORCED)
+                    ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set 'forced' 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.DESCRIPTIONS)
+                    # ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved set '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"
+                    # 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

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

bin/ffx/test/disposition_combinator_2_2.py

@@ -0,0 +1,79 @@
+import os, sys, importlib, glob, inspect
+
+from ffx.track_disposition import TrackDisposition
+from .disposition_combinator_2 import DispositionCombinator2
+
+
+class DispositionCombinator22(DispositionCombinator2):
+
+    VARIANT = 'D01'
+
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+    def getVariant(self):
+        return DispositionCombinator22.VARIANT
+
+
+    def getPayload(self):
+
+        if self.__createPresets:
+            subtrack0 = set([TrackDisposition.DEFAULT])
+            subtrack1 = set()
+        else:
+            subtrack0 = set()
+            subtrack1 = 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.FORCED) # COMMENT
+            # subtrack1.add(TrackDisposition.DESCRIPTIONS) # DESCRIPTIONS
+
+        return (subtrack0,
+                subtrack1)
+
+
+    def createAssertFunc(self):
+
+        if self.__createPresets:
+
+            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.FORCED)
+                    ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set 'descriptions' 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 'forced' 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"
+
+        return f
+
+
+    def shouldFail(self):
+        return False

bin/ffx/test/disposition_combinator_2_3 .py

@@ -0,0 +1,43 @@
+import os, sys, importlib, glob, inspect
+
+from ffx.track_disposition import TrackDisposition
+from .disposition_combinator_2 import DispositionCombinator2
+
+
+class DispositionCombinator23(DispositionCombinator2):
+
+    VARIANT = 'D11'
+
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+    def getVariant(self):
+        return DispositionCombinator23.VARIANT
+
+
+    def getPayload(self):
+
+        subtrack0 = set([TrackDisposition.DEFAULT])
+        subtrack1 = 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
+
+        return (subtrack0,
+                subtrack1)
+
+    #TODO: tmdb cases
+    def createAssertFunc(self):
+        def f(assertObj: dict = {}):
+            pass
+        return f
+
+    def shouldFail(self):
+        return True

bin/ffx/test/disposition_combinator_3.py

@@ -0,0 +1,34 @@
+import os, sys, importlib, glob, inspect, itertools
+
+class DispositionCombinator3():
+
+    IDENTIFIER = 'disposition3'
+
+    def __init__(self, context = None):
+        self._context = context
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+    def getIdentifier(self):
+        return DispositionCombinator3.IDENTIFIER
+
+
+    @staticmethod    
+    def list():
+        basePath = os.path.dirname(__file__)
+        return [os.path.basename(p)[25:-3]
+                for p
+                in glob.glob(f"{ basePath }/disposition_combinator_3_*.py", recursive = True)
+                if p != __file__]
+
+    @staticmethod
+    def getClassReference(identifier):
+        importlib.import_module(f"ffx.test.disposition_combinator_3_{ identifier }")
+        for name, obj in inspect.getmembers(sys.modules[f"ffx.test.disposition_combinator_3_{ identifier }"]):
+            #HINT: Excluding DispositionCombination as it seems to be included by import (?)
+            if inspect.isclass(obj) and name != 'DispositionCombinator3' and name.startswith('DispositionCombinator3'):
+                return obj
+
+    @staticmethod
+    def getAllClassReferences():
+        return [DispositionCombinator3.getClassReference(i) for i in DispositionCombinator3.list()]

bin/ffx/test/disposition_combinator_3_0.py

@@ -0,0 +1,92 @@
+import os, sys, importlib, glob, inspect
+
+from ffx.track_disposition import TrackDisposition
+from .disposition_combinator_3 import DispositionCombinator3
+
+
+class DispositionCombinator30(DispositionCombinator3):
+
+    VARIANT = 'D000'
+
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+    def getVariant(self):
+        return DispositionCombinator30.VARIANT
+
+
+    def getPayload(self):
+
+        subtrack0 = set()
+        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.FORCED) # COMMENT
+            # subtrack1.add(TrackDisposition.DESCRIPTIONS) # DESCRIPTIONS
+            # subtrack2.add(TrackDisposition.HEARING_IMPAIRED) # HEARING_IMPAIRED
+
+        return (subtrack0,
+                subtrack1,
+                subtrack2)
+
+
+    def createAssertFunc(self):
+
+        if self.__createPresets:
+
+            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.FORCED)
+                ), 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 #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has 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 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:
+
+            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 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

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

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

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

bin/ffx/test/disposition_combinator_3_4.py

@@ -0,0 +1,46 @@
+import os, sys, importlib, glob, inspect
+
+from ffx.track_disposition import TrackDisposition
+from .disposition_combinator_3 import DispositionCombinator3
+
+
+class DispositionCombinator34(DispositionCombinator3):
+
+    VARIANT = 'D101'
+
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+    def getVariant(self):
+        return DispositionCombinator34.VARIANT
+
+
+    def getPayload(self):
+
+        subtrack0 = set([TrackDisposition.DEFAULT])
+        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.FORCED) # COMMENT
+            # subtrack1.add(TrackDisposition.DESCRIPTIONS) # DESCRIPTIONS
+            # subtrack2.add(TrackDisposition.HEARING_IMPAIRED) # HEARING_IMPAIRED
+
+        return (subtrack0,
+                subtrack1,
+                subtrack2)
+
+    #TODO: tmpdb cases
+    def createAssertFunc(self):
+        def f(assertObj: dict = {}):
+            pass
+        return f
+
+    def shouldFail(self):
+        return True

bin/ffx/test/helper.py

@@ -0,0 +1,277 @@
+import os, math, tempfile, click
+
+
+from ffx.ffx_controller import FfxController
+
+from ffx.process import executeProcess
+
+from ffx.media_descriptor import MediaDescriptor
+from ffx.track_type import TrackType
+
+from ffx.helper import dictCache
+
+
+SHORT_SUBTITLE_SEQUENCE = [{'start': 1, 'end': 2, 'text': 'yolo'},
+                           {'start': 3, 'end': 4, 'text': 'zolo'},
+                           {'start': 5, 'end': 6, 'text': 'golo'}]
+
+def getTimeString(hours: float = 0.0,
+                    minutes: float = 0.0,
+                    seconds: float = 0.0,
+                    millis: float = 0.0,
+                    format: str = ''):
+
+    duration = (hours * 3600.0
+                + minutes * 60.0
+                + seconds
+                + millis / 1000.0)
+
+    hours = math.floor(duration / 3600.0)
+    remaining = duration - 3600.0 * hours
+
+    minutes = math.floor(remaining / 60.0)
+    remaining = remaining - 60.0 * minutes
+
+    seconds = math.floor(remaining)
+    remaining = remaining - seconds
+
+    millis = math.floor(remaining * 1000)
+
+    if format == 'ass':
+        return f"{hours:01d}:{minutes:02d}:{seconds:02d}.{millis:02d}"
+
+    # srt & vtt
+    return f"{hours:02d}:{minutes:02d}:{seconds:02d}.{millis:03d}"
+
+
+def createAssFile(entries: dict, directory = None):
+
+    # [Script Info]
+    # ; Script generated by FFmpeg/Lavc61.3.100
+    # ScriptType: v4.00+
+    # PlayResX: 384
+    # PlayResY: 288
+    # ScaledBorderAndShadow: yes
+    # YCbCr Matrix: None
+    # 
+    # [V4+ Styles]
+    # Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
+    # Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,1
+    # 
+    # [Events]
+    # Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
+    # Dialogue: 0,0:00:01.00,0:00:02.00,Default,,0,0,0,,yolo
+    # Dialogue: 0,0:00:03.00,0:00:04.00,Default,,0,0,0,,zolo
+    # Dialogue: 0,0:00:05.00,0:00:06.00,Default,,0,0,0,,golo
+    tmpFileName = tempfile.mktemp(suffix=".ass", dir = directory)
+
+    with open(tmpFileName, 'w') as tmpFile:
+
+        tmpFile.write("[Script Info]\n")
+        tmpFile.write("; Script generated by Ffx\n")
+        tmpFile.write("ScriptType: v4.00+\n")
+        tmpFile.write("PlayResX: 384\n")
+        tmpFile.write("PlayResY: 288\n")
+        tmpFile.write("ScaledBorderAndShadow: yes\n")
+        tmpFile.write("YCbCr Matrix: None\n")
+        tmpFile.write("\n")
+        tmpFile.write("[V4+ Styles]\n")
+        tmpFile.write("Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\n")
+        tmpFile.write("Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,1\n")
+        tmpFile.write("\n")
+        tmpFile.write("[Events]\n")
+        tmpFile.write("Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\n")
+
+        for entryIndex in range(len(entries)):
+            tmpFile.write(f"Dialogue: 0,{getTimeString(seconds=entries[entryIndex]['start'], format='ass')},{getTimeString(seconds=entries[entryIndex]['end'], format='ass')},Default,,0,0,0,,{entries[entryIndex]['text']}\n")
+
+    return tmpFileName
+
+def createSrtFile(entries: dict, directory = None):
+    # 1
+    # 00:00:00,000 --> 00:00:02,500
+    # Welcome to the Example Subtitle File!
+    # 
+    # 2
+    # 00:00:03,000 --> 00:00:06,000
+    # This is a demonstration of SRT subtitles.
+    # 
+    # 3
+    # 00:00:07,000 --> 00:00:10,500
+    # You can use SRT files to add subtitles to your videos.
+
+    tmpFileName = tempfile.mktemp(suffix=".srt", dir = directory)
+
+    with open(tmpFileName, 'w') as tmpFile:
+
+        for entryIndex in range(len(entries)):
+
+            tmpFile.write(f"{entryIndex}\n")
+            tmpFile.write(f"{getTimeString(seconds=entries[entryIndex]['start'])} --> {getTimeString(seconds=entries[entryIndex]['end'])}\n")
+            tmpFile.write(f"{entries[entryIndex]['text']}\n\n")
+
+    return tmpFileName
+
+
+def createVttFile(entries: dict, directory = None):
+    # WEBVTT
+    # 
+    # 01:20:33.050 --> 01:20:35.050
+    # Yolo
+
+    tmpFileName = tempfile.mktemp(suffix=".vtt", dir = directory)
+
+    with open(tmpFileName, 'w') as tmpFile:
+
+        tmpFile.write("WEBVTT\n")
+
+        for entryIndex in range(len(entries)):
+
+            tmpFile.write("\n")
+            tmpFile.write(f"{getTimeString(seconds=entries[entryIndex]['start'])} --> {getTimeString(seconds=entries[entryIndex]['end'])}\n")
+            tmpFile.write(f"{entries[entryIndex]['text']}\n")
+
+
+    return tmpFileName
+
+
+def createMediaTestFile(mediaDescriptor: MediaDescriptor,
+                    directory: str = '',
+                    baseName: str = 'media',
+                    format: str = '',
+                    extension: str = 'mkv',
+                    sizeX: int = 1280,
+                    sizeY: int = 720,
+                    rate: int = 25,
+                    length: int = 10,
+                    logger = None):
+
+    # subtitleFilePath = createVttFile(SHORT_SUBTITLE_SEQUENCE)
+
+    # commandTokens = FfxController.COMMAND_TOKENS
+    commandTokens = ['ffmpeg', '-y']
+
+    generatorCache = []
+    generatorTokens = []
+    mappingTokens = []
+    importTokens = []
+    metadataTokens = []
+
+
+    for mediaTagKey, mediaTagValue in mediaDescriptor.getTags().items():
+        metadataTokens += ['-metadata:g', f"{mediaTagKey}={mediaTagValue}"]
+
+    subIndexCounter = {}
+
+    for trackDescriptor in mediaDescriptor.getAllTrackDescriptors():
+
+        trackType = trackDescriptor.getType()
+
+        if trackType == TrackType.VIDEO:
+
+            cacheIndex, generatorCache = dictCache({'type': TrackType.VIDEO}, generatorCache)
+            # click.echo(f"createMediaTestFile() cache index={cacheIndex} size={len(generatorCache)}")
+
+            if cacheIndex == -1:
+                generatorTokens += ['-f',
+                                    'lavfi',
+                                    '-i',
+                                    f"color=size={sizeX}x{sizeY}:rate={rate}:color=black"]
+
+            sourceIndex = len(generatorCache) - 1 if cacheIndex == -1 else cacheIndex
+            mappingTokens += ['-map', f"{sourceIndex}:v:0"]
+
+            if not trackType in subIndexCounter.keys():
+                subIndexCounter[trackType] = 0
+            for mediaTagKey, mediaTagValue in trackDescriptor.getTags().items():
+                metadataTokens += [f"-metadata:s:{trackType.indicator()}:{subIndexCounter[trackType]}",
+                                    f"{mediaTagKey}={mediaTagValue}"]
+            subIndexCounter[trackType] += 1
+
+        if trackType == TrackType.AUDIO:
+
+            audioLayout = 'stereo'
+
+            cacheIndex, generatorCache = dictCache({'type': TrackType.AUDIO, 'layout': audioLayout}, generatorCache)
+            # click.echo(f"createMediaTestFile() cache index={cacheIndex} size={len(generatorCache)}")
+
+            # click.echo(f"generartorCache index={cacheIndex} len={len(generatorCache)}")
+            if cacheIndex == -1:
+                generatorTokens += ['-f',
+                                    'lavfi',
+                                    '-i',
+                                    f"anullsrc=channel_layout={audioLayout}:sample_rate=44100"]
+
+            sourceIndex = len(generatorCache) - 1 if cacheIndex == -1 else cacheIndex
+            mappingTokens += ['-map', f"{sourceIndex}:a:0"]
+
+            if not trackType in subIndexCounter.keys():
+                subIndexCounter[trackType] = 0
+            for mediaTagKey, mediaTagValue in trackDescriptor.getTags().items():
+                metadataTokens += [f"-metadata:s:{trackType.indicator()}:{subIndexCounter[trackType]}",
+                                    f"{mediaTagKey}={mediaTagValue}"]
+            subIndexCounter[trackType] += 1
+
+        if trackType == TrackType.SUBTITLE:
+
+            cacheIndex, generatorCache = dictCache({'type': TrackType.SUBTITLE}, generatorCache)
+            # click.echo(f"createMediaTestFile() cache index={cacheIndex} size={len(generatorCache)}")
+
+            if cacheIndex == -1:
+                importTokens = ['-i', createVttFile(SHORT_SUBTITLE_SEQUENCE, directory=directory if directory else None)]
+
+            sourceIndex = len(generatorCache) - 1 if cacheIndex == -1 else cacheIndex
+            mappingTokens += ['-map', f"{sourceIndex}:s:0"]
+
+            if not trackType in subIndexCounter.keys():
+                subIndexCounter[trackType] = 0
+            for mediaTagKey, mediaTagValue in trackDescriptor.getTags().items():
+                metadataTokens += [f"-metadata:s:{trackType.indicator()}:{subIndexCounter[trackType]}",
+                                    f"{mediaTagKey}={mediaTagValue}"]
+            subIndexCounter[trackType] += 1
+
+    ffxContext = {'logger': logger}
+    fc = FfxController(ffxContext, mediaDescriptor)
+
+    commandTokens += (generatorTokens
+                        + importTokens
+                        + mappingTokens
+                        + metadataTokens
+                        + fc.generateDispositionTokens())
+
+
+    commandTokens += ['-t', str(length)]
+
+    if format:
+        commandTokens += ['-f', format]
+
+    fileName = f"{baseName}.{extension}"
+
+    if directory:
+        outputPath = os.path.join(directory, fileName)
+    else:
+        outputPath = fileName
+
+    commandTokens += [outputPath]
+
+
+    if not logger is None:
+        logger.debug(f"createMediaTestFile(): Command sequence: {commandTokens}")
+
+    out, err, rc = executeProcess(commandTokens)
+
+    if not logger is None:
+        if out:
+            logger.debug(f"createMediaTestFile(): Process output: {out}")
+        if rc:
+            logger.debug(f"createMediaTestFile(): Process returned ERROR {rc} ({err})")
+
+
+    return outputPath
+
+
+def createEmptyDirectory():
+    return tempfile.mkdtemp()
+
+def createEmptyFile(suffix=None):
+    return tempfile.mkstemp(suffix=suffix)

bin/ffx/test/indicator_combinator.py

@@ -0,0 +1,43 @@
+class IndicatorCombinator():
+
+    IDENTIFIER = 'indicator'
+
+    MAX_SEASON = 2
+    MAX_EPISODE = 3
+
+    def __init__(self, context = None):
+        self._context = context
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+    def getIdentifier(self):
+        return IndicatorCombinator.IDENTIFIER
+        
+    def getPayload(self, season: int = -1, episode: int = -1):
+        if season == -1 and episode == -1:
+            return {
+                'variant': 'S00E00',
+                'indicator': '',
+                'season': season,
+                'episode': episode
+            }
+        else:
+            return {
+                'variant': f"S{season:02d}E{episode:02d}",
+                'indicator': f"S{season:02d}E{episode:02d}",
+                'season': season,
+                'episode': episode
+            }
+
+    def assertFunc(self, testObj = {}):
+        pass
+
+    def shouldFail(self):
+        return False
+
+    def getYield(self):
+
+        yield self.getPayload()
+        for season in range(IndicatorCombinator.MAX_SEASON):
+            for episode in range(IndicatorCombinator.MAX_EPISODE):
+                yield self.getPayload(season+1, episode+1)

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()]

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

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

bin/ffx/test/label_combinator.py

@@ -0,0 +1,36 @@
+import os, sys, importlib, glob, inspect, itertools
+
+class LabelCombinator():
+
+    IDENTIFIER = 'label'
+    PREFIX = 'label_combinator_'
+
+    LABEL = 'ffx'
+
+    def __init__(self, context = None):
+        self._context = context
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+    def getIdentifier(self):
+        return LabelCombinator.IDENTIFIER
+
+    @staticmethod    
+    def list():
+        basePath = os.path.dirname(__file__)
+        return [os.path.basename(p)[len(LabelCombinator.PREFIX):-3]
+                for p
+                in glob.glob(f"{ basePath }/{LabelCombinator.PREFIX}*.py", recursive = True)
+                if p != __file__]
+
+    @staticmethod
+    def getClassReference(identifier):
+        importlib.import_module(f"ffx.test.{LabelCombinator.PREFIX}{ identifier }")
+        for name, obj in inspect.getmembers(sys.modules[f"ffx.test.{LabelCombinator.PREFIX}{ identifier }"]):
+            #HINT: Excluding MediaCombinator as it seems to be included by import (?)
+            if inspect.isclass(obj) and name != 'LabelCombinator' and name.startswith('LabelCombinator'):
+                return obj
+
+    @staticmethod
+    def getAllClassReferences():
+        return [LabelCombinator.getClassReference(i) for i in LabelCombinator.list()]

bin/ffx/test/label_combinator_0.py

@@ -0,0 +1,30 @@
+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 .label_combinator import LabelCombinator
+
+
+class LabelCombinator0(LabelCombinator):
+
+    VARIANT = 'L0'
+
+    def __init__(self, context = None):
+        self._context = context
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+    def getVariant(self):
+        return LabelCombinator0.VARIANT
+
+    def getPayload(self):
+        return ''
+
+    def assertFunc(self, testObj = {}):
+        pass
+
+    def shouldFail(self):
+        return False

bin/ffx/test/label_combinator_1.py

@@ -0,0 +1,30 @@
+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 .label_combinator import LabelCombinator
+
+class LabelCombinator1(LabelCombinator):
+
+    VARIANT = 'L1'
+
+    def __init__(self, context = None):
+
+        self._context = context
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+    def getVariant(self):
+        return LabelCombinator1.VARIANT
+
+    def getPayload(self):
+        return LabelCombinator.LABEL
+
+    def assertFunc(self, testObj = {}):
+        pass
+
+    def shouldFail(self):
+        return False

bin/ffx/test/media_combinator.py

@@ -0,0 +1,33 @@
+import os, sys, importlib, glob, inspect, itertools
+
+class MediaCombinator():
+
+    IDENTIFIER = 'media'
+
+    def __init__(self, context = None):
+        self._context = context
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+    def getIdentifier(self):
+        return MediaCombinator.IDENTIFIER
+
+    @staticmethod    
+    def list():
+        basePath = os.path.dirname(__file__)
+        return [os.path.basename(p)[17:-3]
+                for p
+                in glob.glob(f"{ basePath }/media_combinator_*.py", recursive = True)
+                if p != __file__]
+
+    @staticmethod
+    def getClassReference(identifier):
+        importlib.import_module(f"ffx.test.media_combinator_{ identifier }")
+        for name, obj in inspect.getmembers(sys.modules[f"ffx.test.media_combinator_{ identifier }"]):
+            #HINT: Excluding MediaCombinator as it seems to be included by import (?)
+            if inspect.isclass(obj) and name != 'MediaCombinator' and name.startswith('MediaCombinator'):
+                return obj
+
+    @staticmethod
+    def getAllClassReferences():
+        return [MediaCombinator.getClassReference(i) for i in MediaCombinator.list()]

bin/ffx/test/media_combinator_0.py

@@ -0,0 +1,104 @@
+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 .media_combinator import MediaCombinator
+from .jellyfin_combinator import JellyfinCombinator
+from .media_tag_combinator import MediaTagCombinator
+
+
+class MediaCombinator0(MediaCombinator):
+
+    VARIANT = 'VA'
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+
+    def getVariant(self):
+        return MediaCombinator0.VARIANT
+
+
+
+    def getPayload(self):
+
+        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
+        trackDescriptor1 = 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
+        trackDescriptor2 = TrackDescriptor(**kwargs)
+
+        kwargs = {}
+        kwargs[MediaDescriptor.CONTEXT_KEY] = self._context
+        kwargs[MediaDescriptor.TRACK_DESCRIPTOR_LIST_KEY] = [trackDescriptor1,
+                                                                trackDescriptor2]
+        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():
+
+            mtc = MTC(self._context)
+
+            yObj = {}
+
+            yObj['identifier'] = self.getIdentifier()
+            yObj['variants'] = [self.getVariant(),
+                                    mtc.getVariant()]
+            yObj['payload'] = self.getPayload()
+
+            yObj['assertSelectors'] = ['M', 'MT']
+            yObj['assertFuncs'] = [self.assertFunc, 
+                                        mtc.createAssertFunc()]
+            yObj['shouldFail'] = (self.shouldFail()
+                                        | mtc.shouldFail())
+
+            yieldObj = {'target': yObj}
+
+            if self.__createPresets:
+
+                mtc_p = MTC(self._context, createPresets = True)
+
+                yObj_p = {}
+
+                yObj_p['identifier'] = self.getIdentifier()
+                yObj_p['variants'] = [self.getVariant(),
+                                        mtc_p.getVariant()]
+
+                yObj_p['payload'] = self.getPayload()
+
+                yObj_p['assertSelectors'] = ['M', 'MT']
+                yObj_p['assertFuncs'] = [self.assertFunc, 
+                                            mtc_p.createAssertFunc()]
+                yObj_p['shouldFail'] = (self.shouldFail()
+                                            | mtc_p.shouldFail())
+
+                yieldObj['preset'] = yObj_p
+
+            yield yieldObj

bin/ffx/test/media_combinator_1.py

@@ -0,0 +1,115 @@
+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 .media_combinator import MediaCombinator
+from .jellyfin_combinator import JellyfinCombinator
+from .media_tag_combinator import MediaTagCombinator
+
+
+class MediaCombinator1(MediaCombinator):
+
+    VARIANT = 'VAS'
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+
+    def getVariant(self):
+        return MediaCombinator1.VARIANT
+
+
+    def getPayload(self):
+
+        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
+        trackDescriptor2 = TrackDescriptor(**kwargs)
+
+        kwargs = {}
+        kwargs[MediaDescriptor.CONTEXT_KEY] = self._context
+        kwargs[MediaDescriptor.TRACK_DESCRIPTOR_LIST_KEY] = [trackDescriptor0,
+                trackDescriptor1,
+                trackDescriptor2]
+
+        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():
+
+            mtc = MTC(self._context)
+
+            yObj = {}
+
+            yObj['identifier'] = self.getIdentifier()
+            yObj['variants'] = [self.getVariant(),
+                                    mtc.getVariant()]
+
+            yObj['payload'] = self.getPayload()
+
+            yObj['assertSelectors'] = ['M', 'MT']
+            yObj['assertFuncs'] = [self.assertFunc,
+                                        mtc.createAssertFunc()]
+
+            yObj['shouldFail'] = (self.shouldFail()
+                                        | mtc.shouldFail())
+
+            yieldObj = {'target': yObj}
+
+            if self.__createPresets:
+
+                mtc_p = MTC(self._context, createPresets = True)
+
+                yObj_p = {}
+
+                yObj_p['identifier'] = self.getIdentifier()
+                yObj_p['variants'] = [self.getVariant(),
+                                        mtc_p.getVariant()]
+
+                yObj_p['payload'] = self.getPayload()
+
+                yObj_p['assertSelectors'] = ['M', 'MT']
+                yObj_p['assertFuncs'] = [self.assertFunc,
+                                            mtc_p.createAssertFunc()]
+
+                yObj_p['shouldFail'] = (self.shouldFail()
+                                            | mtc_p.shouldFail())
+                yieldObj['preset'] = yObj_p
+
+            yield yieldObj

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

bin/ffx/test/media_combinator_3.py

@@ -0,0 +1,175 @@
+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 .media_combinator import MediaCombinator
+
+from .disposition_combinator_3 import DispositionCombinator3
+from .track_tag_combinator_3 import TrackTagCombinator3
+from .jellyfin_combinator import JellyfinCombinator
+from .media_tag_combinator import MediaTagCombinator
+
+
+class MediaCombinator3(MediaCombinator):
+
+    VARIANT = 'VASSS'
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+
+    def getVariant(self):
+        return MediaCombinator3.VARIANT
+
+
+    def getPayload(self,
+                    subtitleDispositionTuple = (set(), 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[TrackDescriptor.CONTEXT_KEY] = self._context
+        kwargs[TrackDescriptor.INDEX_KEY] = 4
+        kwargs[TrackDescriptor.SOURCE_INDEX_KEY] = 4
+        kwargs[TrackDescriptor.TRACK_TYPE_KEY] = TrackType.SUBTITLE
+        kwargs[TrackDescriptor.SUB_INDEX_KEY] = 2
+        kwargs[TrackDescriptor.DISPOSITION_SET_KEY] = subtitleDispositionTuple[2]
+        kwargs[TrackDescriptor.TAGS_KEY] = subtitleTagTuple[2]
+        trackDescriptor4 = TrackDescriptor(**kwargs)
+
+        kwargs = {}
+        kwargs[MediaDescriptor.CONTEXT_KEY] = self._context
+        kwargs[MediaDescriptor.TRACK_DESCRIPTOR_LIST_KEY] =  [trackDescriptor0,
+                trackDescriptor1,
+                trackDescriptor2,
+                trackDescriptor3,
+                trackDescriptor4]
+
+        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 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)
+
+                        mtc = MTC(self._context)
+
+                        yObj = {}
+
+                        yObj['identifier'] = self.getIdentifier()
+                        yObj['variants'] = [self.getVariant(),
+                                                f"S:{dc3.getVariant()}",
+                                                f"S:{tc3.getVariant()}",
+                                                mtc.getVariant(),
+                                                j.getVariant()]
+
+                        yObj['payload'] = self.getPayload(dc3.getPayload(),
+                                                            tc3.getPayload())
+
+                        yObj['assertSelectors'] = ['M', 'SD', 'ST', 'MT', 'J']
+                        yObj['assertFuncs'] = [self.assertFunc,
+                                                    dc3.createAssertFunc(),
+                                                    tc3.createAssertFunc(),
+                                                    mtc.createAssertFunc(),
+                                                    j.assertFunc]
+
+                        yObj['shouldFail'] = (self.shouldFail()
+                                                    | dc3.shouldFail()
+                                                    | tc3.shouldFail()
+                                                    | mtc.shouldFail()
+                                                    | j.shouldFail())
+                        yieldObj = {'target': yObj}
+
+                        if self.__createPresets:
+
+                            dc3_p = DC3(self._context, createPresets = True)
+                            tc3_p = TC3(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:{dc3_p.getVariant()}",
+                                                    f"S:{tc3_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', 'J']
+                            yObj_p['assertFuncs'] = [self.assertFunc,
+                                                        dc3_p.createAssertFunc(),
+                                                        tc3_p.createAssertFunc(),
+                                                        mtc_p.createAssertFunc(),
+                                                        j.assertFunc]
+
+                            yObj_p['shouldFail'] = (self.shouldFail()
+                                                        | dc3_p.shouldFail()
+                                                        | tc3_p.shouldFail()
+                                                        | mtc_p.shouldFail()
+                                                        | j.shouldFail())
+                            yieldObj['preset'] = yObj_p
+
+                        yield yieldObj

bin/ffx/test/media_combinator_4.py

@@ -0,0 +1,155 @@
+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 .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 MediaCombinator4(MediaCombinator):
+
+    VARIANT = 'VAA'
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+
+    def getVariant(self):
+        return MediaCombinator4.VARIANT
+
+
+    def getPayload(self,
+                    audioDispositionTuple = (set(), set()),
+                    audioTagTuple = ({}, {})):
+
+        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
+        kwargs[TrackDescriptor.DISPOSITION_SET_KEY] = audioDispositionTuple[0]
+        kwargs[TrackDescriptor.TAGS_KEY] = audioTagTuple[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.AUDIO
+        kwargs[TrackDescriptor.SUB_INDEX_KEY] = 1
+        kwargs[TrackDescriptor.DISPOSITION_SET_KEY] = audioDispositionTuple[1]
+        kwargs[TrackDescriptor.TAGS_KEY] = audioTagTuple[1]
+        trackDescriptor2 = TrackDescriptor(**kwargs)
+
+        kwargs = {}
+        kwargs[MediaDescriptor.CONTEXT_KEY] = self._context
+        kwargs[MediaDescriptor.TRACK_DESCRIPTOR_LIST_KEY] =  [trackDescriptor0,
+                trackDescriptor1,
+                trackDescriptor2]
+
+        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"A:{dc2.getVariant()}",
+                                                f"A:{tc2.getVariant()}",
+                                                mtc.getVariant(),
+                                                j.getVariant()]
+
+                        yObj['payload'] = self.getPayload(dc2.getPayload(),
+                                                            tc2.getPayload())
+
+                        yObj['assertSelectors'] = ['M', 'AD', 'AT', '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"A:{dc2_p.getVariant()}",
+                                                    f"A:{tc2_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', '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

bin/ffx/test/media_combinator_5.py

@@ -0,0 +1,165 @@
+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 .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 MediaCombinator5(MediaCombinator):
+
+    VARIANT = 'VAAS'
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+
+    def getVariant(self):
+        return MediaCombinator5.VARIANT
+
+
+    def getPayload(self,
+                    audioDispositionTuple = (set(), set()),
+                    audioTagTuple = ({}, {})):
+
+        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
+        kwargs[TrackDescriptor.DISPOSITION_SET_KEY] = audioDispositionTuple[0]
+        kwargs[TrackDescriptor.TAGS_KEY] = audioTagTuple[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.AUDIO
+        kwargs[TrackDescriptor.SUB_INDEX_KEY] = 1
+        kwargs[TrackDescriptor.DISPOSITION_SET_KEY] = audioDispositionTuple[1]
+        kwargs[TrackDescriptor.TAGS_KEY] = audioTagTuple[1]
+        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] = 0
+        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"A:{dc2.getVariant()}",
+                                                f"A:{tc2.getVariant()}",
+                                                mtc.getVariant(),
+                                                j.getVariant()]
+
+                        yObj['payload'] = self.getPayload(dc2.getPayload(),
+                                                          tc2.getPayload())
+
+                        yObj['assertSelectors'] = ['M', 'AD', 'AT', '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"A:{dc2_p.getVariant()}",
+                                                    f"A:{tc2_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', '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

bin/ffx/test/media_combinator_6.py

@@ -0,0 +1,201 @@
+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 .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 MediaCombinator6(MediaCombinator):
+
+    VARIANT = 'VAASS'
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+
+    def getVariant(self):
+        return MediaCombinator6.VARIANT
+
+
+    def getPayload(self,
+                    audioDispositionTuple = (set(), set()),
+                    audioTagTuple = ({}, {}),
+                    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
+        kwargs[TrackDescriptor.DISPOSITION_SET_KEY] = audioDispositionTuple[0]
+        kwargs[TrackDescriptor.TAGS_KEY] = audioTagTuple[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.AUDIO
+        kwargs[TrackDescriptor.SUB_INDEX_KEY] = 1
+        kwargs[TrackDescriptor.DISPOSITION_SET_KEY] = audioDispositionTuple[1]
+        kwargs[TrackDescriptor.TAGS_KEY] = audioTagTuple[1]
+        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] = 0
+        kwargs[TrackDescriptor.DISPOSITION_SET_KEY] = subtitleDispositionTuple[0]
+        kwargs[TrackDescriptor.TAGS_KEY] = subtitleTagTuple[0]
+        trackDescriptor3 = TrackDescriptor(**kwargs)
+
+        kwargs = {}
+        kwargs[TrackDescriptor.CONTEXT_KEY] = self._context
+        kwargs[TrackDescriptor.INDEX_KEY] = 4
+        kwargs[TrackDescriptor.SOURCE_INDEX_KEY] = 4
+        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]
+        trackDescriptor4 = TrackDescriptor(**kwargs)
+
+        kwargs = {}
+        kwargs[MediaDescriptor.CONTEXT_KEY] = self._context
+        kwargs[MediaDescriptor.TRACK_DESCRIPTOR_LIST_KEY] = [trackDescriptor0,
+                trackDescriptor1,
+                trackDescriptor2,
+                trackDescriptor3,
+                trackDescriptor4]
+
+        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_A in DispositionCombinator2.getAllClassReferences():
+                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)
+                                tc2s = TC2_S(self._context)
+
+                                mtc = MTC(self._context)
+
+                                yObj = {}
+
+                                yObj['identifier'] = self.getIdentifier()
+                                yObj['variants'] = [self.getVariant(),
+                                                        f"A:{dc2a.getVariant()}",
+                                                        f"A:{tc2a.getVariant()}",
+                                                        f"S:{dc2s.getVariant()}",
+                                                        f"S:{tc2s.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', 'J']
+                                yObj['assertFuncs'] = [self.assertFunc,
+                                                            dc2a.createAssertFunc(),
+                                                            tc2a.createAssertFunc(),
+                                                            dc2s.createAssertFunc(),
+                                                            tc2s.createAssertFunc(),
+                                                            mtc.createAssertFunc(),
+                                                            j.assertFunc]
+
+                                yObj['shouldFail'] = (self.shouldFail()
+                                                            | dc2a.shouldFail()
+                                                            | tc2a.shouldFail()
+                                                            | dc2s.shouldFail()
+                                                            | tc2s.shouldFail()
+                                                            | mtc.shouldFail()
+                                                            | j.shouldFail())
+                                yieldObj = {'target': yObj}
+
+                                if self.__createPresets:
+
+                                    dc2a_p = DC2_A(self._context, createPresets = True)
+                                    tc2a_p = TC2_A(self._context, createPresets = True)
+                                    dc2s_p = DC2_S(self._context, createPresets = True)
+                                    tc2s_p = TC2_S(self._context, createPresets = True)
+
+                                    mtc_p = MTC(self._context, createPresets = True)
+
+                                    yObj_p = {}
+
+                                    yObj_p['identifier'] = self.getIdentifier()
+                                    yObj_p['variants'] = [self.getVariant(),
+                                                            f"A:{dc2a_p.getVariant()}",
+                                                            f"A:{tc2a_p.getVariant()}",
+                                                            f"S:{dc2s_p.getVariant()}",
+                                                            f"S:{tc2s_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', 'J']
+                                    yObj_p['assertFuncs'] = [self.assertFunc,
+                                                                dc2a_p.createAssertFunc(),
+                                                                tc2a_p.createAssertFunc(),
+                                                                dc2s_p.createAssertFunc(),
+                                                                tc2s_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()
+                                                                | j.shouldFail())
+                                    yieldObj['preset'] = yObj_p
+
+                                yield yieldObj

bin/ffx/test/media_combinator_7.py

@@ -0,0 +1,215 @@
+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 .media_combinator import MediaCombinator
+
+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 .jellyfin_combinator import JellyfinCombinator
+from .media_tag_combinator import MediaTagCombinator
+
+class MediaCombinator7(MediaCombinator):
+
+    VARIANT = 'VAASSS'
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+
+    def getVariant(self):
+        return MediaCombinator7.VARIANT
+
+
+    def getPayload(self,
+                    audioDispositionTuple = (set(), set()),
+                    audioTagTuple = ({}, {}),
+                    subtitleDispositionTuple = (set(), 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
+        kwargs[TrackDescriptor.DISPOSITION_SET_KEY] = audioDispositionTuple[0]
+        kwargs[TrackDescriptor.TAGS_KEY] = audioTagTuple[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.AUDIO
+        kwargs[TrackDescriptor.SUB_INDEX_KEY] = 1
+        kwargs[TrackDescriptor.DISPOSITION_SET_KEY] = audioDispositionTuple[1]
+        kwargs[TrackDescriptor.TAGS_KEY] = audioTagTuple[1]
+        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] = 0
+        kwargs[TrackDescriptor.DISPOSITION_SET_KEY] = subtitleDispositionTuple[0]
+        kwargs[TrackDescriptor.TAGS_KEY] = subtitleTagTuple[0]
+        trackDescriptor3 = TrackDescriptor(**kwargs)
+
+        kwargs = {}
+        kwargs[TrackDescriptor.CONTEXT_KEY] = self._context
+        kwargs[TrackDescriptor.INDEX_KEY] = 4
+        kwargs[TrackDescriptor.SOURCE_INDEX_KEY] = 4
+        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]
+        trackDescriptor4 = TrackDescriptor(**kwargs)
+
+        kwargs = {}
+        kwargs[TrackDescriptor.CONTEXT_KEY] = self._context
+        kwargs[TrackDescriptor.INDEX_KEY] = 5
+        kwargs[TrackDescriptor.SOURCE_INDEX_KEY] = 5
+        kwargs[TrackDescriptor.TRACK_TYPE_KEY] = TrackType.SUBTITLE
+        kwargs[TrackDescriptor.SUB_INDEX_KEY] = 2
+        kwargs[TrackDescriptor.DISPOSITION_SET_KEY] = subtitleDispositionTuple[2]
+        kwargs[TrackDescriptor.TAGS_KEY] = subtitleTagTuple[2]
+        trackDescriptor5 = TrackDescriptor(**kwargs)
+
+        kwargs = {}
+        kwargs[MediaDescriptor.CONTEXT_KEY] = self._context
+        kwargs[MediaDescriptor.TRACK_DESCRIPTOR_LIST_KEY] = [trackDescriptor0,
+                trackDescriptor1,
+                trackDescriptor2,
+                trackDescriptor3,
+                trackDescriptor4,
+                trackDescriptor5]
+
+        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_A in DispositionCombinator2.getAllClassReferences():
+                for TC2_A in TrackTagCombinator2.getAllClassReferences():
+                    for DC3_S in DispositionCombinator3.getAllClassReferences():
+                        for TC3_S in TrackTagCombinator3.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)
+                                dc3s = DC3_S(self._context)
+                                tc3s = TC3_S(self._context)
+
+                                mtc = MTC(self._context)
+
+                                yObj = {}
+
+                                yObj['identifier'] = self.getIdentifier()
+                                yObj['variants'] = [self.getVariant(),
+                                                        f"A:{dc2a.getVariant()}",
+                                                        f"A:{tc2a.getVariant()}",
+                                                        f"S:{dc3s.getVariant()}",
+                                                        f"S:{tc3s.getVariant()}",
+                                                        mtc.getVariant(),
+                                                        j.getVariant()]
+
+                                yObj['payload'] = self.getPayload(dc2a.getPayload(),
+                                                                    tc2a.getPayload(),
+                                                                    dc3s.getPayload(),
+                                                                    tc3s.getPayload())
+
+                                yObj['assertSelectors'] = ['M', 'AD', 'AT', 'SD', 'ST', 'MT', 'J']
+
+                                yObj['assertFuncs'] = [self.assertFunc,
+                                                            dc2a.createAssertFunc(),
+                                                            tc2a.createAssertFunc(),
+                                                            dc3s.createAssertFunc(),
+                                                            tc3s.createAssertFunc(),
+                                                            mtc.createAssertFunc(),
+                                                            j.assertFunc]
+
+                                yObj['shouldFail'] = (self.shouldFail()
+                                                            | dc2a.shouldFail()
+                                                            | tc2a.shouldFail()
+                                                            | dc3s.shouldFail()
+                                                            | tc3s.shouldFail()
+                                                            | mtc.shouldFail()
+                                                            | j.shouldFail())
+                                yieldObj = {'target': yObj}
+
+                                if self.__createPresets:
+
+                                    dc2a_p = DC2_A(self._context, createPresets = True)
+                                    tc2a_p = TC2_A(self._context, createPresets = True)
+                                    dc3s_p = DC3_S(self._context, createPresets = True)
+                                    tc3s_p = TC3_S(self._context, createPresets = True)
+
+                                    mtc_p = MTC(self._context, createPresets = True)
+
+                                    yObj_p = {}
+
+                                    yObj_p['identifier'] = self.getIdentifier()
+                                    yObj_p['variants'] = [self.getVariant(),
+                                                            f"A:{dc2a_p.getVariant()}",
+                                                            f"A:{tc2a_p.getVariant()}",
+                                                            f"S:{dc3s_p.getVariant()}",
+                                                            f"S:{tc3s_p.getVariant()}",
+                                                            mtc_p.getVariant(),
+                                                            j.getVariant()]
+
+                                    yObj_p['payload'] = self.getPayload(dc2a_p.getPayload(),
+                                                                        tc2a_p.getPayload(),
+                                                                        dc3s_p.getPayload(),
+                                                                        tc3s_p.getPayload())
+
+                                    yObj_p['assertSelectors'] = ['M', 'AD', 'AT', 'SD', 'ST', 'MT', 'J']
+
+                                    yObj_p['assertFuncs'] = [self.assertFunc,
+                                                                dc2a_p.createAssertFunc(),
+                                                                tc2a_p.createAssertFunc(),
+                                                                dc3s_p.createAssertFunc(),
+                                                                tc3s_p.createAssertFunc(),
+                                                                mtc_p.createAssertFunc(),
+                                                                j.assertFunc]
+
+                                    yObj_p['shouldFail'] = (self.shouldFail()
+                                                                | dc2a_p.shouldFail()
+                                                                | tc2a_p.shouldFail()
+                                                                | dc3s_p.shouldFail()
+                                                                | tc3s_p.shouldFail()
+                                                                | mtc_p.shouldFail()
+                                                                | j.shouldFail())
+                                    yieldObj['preset'] = yObj_p
+
+                                yield yieldObj

bin/ffx/test/media_tag_combinator.py

@@ -0,0 +1,33 @@
+import os, sys, importlib, glob, inspect, itertools
+
+class MediaTagCombinator():
+
+    IDENTIFIER = 'mediaTag'
+
+    def __init__(self, context = None):
+        self._context = context
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+    def getIdentifier(self):
+        return MediaTagCombinator.IDENTIFIER
+
+    @staticmethod    
+    def list():
+        basePath = os.path.dirname(__file__)
+        return [os.path.basename(p)[21:-3]
+                for p
+                in glob.glob(f"{ basePath }/media_tag_combinator_*.py", recursive = True)
+                if p != __file__]
+
+    @staticmethod
+    def getClassReference(identifier):
+        importlib.import_module(f"ffx.test.media_tag_combinator_{ identifier }")
+        for name, obj in inspect.getmembers(sys.modules[f"ffx.test.media_tag_combinator_{ identifier }"]):
+            #HINT: Excluding MediaCombinator as it seems to be included by import (?)
+            if inspect.isclass(obj) and name != 'MediaTagCombinator' and name.startswith('MediaTagCombinator'):
+                return obj
+
+    @staticmethod
+    def getAllClassReferences():
+        return [MediaTagCombinator.getClassReference(i) for i in MediaTagCombinator.list()]

bin/ffx/test/media_tag_combinator_0.py

@@ -0,0 +1,55 @@
+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 .media_tag_combinator import MediaTagCombinator
+
+
+class MediaTagCombinator0(MediaTagCombinator):
+
+    VARIANT = 'MT0'
+
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+    def getVariant(self):
+        return MediaTagCombinator0.VARIANT
+
+
+    def getPayload(self):
+        mediaTags = {}
+        if self.__createPresets:
+            mediaTags['THIS_IS'] = 'FFX'
+        return mediaTags
+
+
+    def createAssertFunc(self):
+
+        if self.__createPresets:
+
+            def f(assertObj: dict = {}):
+
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tags'")
+                mediaTags = assertObj['tags']
+
+                assert ('THIS_IS' in mediaTags.keys() and mediaTags.keys()['THIS_IS'] == 'FFX'
+                ), "Media tag 'THIS_IS' was not preserved"
+
+        else:
+
+            def f(assertObj: dict = {}):
+                pass
+
+        return f
+
+
+    def shouldFail(self):
+        return False

bin/ffx/test/media_tag_combinator_1.py

@@ -0,0 +1,59 @@
+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 .media_tag_combinator import MediaTagCombinator
+
+class MediaTagCombinator1(MediaTagCombinator):
+
+    VARIANT = 'MT1'
+
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+    def getVariant(self):
+        return MediaTagCombinator1.VARIANT
+
+
+    def getPayload(self):
+        mediaTags = {'From': 'Encoders'}
+        if self.__createPresets:
+            mediaTags['THIS_IS'] = 'FFX'
+        return mediaTags
+
+
+    def createAssertFunc(self):
+
+        if self.__createPresets:
+
+            def f(assertObj: dict = {}):
+
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tags'")
+                mediaTags = assertObj['tags']
+
+                assert ('From' in mediaTags.keys()
+                ), "'From' not in media tag keys"
+                assert (mediaTags.keys()['From'] == 'Encoders'
+                ), "Media tag value not 'Encoders' for key 'To'"
+
+                assert ('THIS_IS' in mediaTags.keys() and mediaTags.keys()['THIS_IS'] == 'FFX'
+                ), "Media tag 'THIS_IS' was not preserved"
+
+        else:
+
+            def f(assertObj: dict = {}):
+                pass
+
+        return f
+
+
+    def shouldFail(self):
+        return False

bin/ffx/test/media_tag_combinator_2.py

@@ -0,0 +1,64 @@
+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 .media_tag_combinator import MediaTagCombinator
+
+class MediaTagCombinator2(MediaTagCombinator):
+
+    VARIANT = 'MT2'
+
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+    def getVariant(self):
+        return MediaTagCombinator2.VARIANT
+
+
+    def getPayload(self):
+        mediaTags = {'To': 'Fanz',
+                        'Yolo': 'Holo'}
+        if self.__createPresets:
+            mediaTags['THIS_IS'] = 'FFX'
+        return mediaTags
+
+
+    def createAssertFunc(self):
+
+        if self.__createPresets:
+
+            def f(assertObj: dict = {}):
+
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tags'")
+                mediaTags = assertObj['tags']
+
+                assert ('To' in mediaTags.keys()
+                ), "'To' not in media tag keys"
+                assert (mediaTags.keys()['To'] == 'Fanz'
+                ), "Media tag value not 'Fanz' for key 'To'"
+                assert ('Yolo' in mediaTags.keys()
+                ), "'Yolo' not in media tag keys"
+                assert (mediaTags.keys()['Yolo'] == 'Holo'
+                ), "Media tag value not 'Holo' for key 'Yolo'"
+
+                assert ('THIS_IS' in mediaTags.keys() and mediaTags.keys()['THIS_IS'] == 'FFX'
+                ), "Media tag 'THIS_IS' was not preserved"
+
+        else:
+
+            def f(assertObj: dict = {}):
+                pass
+
+        return f
+
+
+    def shouldFail(self):
+        return False

bin/ffx/test/release_combinator.py

@@ -0,0 +1,37 @@
+class ReleaseCombinator():
+
+    IDENTIFIER = 'release'
+
+    RELEASE_LIST = [
+        ".GerEngSub.AAC.1080pINDICATOR.WebDL.x264-Tanuki",
+        ".German.AC3.DL.1080pINDICATOR.BluRay.x264-AST4u",
+        "-720pINDICATOR"
+    ]
+
+    def __init__(self, context = None, indicator = ''):
+        self._context = context
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+        self.__indicator = indicator
+
+    def getIdentifier(self):
+        return ReleaseCombinator.IDENTIFIER
+
+    def getPayload(self, releaseIndex):
+        releaseStr: str = ReleaseCombinator.RELEASE_LIST[releaseIndex]
+        return {
+            'variant': f"R{releaseIndex}",
+            'release': releaseStr.replace('INDICATOR', f".{self.__indicator}")
+                    if self.__indicator else releaseStr.replace('INDICATOR', '')
+        }
+
+    def assertFunc(self, testObj = {}):
+        pass
+
+    def shouldFail(self):
+        return False
+
+    def getYield(self):
+        for releaseIndex in range(len(ReleaseCombinator.RELEASE_LIST)):
+            yield self.getPayload(releaseIndex)

bin/ffx/test/scenario.py

@@ -0,0 +1,150 @@
+import os, glob, sys, importlib, glob, inspect
+
+from ffx.show_controller import ShowController
+from ffx.pattern_controller import PatternController
+from ffx.media_controller import MediaController
+
+from ffx.test.helper import createEmptyDirectory
+from ffx.database import databaseContext
+
+class Scenario():
+    """Scenarios
+    
+    Scenario1: Jellyfin, MediaTags, Stream-Kombinationen, Dispositions und StreamTags per Kombinatoren
+
+    Scenario2: <pattern> mit 3 Files x Scenario1
+
+    Scenario3: <tmdb+pattern> mit 3 Files (wenn TMDB API Key verfügbar)
+
+    Naming:
+
+    1: test.mkv             no tmdb, no pattern
+    2: test_s01e02.mkv
+    
+    Operationen:
+    
+    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
+    1: Yolo=Holo
+
+    Stream-Kombinationen (8)
+    
+    VA      D=1     T=1     =1
+    VAS     D=1     T=1     =1
+    VASS    D=4     T=4     =16
+    VASSS   D=5     T=5     =25
+    VAA     D=4     T=4     =16
+    VAAS    D=4     T=4     =16
+    VAASS   D=16    T=16    =256
+    VAASSS  D=20    T=20    =400
+                            =731
+
+    Dispositions-Kombinationen (per TrackType)
+    
+    0 = keine
+    1 = DEFAULT
+
+    2 Streams (4):
+    
+    D1: 00
+    D2: 01
+    D3: 10
+    D4: 11
+
+    3 Streams (5):
+    
+    D5: 000
+    D6: 001
+    D7: 010
+    D8: 100
+    D9: 101
+
+    Stream-Tag-Kombinationen (per TrackType)
+    
+    0 = keine
+    1 = lang+title
+
+    2 Streams:
+    
+    00
+    01
+    10
+    11
+
+    3 Streams:
+    
+    000
+    001
+    010
+    100
+    101
+    
+    
+    
+    """
+
+    def __init__(self, context = None):
+        self._context = context
+        self._testDirectory = createEmptyDirectory()
+        self._ffxExecutablePath = os.path.join(
+                                    os.path.dirname(
+                                        os.path.dirname(
+                                            os.path.dirname(__file__))),
+                                            'ffx.py')
+
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+        self._testDbFilePath = os.path.join(self._testDirectory, 'test.db')
+        self.createEmptyTestDatabase()
+
+
+    def createEmptyTestDatabase(self):
+
+        if not self._context['database'] is None:
+            self._context['database']['engine'].dispose()
+
+        if os.path.isfile(self._testDbFilePath):
+            os.unlink(self._testDbFilePath)
+        self._context['database'] = None
+
+        self._logger.debug(f"Creating test db with path {self._testDbFilePath}")
+        self._context['database'] = databaseContext(databasePath=self._testDbFilePath)
+
+        self._sc = ShowController(context = self._context)
+        self._pc = PatternController(context = self._context)
+        self._mc = MediaController(context = self._context)
+    
+
+    def clearTestDirectory(self):
+        testFiles = glob.glob(f"{self._testDirectory}/*")
+        for f in testFiles:
+            os.remove(f)
+
+    def getFilePathsInTestDirectory(self):
+        return [f for f in glob.glob(f"{self._testDirectory}/*")]
+
+    def getFilenamesInTestDirectory(self):
+        return [os.path.basename(f) for f in self.getFilePathsInTestDirectory()]
+
+
+    @staticmethod    
+    def list():
+        basePath = os.path.dirname(__file__)
+        return [os.path.basename(p)[9:-3]
+                for p
+                in glob.glob(f"{ basePath }/scenario_*.py", recursive = True)
+                if p != __file__]
+
+    @staticmethod
+    def getClassReference(identifier):
+        importlib.import_module(f"ffx.test.scenario_{ identifier }")
+        for name, obj in inspect.getmembers(sys.modules[f"ffx.test.scenario_{ identifier }"]):
+            #HINT: Excluding Scenario as it seems to be included by import (?)
+            if inspect.isclass(obj) and name != 'Scenario' and name.startswith('Scenario'):
+                return obj

bin/ffx/test/scenario_1.py

@@ -0,0 +1,176 @@
+import os, sys, click, glob
+
+from .scenario import Scenario
+
+from ffx.test.helper import createMediaTestFile
+from ffx.process import executeProcess
+
+from ffx.file_properties import FileProperties
+
+from ffx.media_descriptor import MediaDescriptor
+from ffx.track_descriptor import TrackDescriptor
+
+from ffx.track_type import TrackType
+from ffx.track_disposition import TrackDisposition
+
+from ffx.test.media_combinator_0 import MediaCombinator0
+
+from ffx.test.basename_combinator import BasenameCombinator
+
+
+class Scenario1(Scenario):
+    """Creating file VAa, h264/aac/aac
+    Converting to VaA, vp9/opus/opus
+    No tmdb, default parameters"""
+
+    TEST_FILE_EXTENSION = 'mkv'
+    EXPECTED_FILE_EXTENSION = 'webm'
+
+
+    def __init__(self, context):
+
+        context['use_jellyfin'] = True
+        context['use_tmdb'] = False
+        context['use_pattern'] = False
+
+        super().__init__(context)
+
+    def getScenario(self):
+        return self.__class__.__name__[8:]
+
+
+    def job(self, yieldObj: dict):
+
+        testContext = self._context.copy()
+
+        identifier = yieldObj['identifier']
+        variantList = yieldObj['variants']
+
+        variantIdentifier = '-'.join(variantList)
+        variantLabel = f"{self.__class__.__name__} Variant {variantIdentifier}"
+
+        mc0 = MediaCombinator0(context = testContext)
+        sourceMediaDescriptor: MediaDescriptor = mc0.getPayload()
+
+        assertSelectorList: list = yieldObj['assertSelectors']
+        assertFuncList = yieldObj['assertFuncs']
+        shouldFail = yieldObj['shouldFail']
+
+        variantPayload = yieldObj['payload']
+        variantBasename = variantPayload['basename']
+        variantFilenameLabel = variantPayload['label']
+        expectedBasename = variantPayload['expectedBasename']
+
+        variantFilename = f"{variantBasename}.{Scenario1.TEST_FILE_EXTENSION}"
+        expectedFilename = f"{expectedBasename}.{Scenario1.EXPECTED_FILE_EXTENSION}"
+
+
+        if self._context['test_variant'] and variantIdentifier != self._context['test_variant']:
+            return
+
+
+        self._logger.debug(f"Running Job: {variantLabel}")
+
+
+        # Phase 1: Setup source files
+
+        if not variantBasename:
+            raise ValueError(f"{variantLabel}: Testfile basename is falsy")
+
+
+        self.clearTestDirectory()
+
+        self._logger.debug(f"Creating test file: {variantFilename}")
+        mediaFilePath = createMediaTestFile(mediaDescriptor=sourceMediaDescriptor,
+                                            baseName=variantBasename,
+                                            directory=self._testDirectory,
+                                            logger=self._logger,
+                                            length = 2)
+
+
+        # Phase 2: Run ffx
+
+        commandSequence = [sys.executable,
+                            self._ffxExecutablePath]
+        
+        # if self._context['verbosity']:
+        #     commandSequence += ['--verbose',
+        #                         str(self._context['verbosity'])]
+
+        commandSequence += ['convert',
+                            mediaFilePath,
+                            '--no-prompt']
+        
+        if variantFilenameLabel:
+            commandSequence += ['--label', variantFilenameLabel]
+
+
+        if not testContext['use_jellyfin']:
+            commandSequence += ['--no-jellyfin']
+
+        commandSequence += ['--no-pattern']
+        commandSequence += ['--no-tmdb']
+
+
+        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})")
+
+
+        # Phase 3: Evaluate results
+            
+        resultFilenames = [rf for rf in self.getFilenamesInTestDirectory() if rf != 'ffmpeg2pass-0.log' and rf != variantFilename]
+        self._logger.debug(f"{variantLabel}: Result filenames: {resultFilenames}")
+
+
+        try:
+
+            jobFailed = bool(rc)
+
+            self._logger.debug(f"{variantLabel}: Should fail: {shouldFail} / actually failed: {jobFailed}")
+
+            assert (jobFailed == shouldFail
+            ), f"Process {'failed' if jobFailed else 'did not fail'}"
+
+            if not jobFailed:
+
+                expectedResultFilePath = os.path.join(self._testDirectory, f"{expectedFilename}")
+
+                assert (os.path.isfile(expectedResultFilePath)
+                ), f"Result file {expectedFilename} in path '{self._testDirectory}' wasn't created"
+
+                for assertIndex in range(len(assertSelectorList)):
+
+                    assertSelector = assertSelectorList[assertIndex]
+                    assertFunc = assertFuncList[assertIndex]
+                    assertVariant = variantList[assertIndex]
+
+                    if assertSelector == 'B':
+                        #TODO: per file find
+                        testObj = {'filenames': resultFilenames}
+                        assertFunc(testObj=testObj)
+                    if assertSelector == 'L':
+                        assertFunc()
+                    if assertSelector == 'I':
+                        assertFunc()
+
+            self._context['test_passed_counter'] += 1
+            self._reportLogger.info(f"{variantLabel}: Test passed")
+
+        except AssertionError as ae:
+
+            self._context['test_failed_counter'] += 1
+            self._reportLogger.error(f"{variantLabel}: Test FAILED ({ae})")
+
+
+    def run(self):
+        for BC in BasenameCombinator.getAllClassReferences():
+            self._logger.debug(f"BC={BC.__name__}")
+            bc = BC(context = self._context)
+            for y in bc.getYield():
+                self.job(y)

bin/ffx/test/scenario_2.py

@@ -0,0 +1,174 @@
+import os, sys, click
+
+from .scenario import Scenario
+
+from ffx.test.helper import createMediaTestFile
+from ffx.process import executeProcess
+
+from ffx.file_properties import FileProperties
+
+from ffx.media_descriptor import MediaDescriptor
+from ffx.track_descriptor import TrackDescriptor
+
+from ffx.track_type import TrackType
+from ffx.track_disposition import TrackDisposition
+
+from ffx.test.media_combinator import MediaCombinator
+
+
+class Scenario2(Scenario):
+    """Creating file VAa, h264/aac/aac
+    Converting to VaA, vp9/opus/opus
+    No tmdb, default parameters"""
+
+    TEST_FILE_EXTENSION = 'mkv'
+    EXPECTED_FILE_EXTENSION = 'webm'
+
+
+    def __init__(self, context):
+
+        context['use_jellyfin'] = True
+        context['use_tmdb'] = False
+        context['use_pattern'] = False
+
+        super().__init__(context)
+        
+    def getScenario(self):
+        return self.__class__.__name__[8:]
+
+
+    def job(self, yieldObj: dict):
+
+        testContext = self._context.copy()
+
+        targetYieldObj = yieldObj['target']
+        # presetYieldObj = yieldObj['preset'] # not used here
+
+        identifier = targetYieldObj['identifier']
+        variantList = targetYieldObj['variants']
+
+        variantIdentifier = '-'.join(variantList)
+        variantLabel = f"{self.__class__.__name__} Variant {variantIdentifier}"
+
+        sourceMediaDescriptor: MediaDescriptor = targetYieldObj['payload']
+
+        assertSelectorList: list = targetYieldObj['assertSelectors']
+        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 variantIdentifier != self._context['test_variant']:
+        if self._context['test_variant'] and not variantIdentifier.startswith(self._context['test_variant']):
+            return
+
+        self._logger.debug(f"Running Job: {variantLabel}")
+
+
+        # Phase 1: Setup source files
+
+        self.clearTestDirectory()
+        mediaFilePath = createMediaTestFile(mediaDescriptor=sourceMediaDescriptor,
+                                            directory=self._testDirectory,
+                                            logger=self._logger,
+                                            length = 2)
+
+
+        # Phase 2: Run ffx
+
+        commandSequence = [sys.executable,
+                            self._ffxExecutablePath,
+                            'convert',
+                            mediaFilePath,
+                            '--no-prompt']
+
+        if not testContext['use_jellyfin']:
+            commandSequence += ['--no-jellyfin']
+
+
+        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})")
+
+
+        # Phase 3: Evaluate results
+
+        resultFilenames = [rf for rf in self.getFilenamesInTestDirectory() if rf.endswith(f".{Scenario2.EXPECTED_FILE_EXTENSION}")]
+
+        self._logger.debug(f"{variantLabel}: Result filenames: {resultFilenames}")
+
+        try:
+
+            jobFailed = bool(rc)
+            self._logger.debug(f"{variantLabel}: Should fail: {shouldFail} / actually failed: {jobFailed}")
+
+            assert (jobFailed == shouldFail
+            ), f"Process {'failed' if jobFailed else 'did not fail'}"
+
+
+            if not jobFailed:
+
+                resultFile = os.path.join(self._testDirectory, 'media.webm')
+
+                assert (os.path.isfile(resultFile)
+                ), f"Result file 'media.webm' in path '{self._testDirectory}' wasn't created"
+
+                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)):
+
+                    assertSelector = assertSelectorList[assertIndex]
+                    assertFunc = assertFuncList[assertIndex]
+                    assertVariant = variantList[assertIndex]
+
+                    if assertSelector == 'M':
+                        assertFunc()
+                        for variantIndex in range(len(assertVariant)):
+                            assert (assertVariant[variantIndex].lower() == resultMediaTracks[variantIndex].getType().indicator()
+                            ), f"Stream #{variantIndex} is not of type {resultMediaTracks[variantIndex].getType().label()}"
+
+                    elif assertSelector == 'AD' or assertSelector == 'AT':
+                        assertFunc({'tracks': resultMediaDescriptor.getAudioTracks()})
+
+                    elif assertSelector == 'SD' or assertSelector == 'ST':
+                        assertFunc({'tracks': resultMediaDescriptor.getSubtitleTracks()})
+
+                    elif type(assertSelector) is str:
+                        if assertSelector == 'J':
+                            assertFunc()
+
+
+            self._context['test_passed_counter'] += 1
+            self._reportLogger.info(f"{variantLabel}: Test passed")
+
+        except AssertionError as ae:
+
+            self._context['test_failed_counter'] += 1
+            self._reportLogger.error(f"{variantLabel}: Test FAILED ({ae})")
+
+
+    def run(self):
+        MC_list = MediaCombinator.getAllClassReferences()
+        for MC in MC_list:
+            self._logger.debug(f"MC={MC.__name__}")
+            mc = MC(context = self._context)
+            for y in mc.getYield():
+                self.job(y)

bin/ffx/test/scenario_4.py

@@ -0,0 +1,277 @@
+import os, sys, click
+
+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.file_properties import FileProperties
+
+from ffx.media_descriptor import MediaDescriptor
+from ffx.track_descriptor import TrackDescriptor
+
+from ffx.track_type import TrackType
+from ffx.track_disposition import TrackDisposition
+
+from ffx.test.media_combinator import MediaCombinator
+from ffx.test.indicator_combinator import IndicatorCombinator
+
+from ffx.show_descriptor import ShowDescriptor
+
+
+from ffx.tmdb_controller import TmdbController
+from ffx.tmdb_controller import TMDB_API_KEY_NOT_PRESENT_EXCEPTION
+
+class Scenario4(Scenario):
+
+    TEST_SHOW_IDENTIFIER = 83095
+    TEST_SHOW_NAME = 'The Rising of the Shield Hero'
+    TEST_SHOW_YEAR = 2019
+
+    TEST_FILE_LABEL = 'rotsh'
+    TEST_FILE_EXTENSION = 'mkv'
+
+    TEST_PATTERN = f"{TEST_FILE_LABEL}_{FileProperties.SEASON_EPISODE_INDICATOR_MATCH}.{TEST_FILE_EXTENSION}"
+
+    EXPECTED_FILE_EXTENSION = 'webm'
+
+
+    def __init__(self, context):
+        super().__init__(context)
+
+        self.__tmdbApiKey = os.environ.get('TMDB_API_KEY', None)
+        if self.__tmdbApiKey is None:
+            raise TMDB_API_KEY_NOT_PRESENT_EXCEPTION
+
+        self.__ic = IndicatorCombinator(context = context)
+        self.__tc = TmdbController()
+
+
+        kwargs = {}
+        kwargs[ShowDescriptor.ID_KEY] = Scenario4.TEST_SHOW_IDENTIFIER
+        kwargs[ShowDescriptor.NAME_KEY] = Scenario4.TEST_SHOW_NAME
+        kwargs[ShowDescriptor.YEAR_KEY] = Scenario4.TEST_SHOW_YEAR
+
+        self.__testShowDescriptor = ShowDescriptor(**kwargs)
+
+    def getScenario(self):
+        return self.__class__.__name__[8:]
+
+
+    def prepareTestDatabase(self, sourceMediaDescriptor: MediaDescriptor):
+
+        if not self._context['database'] is None:
+            self._context['database']['engine'].dispose()
+
+        if os.path.isfile(self._testDbFilePath):
+            os.unlink(self._testDbFilePath)
+        self._context['database'] = None
+
+        self._logger.debug(f"Creating test db with path {self._testDbFilePath}")
+        self._context['database'] = databaseContext(databasePath=self._testDbFilePath)
+
+
+        self._logger.debug(f"Adding test show '{self.__testShowDescriptor.getFilenamePrefix()}' to test db")
+        if not self._sc.updateShow(self.__testShowDescriptor):
+            raise click.ClickException('Could not create test show in db')
+
+        testPatternDescriptor = {
+             'show_id': Scenario4.TEST_SHOW_IDENTIFIER,
+             'pattern': Scenario4.TEST_PATTERN
+        }
+        patternId = self._pc.addPattern(testPatternDescriptor)
+
+        if patternId:
+            self._mc.setPatternMediaDescriptor(sourceMediaDescriptor, patternId)
+
+
+    def job(self, yieldObj: dict):
+
+        testContext = self._context.copy()
+
+        if 'preset' not in yieldObj.keys():
+            raise KeyError('yieldObj did not contain presets')
+
+        targetYieldObj = yieldObj['target']
+        presetYieldObj = yieldObj['preset']
+
+        identifier = targetYieldObj['identifier']
+        variantList = targetYieldObj['variants']
+
+        variantIdentifier = '-'.join(variantList)
+        variantLabel = f"{self.__class__.__name__} Variant {variantIdentifier}"
+
+        sourceMediaDescriptor: MediaDescriptor = targetYieldObj['payload']
+        presetMediaDescriptor: MediaDescriptor = presetYieldObj['payload']
+
+        assertSelectorList: list = presetYieldObj['assertSelectors']
+        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 variantIdentifier != self._context['test_variant']:
+            return
+
+        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
+
+        self.clearTestDirectory()
+
+        testFileList = []
+        for indicatorObj in [y for y in self.__ic.getYield() if y['indicator']]:
+
+            indicator = indicatorObj['indicator']
+
+            testFileObj = {}
+            testFileObj['season'] = indicatorObj['season']
+            testFileObj['episode'] = indicatorObj['episode']
+
+            testFileObj['basename'] = f"{Scenario4.TEST_FILE_LABEL}_{indicator}"
+
+            testFileObj['path'] = createMediaTestFile(mediaDescriptor = presetMediaDescriptor,
+                                                directory = self._testDirectory,
+                                                baseName = testFileObj['basename'],
+                                                logger=self._logger,
+                                                length = 2)
+            testFileObj['filename'] = f"{testFileObj['basename']}.{Scenario4.TEST_FILE_EXTENSION}"
+
+            testFileList.append(testFileObj)
+
+
+        # Phase 2: Prepare database
+
+        self.createEmptyTestDatabase()
+        self.prepareTestDatabase(sourceMediaDescriptor)
+
+
+        # Phase 3: Run ffx
+
+        commandSequence = [sys.executable,
+                            self._ffxExecutablePath,
+                            '--database-file',
+                            self._testDbFilePath,
+                            'convert']
+        commandSequence += [tfo['filename'] for tfo in testFileList]
+
+        commandSequence += ['--no-prompt']
+
+        if not testContext['use_jellyfin']:
+            commandSequence += ['--no-jellyfin']
+
+        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})")
+
+
+        # Phase 4: Evaluate results
+
+        resultFilenames = [rf for rf in self.getFilenamesInTestDirectory() if rf.endswith(f".{Scenario4.EXPECTED_FILE_EXTENSION}")]
+
+        self._logger.debug(f"{variantLabel}: Result filenames: {resultFilenames}")
+        
+
+        try:
+
+            jobFailed = bool(rc)
+            self._logger.debug(f"{variantLabel}: Should fail: {shouldFail} / actually failed: {jobFailed}")
+
+            assert (jobFailed == shouldFail
+            ), f"Process {'failed' if jobFailed else 'did not fail'}"
+
+            if not jobFailed:
+
+                for tfo in testFileList:
+
+                    tmdbEpisodeResult = self.__tc.queryEpisode(Scenario4.TEST_SHOW_IDENTIFIER,
+                                                                tfo['season'], tfo['episode']) 
+
+                    expectedFileBasename = TmdbController.getEpisodeFileBasename(self.__testShowDescriptor.getFilenamePrefix(),
+                                                                    tmdbEpisodeResult['name'],
+                                                                    tfo['season'], tfo['episode']) 
+
+                    expectedFilename = f"{expectedFileBasename}.{Scenario4.EXPECTED_FILE_EXTENSION}"
+                    expectedFilePath = os.path.join(self._testDirectory, expectedFilename)
+
+                    assert (os.path.isfile(expectedFilePath)
+                    ), f"Result file '{expectedFilename}' in path '{self._testDirectory}' wasn't created"
+
+
+                    rfp = FileProperties(testContext, expectedFilePath)
+                    self._logger.debug(f"{variantLabel}: Result file properties: {rfp.getFilename()} season={rfp.getSeason()} episode={rfp.getEpisode()}")
+
+                    rmd = rfp.getMediaDescriptor()
+                    rmt = rmd.getAllTrackDescriptors()
+
+                    for l in rmd.getConfiguration(label = 'resultMediaDescriptor'):
+                        self._logger.debug(l)
+
+                    if testContext['use_jellyfin']:
+                        sourceMediaDescriptor.applyJellyfinOrder()
+
+                    # num tracks differ
+                    rmd.applySourceIndices(sourceMediaDescriptor)
+
+
+                    for assertIndex in range(len(assertSelectorList)):
+
+                        assertSelector = assertSelectorList[assertIndex]
+                        assertFunc = assertFuncList[assertIndex]
+                        assertVariant = variantList[assertIndex]
+
+                        if assertSelector == 'M':
+                            assertFunc()
+                            for variantIndex in range(len(assertVariant)):
+                                assert (assertVariant[variantIndex].lower() == rmt[variantIndex].getType().indicator()
+                                ), f"Stream #{variantIndex} is not of type {rmt[variantIndex].getType().label()}"
+
+                        if assertSelector == 'AD' or assertSelector == 'AT':
+                            assertFunc({'tracks': rmd.getAudioTracks()})
+
+                        elif assertSelector == 'SD' or assertSelector == 'ST':
+                            assertFunc({'tracks': rmd.getSubtitleTracks()})
+
+                        elif type(assertSelector) is str:
+                            if assertSelector == 'J':
+                                assertFunc()
+
+
+            self._context['test_passed_counter'] += 1
+            self._reportLogger.info(f"{variantLabel}: Test passed")
+
+        except AssertionError as ae:
+
+            self._context['test_failed_counter'] += 1
+            self._reportLogger.error(f"{variantLabel}: Test FAILED ({ae})")
+
+        # exit()
+
+    def run(self):
+
+        MC_list = [MediaCombinator.getClassReference(6)]
+        for MC in MC_list:
+            self._logger.debug(f"MC={MC.__name__}")
+            mc = MC(context = self._context, createPresets = True)
+            for y in mc.getYield():
+                self.job(y)

bin/ffx/test/show_combinator.py

@@ -0,0 +1,33 @@
+class ShowCombinator():
+
+    IDENTIFIER = 'show'
+
+    SHOW_LIST = [
+        'Boruto; Naruto Next Generations (2017)',
+        'The Rising of the Shield Hero (2019)',
+        'Scrubs - Die Anfänger (2001)'
+    ]
+
+    def __init__(self, context = None):
+        self._context = context
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+    def getIdentifier(self):
+        return ShowCombinator.IDENTIFIER
+
+    def getPayload(self, showIndex):
+        return {
+            'variant': f"S{showIndex}",
+            'show': ShowCombinator.SHOW_LIST[showIndex]
+        }
+
+    def assertFunc(self, testObj = {}):
+        pass
+
+    def shouldFail(self):
+        return False
+
+    def getYield(self):
+        for showIndex in range(len(ShowCombinator.SHOW_LIST)):
+            yield self.getPayload(showIndex)

bin/ffx/test/title_combinator.py

@@ -0,0 +1,33 @@
+class TitleCombinator():
+
+    IDENTIFIER = 'title'
+
+    TITLE_LIST = [
+        'The Sound of Space',
+        '2001; Odyssee im Weltraum (1968)',
+        'Ansible 101'
+    ]
+
+    def __init__(self, context = None):
+        self._context = context
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+    def getIdentifier(self):
+        return TitleCombinator.IDENTIFIER
+        
+    def getPayload(self, titleIndex):
+        return {
+            'variant': f"S{titleIndex}",
+            'show': TitleCombinator.TITLE_LIST[titleIndex]
+        }
+
+    def assertFunc(self, testObj = {}):
+        pass
+
+    def shouldFail(self):
+        return False
+
+    def getYield(self):
+        for titleIndex in range(len(TitleCombinator.TITLE_LIST)):
+            yield self.getPayload(titleIndex)

bin/ffx/test/track_tag_combinator_2.py

@@ -0,0 +1,33 @@
+import os, sys, importlib, glob, inspect, itertools
+
+class TrackTagCombinator2():
+
+    IDENTIFIER = 'trackTag2'
+
+    def __init__(self, context = None):
+        self._context = context
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+    def getIdentifier(self):
+        return TrackTagCombinator2.IDENTIFIER
+
+    @staticmethod    
+    def list():
+        basePath = os.path.dirname(__file__)
+        return [os.path.basename(p)[23:-3]
+                for p
+                in glob.glob(f"{ basePath }/track_tag_combinator_2_*.py", recursive = True)
+                if p != __file__]
+
+    @staticmethod
+    def getClassReference(identifier):
+        importlib.import_module(f"ffx.test.track_tag_combinator_2_{ identifier }")
+        for name, obj in inspect.getmembers(sys.modules[f"ffx.test.track_tag_combinator_2_{ identifier }"]):
+            #HINT: Excluding DispositionCombination as it seems to be included by import (?)
+            if inspect.isclass(obj) and name != 'TrackTagCombinator2' and name.startswith('TrackTagCombinator2'):
+                return obj
+
+    @staticmethod
+    def getAllClassReferences():
+        return [TrackTagCombinator2.getClassReference(i) for i in TrackTagCombinator2.list()]

bin/ffx/test/track_tag_combinator_2_0.py

@@ -0,0 +1,89 @@
+import os, sys, importlib, glob, inspect
+
+from ffx.track_disposition import TrackDisposition
+from .track_tag_combinator_2 import TrackTagCombinator2
+
+
+class TrackTagCombinator20(TrackTagCombinator2):
+
+    VARIANT = 'T00'
+
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+    def getVariant(self):
+        return TrackTagCombinator20.VARIANT
+
+
+    def getPayload(self):
+
+        subTrack0 = {}
+        subTrack1 = {}
+
+        if self.__createPresets:
+            subTrack0['THIS_IS'] = 'track0'
+            subTrack1['THIS_IS'] = 'track1'
+
+        return (subTrack0,
+                subTrack1)
+
+
+    def createAssertFunc(self):
+
+        if self.__createPresets:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert (not 'language' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set title tag"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[0].getTags().keys() and resortedTrackDescriptors[0].getTags()['THIS_IS'] == 'track0'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not preserved tag THIS_IS"
+
+                # source subIndex 1
+                assert (not 'language' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has set title tag"
+                assert (not 'title' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has set title tag"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[1].getTags().keys() and resortedTrackDescriptors[1].getTags()['THIS_IS'] == 'track1'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has not preserved tag THIS_IS"
+
+        else:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert (not 'language' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set title tag"
+                
+                # source subIndex 1
+                assert (not 'language' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has set title tag"
+
+        return f
+
+
+    def shouldFail(self):
+        return False

bin/ffx/test/track_tag_combinator_2_1.py

@@ -0,0 +1,96 @@
+import os, sys, importlib, glob, inspect
+
+from ffx.track_disposition import TrackDisposition
+from .track_tag_combinator_2 import TrackTagCombinator2
+
+
+class TrackTagCombinator21(TrackTagCombinator2):
+
+    VARIANT = 'T10'
+
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+    def getVariant(self):
+        return TrackTagCombinator21.VARIANT
+
+
+    def getPayload(self):
+
+        subTrack0 = ({'language': 'rus', 'title': 'Russisch'}
+                        if self.__createPresets else {'language': 'fra', 'title': 'Französisch'})
+        subTrack1 = {}
+
+        if self.__createPresets:
+            subTrack0['THIS_IS'] = 'track0'
+            subTrack1['THIS_IS'] = 'track1'
+
+        return (subTrack0,
+                subTrack1)
+
+
+    def createAssertFunc(self):
+
+        if self.__createPresets:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert ('language' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag"
+                assert (resortedTrackDescriptors[0].getTags()['language'] == 'fra'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag 'fra'"
+                assert ('title' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title tag"
+                assert (resortedTrackDescriptors[0].getTags()['title'] == 'Französisch'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title 'Französisch'"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[0].getTags().keys() and resortedTrackDescriptors[0].getTags()['THIS_IS'] == 'track0'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not preserved tag THIS_IS"
+
+                # source subIndex 1
+                assert (not 'language' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set title tag"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[1].getTags().keys() and resortedTrackDescriptors[1].getTags()['THIS_IS'] == 'track1'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has not preserved tag THIS_IS"
+
+        else:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert ('language' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag"
+                assert (resortedTrackDescriptors[0].getTags()['language'] == 'fra'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag 'fra'"
+                assert ('title' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title tag"
+                assert (resortedTrackDescriptors[0].getTags()['title'] == 'Französisch'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title 'Französisch'"
+
+                # source subIndex 1
+                assert (not 'language' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set title tag"
+
+        return f
+
+
+    def shouldFail(self):
+        return False

bin/ffx/test/track_tag_combinator_2_2.py

@@ -0,0 +1,97 @@
+import os, sys, importlib, glob, inspect
+
+from ffx.track_disposition import TrackDisposition
+from .track_tag_combinator_2 import TrackTagCombinator2
+
+
+class TrackTagCombinator21(TrackTagCombinator2):
+
+    VARIANT = 'T01'
+
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+    def getVariant(self):
+        return TrackTagCombinator21.VARIANT
+
+
+    def getPayload(self):
+
+        subTrack0 = {}
+        subTrack1 = ({'language': 'chn', 'title': 'China'}
+                        if self.__createPresets else {'language': 'bas', 'title': 'Baskisch'})
+
+        if self.__createPresets:
+            subTrack0['THIS_IS'] = 'track0'
+            subTrack1['THIS_IS'] = 'track1'
+
+        return (subTrack0,
+                subTrack1)
+    
+
+    def createAssertFunc(self):
+
+        if self.__createPresets:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert (not 'language' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set title tag"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[0].getTags().keys() and resortedTrackDescriptors[0].getTags()['THIS_IS'] == 'track0'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not preserved tag THIS_IS"
+
+                # source subIndex 1
+                assert ('language' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has not set language tag"
+                assert (resortedTrackDescriptors[1].getTags()['language'] == 'bas'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has not set language tag 'bas'"
+                assert ('title' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has not set title tag"
+                assert (resortedTrackDescriptors[1].getTags()['title'] == 'Baskisch'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has not set title 'Baskisch'"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[1].getTags().keys() and resortedTrackDescriptors[1].getTags()['THIS_IS'] == 'track1'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has not preserved tag THIS_IS"
+
+        else:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert (not 'language' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set title tag"
+
+                # source subIndex 1
+                assert ('language' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has not set language tag"
+                assert (resortedTrackDescriptors[1].getTags()['language'] == 'bas'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has not set language tag 'bas'"
+                assert ('title' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has not set title tag"
+                assert (resortedTrackDescriptors[1].getTags()['title'] == 'Baskisch'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has not set title 'Baskisch'"
+
+        return f
+
+
+    def shouldFail(self):
+        return False
+    

bin/ffx/test/track_tag_combinator_2_3.py

@@ -0,0 +1,106 @@
+import os, sys, importlib, glob, inspect
+
+from ffx.track_disposition import TrackDisposition
+from .track_tag_combinator_2 import TrackTagCombinator2
+
+
+class TrackTagCombinator23(TrackTagCombinator2):
+
+    VARIANT = 'T11'
+
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+
+    def getVariant(self):
+        return TrackTagCombinator23.VARIANT
+
+
+    def getPayload(self):
+
+        subTrack0 = ({'language': 'chn', 'title': 'China'}
+                        if self.__createPresets else {'language': 'deu', 'title': 'Deutsch'})
+        subTrack1 = {'language': 'jpn', 'title': 'Japanisch'}
+
+        if self.__createPresets:
+            subTrack0['THIS_IS'] = 'track0'
+            subTrack1['THIS_IS'] = 'track1'
+
+        return (subTrack0,
+                subTrack1)
+
+
+
+    def createAssertFunc(self):
+
+        if self.__createPresets:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert ('language' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag"
+                assert (resortedTrackDescriptors[0].getTags()['language'] == 'deu'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag 'deu'"
+                assert ('title' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title tag"
+                assert (resortedTrackDescriptors[0].getTags()['title'] == 'Deutsch'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title 'Deutsch'"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[0].getTags().keys() and resortedTrackDescriptors[0].getTags()['THIS_IS'] == 'track0'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not preserved tag THIS_IS"
+
+                # source subIndex 1
+                assert ('language' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag"
+                assert (resortedTrackDescriptors[1].getTags()['language'] == 'jpn'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag 'jpn'"
+                assert ('title' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title tag"
+                assert (resortedTrackDescriptors[1].getTags()['title'] == 'Japanisch'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title 'Japanisch'"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[1].getTags().keys() and resortedTrackDescriptors[1].getTags()['THIS_IS'] == 'track1'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has not preserved tag THIS_IS"
+
+        else:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert ('language' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag"
+                assert (resortedTrackDescriptors[0].getTags()['language'] == 'deu'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag 'deu'"
+                assert ('title' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title tag"
+                assert (resortedTrackDescriptors[0].getTags()['title'] == 'Deutsch'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title 'Deutsch'"
+
+                # source subIndex 1
+                assert ('language' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag"
+                assert (resortedTrackDescriptors[1].getTags()['language'] == 'jpn'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag 'jpn'"
+                assert ('title' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title tag"
+                assert (resortedTrackDescriptors[1].getTags()['title'] == 'Japanisch'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title 'Japanisch'"
+
+        return f
+
+
+    def shouldFail(self):
+        return False

bin/ffx/test/track_tag_combinator_3.py

@@ -0,0 +1,33 @@
+import os, sys, importlib, glob, inspect, itertools
+
+class TrackTagCombinator3():
+
+    IDENTIFIER = 'trackTag3'
+
+    def __init__(self, context = None):
+        self._context = context
+        self._logger = context['logger']
+        self._reportLogger = context['report_logger']
+
+    def getIdentifier(self):
+        return TrackTagCombinator3.IDENTIFIER
+
+    @staticmethod    
+    def list():
+        basePath = os.path.dirname(__file__)
+        return [os.path.basename(p)[23:-3]
+                for p
+                in glob.glob(f"{ basePath }/track_tag_combinator_3_*.py", recursive = True)
+                if p != __file__]
+
+    @staticmethod
+    def getClassReference(identifier):
+        importlib.import_module(f"ffx.test.track_tag_combinator_3_{ identifier }")
+        for name, obj in inspect.getmembers(sys.modules[f"ffx.test.track_tag_combinator_3_{ identifier }"]):
+            #HINT: Excluding DispositionCombination as it seems to be included by import (?)
+            if inspect.isclass(obj) and name != 'TrackTagCombinator3' and name.startswith('TrackTagCombinator3'):
+                return obj
+
+    @staticmethod
+    def getAllClassReferences():
+        return [TrackTagCombinator3.getClassReference(i) for i in TrackTagCombinator3.list()]

bin/ffx/test/track_tag_combinator_3_0.py

@@ -0,0 +1,105 @@
+import os, sys, importlib, glob, inspect
+
+from ffx.track_disposition import TrackDisposition
+from .track_tag_combinator_3 import TrackTagCombinator3
+
+
+class TrackTagCombinator30(TrackTagCombinator3):
+
+    VARIANT = 'T000'
+
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+    def getVariant(self):
+        return TrackTagCombinator30.VARIANT
+
+
+    def getPayload(self):
+
+        subtrack0 = {}
+        subtrack1 = {}
+        subtrack2 = {}
+
+        if self.__createPresets:
+            subtrack0['THIS_IS'] = 'track0'
+            subtrack1['THIS_IS'] = 'track1'
+            subtrack2['THIS_IS'] = 'track2'
+
+        return (subtrack0,
+                subtrack1,
+                subtrack2)
+
+
+    def createAssertFunc(self):
+
+        if self.__createPresets:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert not ('language' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set language tag"
+                assert not ('title' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set title tag"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[0].getTags().keys() and resortedTrackDescriptors[0].getTags()['THIS_IS'] == 'track0'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not preserved tag THIS_IS"
+
+                # source subIndex 1
+                assert not ('language' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has set language tag"
+                assert not ('title' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has set title tag"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[1].getTags().keys() and resortedTrackDescriptors[1].getTags()['THIS_IS'] == 'track1'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has not preserved tag THIS_IS"
+
+                # source subIndex 2
+                assert not ('language' in resortedTrackDescriptors[2].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[2].getSubIndex()}] has set language tag"
+                assert not ('title' in resortedTrackDescriptors[2].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[2].getSubIndex()}] has set title tag"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[2].getTags().keys() and resortedTrackDescriptors[2].getTags()['THIS_IS'] == 'track2'
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[2].getSubIndex()}] has not preserved tag THIS_IS"
+
+        else:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert not ('language' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set language tag"
+                assert not ('title' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set title tag"
+
+                # source subIndex 1
+                assert not ('language' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has set language tag"
+                assert not ('title' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has set title tag"
+
+                # source subIndex 2
+                assert not ('language' in resortedTrackDescriptors[2].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[2].getSubIndex()}] has set language tag"
+                assert not ('title' in resortedTrackDescriptors[2].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[2].getSubIndex()}] has set title tag"
+
+        return f
+
+
+    def shouldFail(self):
+        return False

bin/ffx/test/track_tag_combinator_3_1.py

@@ -0,0 +1,114 @@
+import os, sys, importlib, glob, inspect
+
+from ffx.track_disposition import TrackDisposition
+from .track_tag_combinator_3 import TrackTagCombinator3
+
+
+class TrackTagCombinator31(TrackTagCombinator3):
+
+    VARIANT = 'T100'
+
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+    def getVariant(self):
+        return TrackTagCombinator31.VARIANT
+
+
+    def getPayload(self):
+
+        subtrack0 = ({'language': 'rus', 'title': 'Russisch'}
+                        if self.__createPresets else {'language': 'fra', 'title': 'Französisch'})
+        subtrack1 = {}
+        subtrack2 = {}
+
+        if self.__createPresets:
+            subtrack0['THIS_IS'] = 'track0'
+            subtrack1['THIS_IS'] = 'track1'
+            subtrack2['THIS_IS'] = 'track2'
+
+        return (subtrack0,
+                subtrack1,
+                subtrack2)
+
+
+    def createAssertFunc(self):
+
+        if self.__createPresets:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert ('language' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag"
+                assert (resortedTrackDescriptors[0].getTags()['language'] == 'fra'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag 'fra'"
+                assert ('title' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title tag"
+                assert (resortedTrackDescriptors[0].getTags()['title'] == 'Französisch'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title 'Französisch'"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[0].getTags().keys() and resortedTrackDescriptors[0].getTags()['THIS_IS'] == 'track0'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not preserved tag THIS_IS"
+
+                # source subIndex 1
+                assert (not 'language' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has set title tag"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[1].getTags().keys() and resortedTrackDescriptors[1].getTags()['THIS_IS'] == 'track1'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has not preserved tag THIS_IS"
+
+                # source subIndex 2
+                assert (not 'language' in resortedTrackDescriptors[2].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[2].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[2].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[2].getSubIndex()}] has set title tag"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[2].getTags().keys() and resortedTrackDescriptors[2].getTags()['THIS_IS'] == 'track2'
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[2].getSubIndex()}] has not preserved tag THIS_IS"
+
+        else:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert ('language' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag"
+                assert (resortedTrackDescriptors[0].getTags()['language'] == 'fra'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag 'fra'"
+                assert ('title' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title tag"
+                assert (resortedTrackDescriptors[0].getTags()['title'] == 'Französisch'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title 'Französisch'"
+
+                # source subIndex 1
+                assert (not 'language' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has set title tag"
+
+                # source subIndex 2
+                assert (not 'language' in resortedTrackDescriptors[2].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[2].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[2].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[2].getSubIndex()}] has set title tag"
+
+        return f
+
+
+    def shouldFail(self):
+        return False

bin/ffx/test/track_tag_combinator_3_2.py

@@ -0,0 +1,114 @@
+import os, sys, importlib, glob, inspect
+
+from ffx.track_disposition import TrackDisposition
+from .track_tag_combinator_3 import TrackTagCombinator3
+
+
+class TrackTagCombinator32(TrackTagCombinator3):
+
+    VARIANT = 'T010'
+
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+    def getVariant(self):
+        return TrackTagCombinator32.VARIANT
+
+
+    def getPayload(self):
+
+        subtrack0 = {}
+        subtrack1 = ({'language': 'chn', 'title': 'China'}
+                        if self.__createPresets else {'language': 'bas', 'title': 'Baskisch'})
+        subtrack2 = {}
+
+        if self.__createPresets:
+            subtrack0['THIS_IS'] = 'track0'
+            subtrack1['THIS_IS'] = 'track1'
+            subtrack2['THIS_IS'] = 'track2'
+
+        return (subtrack0,
+                subtrack1,
+                subtrack2)
+
+ 
+    def createAssertFunc(self):
+
+        if self.__createPresets:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert (not 'language' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set title tag"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[0].getTags().keys() and resortedTrackDescriptors[0].getTags()['THIS_IS'] == 'track0'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not preserved tag THIS_IS"
+
+                # source subIndex 1
+                assert ('language' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag"
+                assert (resortedTrackDescriptors[1].getTags()['language'] == 'bas'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag 'bas'"
+                assert ('title' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title tag"
+                assert (resortedTrackDescriptors[1].getTags()['title'] == 'Baskisch'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title 'Baskisch'"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[1].getTags().keys() and resortedTrackDescriptors[1].getTags()['THIS_IS'] == 'track1'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has not preserved tag THIS_IS"
+
+                # source subIndex 2
+                assert (not 'language' in resortedTrackDescriptors[2].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[2].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[2].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[2].getSubIndex()}] has set title tag"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[2].getTags().keys() and resortedTrackDescriptors[2].getTags()['THIS_IS'] == 'track2'
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[2].getSubIndex()}] has not preserved tag THIS_IS"
+
+        else:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert (not 'language' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set title tag"
+
+                # source subIndex 1
+                assert ('language' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag"
+                assert (resortedTrackDescriptors[1].getTags()['language'] == 'bas'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag 'bas'"
+                assert ('title' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title tag"
+                assert (resortedTrackDescriptors[1].getTags()['title'] == 'Baskisch'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title 'Baskisch'"
+
+                # source subIndex 2
+                assert (not 'language' in resortedTrackDescriptors[2].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[2].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[2].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[2].getSubIndex()}] has set title tag"
+
+        return f
+
+
+    def shouldFail(self):
+        return False

bin/ffx/test/track_tag_combinator_3_3.py

@@ -0,0 +1,114 @@
+import os, sys, importlib, glob, inspect
+
+from ffx.track_disposition import TrackDisposition
+from .track_tag_combinator_3 import TrackTagCombinator3
+
+
+class TrackTagCombinator33(TrackTagCombinator3):
+
+    VARIANT = 'T001'
+
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+    def getVariant(self):
+        return TrackTagCombinator33.VARIANT
+
+
+    def getPayload(self):
+
+        subtrack0 = {}
+        subtrack1 = {}
+        subtrack2 = ({'language': 'tkm', 'title': 'Turkmenistan'}
+                        if self.__createPresets else {'language': 'eng', 'title': 'English'})
+
+        if self.__createPresets:
+            subtrack0['THIS_IS'] = 'track0'
+            subtrack1['THIS_IS'] = 'track1'
+            subtrack2['THIS_IS'] = 'track2'
+
+        return (subtrack0,
+                subtrack1,
+                subtrack2)
+
+
+    def createAssertFunc(self):
+
+        if self.__createPresets:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert (not 'language' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set title tag"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[0].getTags().keys() and resortedTrackDescriptors[0].getTags()['THIS_IS'] == 'track0'
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not preserved tag THIS_IS"
+
+                # source subIndex 1
+                assert (not 'language' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has set title tag"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[1].getTags().keys() and resortedTrackDescriptors[1].getTags()['THIS_IS'] == 'track1'
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has not preserved tag THIS_IS"
+
+                # source subIndex 2
+                assert ('language' in resortedTrackDescriptors[2].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag"
+                assert (resortedTrackDescriptors[2].getTags()['language'] == 'eng'
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag 'eng'"
+                assert ('title' in resortedTrackDescriptors[2].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title tag"
+                assert (resortedTrackDescriptors[2].getTags()['title'] == 'English'
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title 'English'"
+
+                assert ('THIS_IS' in resortedTrackDescriptors[2].getTags().keys() and resortedTrackDescriptors[2].getTags()['THIS_IS'] == 'track2'
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[2].getSubIndex()}] has not preserved tag THIS_IS"
+
+        else:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert (not 'language' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[0].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} index={resortedTrackDescriptors[0].getIndex()} [{resortedTrackDescriptors[0].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has set title tag"
+
+                # source subIndex 1
+                assert (not 'language' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has set language tag"
+                assert (not 'title' in resortedTrackDescriptors[1].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} index={resortedTrackDescriptors[1].getIndex()} [{resortedTrackDescriptors[1].getType().label()}:{resortedTrackDescriptors[1].getSubIndex()}] has set title tag"
+
+                # source subIndex 2
+                assert ('language' in resortedTrackDescriptors[2].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag"
+                assert (resortedTrackDescriptors[2].getTags()['language'] == 'eng'
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag 'eng'"
+                assert ('title' in resortedTrackDescriptors[2].getTags().keys()
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title tag"
+                assert (resortedTrackDescriptors[2].getTags()['title'] == 'English'
+                ), f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} index={resortedTrackDescriptors[2].getIndex()} [{resortedTrackDescriptors[2].getType().label()}:{resortedTrackDescriptors[0].getSubIndex()}] has not set title 'English'"
+
+        return f
+
+
+    def shouldFail(self):
+        return False

bin/ffx/test/track_tag_combinator_3_4.py

@@ -0,0 +1,214 @@
+import os, sys, importlib, glob, inspect
+
+from ffx.track_disposition import TrackDisposition
+from .track_tag_combinator_3 import TrackTagCombinator3
+
+
+class TrackTagCombinator34(TrackTagCombinator3):
+
+    VARIANT = 'T111'
+
+
+    def __init__(self, context = None,
+                    createPresets: bool = False):
+        super().__init__(context)
+
+        self.__createPresets = createPresets
+
+    def getVariant(self):
+        return TrackTagCombinator34.VARIANT
+
+
+    def getPayload(self):
+
+        subtrack0 = {'language': 'jpn', 'title': 'Japanisch'}
+        subtrack1 = {'language': 'deu', 'title': 'Deutsch'}
+        subtrack2 = ({'language': 'tkm', 'title': 'Turkmenistan'}
+                        if self.__createPresets else {'language': 'eng', 'title': 'English'})
+
+        if self.__createPresets:
+            subtrack0['THIS_IS'] = 'track0'
+            subtrack1['THIS_IS'] = 'track1'
+            subtrack2['THIS_IS'] = 'track2'
+
+        return (subtrack0,
+                subtrack1,
+                subtrack2)
+
+
+    def createAssertFunc(self):
+
+        if self.__createPresets:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert ('language' in resortedTrackDescriptors[0].getTags().keys()
+                ), (f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()}"
+                + f"index={resortedTrackDescriptors[0].getIndex()}"
+                + f"[{resortedTrackDescriptors[0].getType().label()}:"
+                + f"{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag")
+                assert (resortedTrackDescriptors[0].getTags()['language'] == 'jpn'
+                ), (f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()}"
+                + f"index={resortedTrackDescriptors[0].getIndex()}"
+                + f"[{resortedTrackDescriptors[0].getType().label()}:"
+                + f"{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag 'jpn'")
+                assert ('title' in resortedTrackDescriptors[0].getTags().keys()
+                ), (f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()}"
+                + f"index={resortedTrackDescriptors[0].getIndex()}"
+                + f"[{resortedTrackDescriptors[0].getType().label()}:"
+                + f"{resortedTrackDescriptors[0].getSubIndex()}] has not set title tag")
+                assert (resortedTrackDescriptors[0].getTags()['title'] == 'Japanisch'
+                ), (f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()}"
+                + f"index={resortedTrackDescriptors[0].getIndex()}"
+                + f"[{resortedTrackDescriptors[0].getType().label()}:"
+                + f"{resortedTrackDescriptors[0].getSubIndex()}] has not set title 'Japanisch'")
+
+                assert ('THIS_IS' in resortedTrackDescriptors[0].getTags().keys()
+                and resortedTrackDescriptors[0].getTags()['THIS_IS'] == 'track0'
+                ), (f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()}"
+                + f"index={resortedTrackDescriptors[0].getIndex()}"
+                + f"[{resortedTrackDescriptors[0].getType().label()}:"
+                + f"{resortedTrackDescriptors[0].getSubIndex()}] has not preserved tag THIS_IS")
+
+                # source subIndex 1
+                assert ('language' in resortedTrackDescriptors[1].getTags().keys()
+                ), (f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()}"
+                + f"index={resortedTrackDescriptors[1].getIndex()}"
+                + f"[{resortedTrackDescriptors[1].getType().label()}:"
+                + f"{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag")
+                assert (resortedTrackDescriptors[1].getTags()['language'] == 'deu'
+                ), (f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()}"
+                + f"index={resortedTrackDescriptors[1].getIndex()}"
+                + f"[{resortedTrackDescriptors[1].getType().label()}:"
+                + f"{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag 'deu'")
+                assert ('title' in resortedTrackDescriptors[1].getTags().keys()
+                ), (f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()}"
+                + f"index={resortedTrackDescriptors[1].getIndex()}"
+                + f"[{resortedTrackDescriptors[1].getType().label()}:"
+                + f"{resortedTrackDescriptors[0].getSubIndex()}] has not set title tag")
+                assert (resortedTrackDescriptors[1].getTags()['title'] == 'Deutsch'
+                ), (f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()}"
+                + f"index={resortedTrackDescriptors[1].getIndex()}"
+                + f"[{resortedTrackDescriptors[1].getType().label()}:"
+                + f"{resortedTrackDescriptors[0].getSubIndex()}] has not set title 'Deutsch'")
+
+                assert ('THIS_IS' in resortedTrackDescriptors[1].getTags().keys()
+                and resortedTrackDescriptors[1].getTags()['THIS_IS'] == 'track1'
+                ), (f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()}"
+                + f"index={resortedTrackDescriptors[1].getIndex()}"
+                + f"[{resortedTrackDescriptors[1].getType().label()}:"
+                + f"{resortedTrackDescriptors[1].getSubIndex()}] has not preserved tag THIS_IS")
+
+                # source subIndex 2
+                assert ('language' in resortedTrackDescriptors[2].getTags().keys()
+                ), (f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()}"
+                + f"index={resortedTrackDescriptors[2].getIndex()}"
+                + f"[{resortedTrackDescriptors[2].getType().label()}:"
+                + f"{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag")
+                assert (resortedTrackDescriptors[2].getTags()['language'] == 'eng'
+                ), (f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()}"
+                + f"index={resortedTrackDescriptors[2].getIndex()}"
+                + f"[{resortedTrackDescriptors[2].getType().label()}:"
+                + f"{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag 'eng'")
+                assert ('title' in resortedTrackDescriptors[2].getTags().keys()
+                ), (f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()}"
+                + f"index={resortedTrackDescriptors[2].getIndex()}"
+                + f"[{resortedTrackDescriptors[2].getType().label()}:"
+                + f"{resortedTrackDescriptors[0].getSubIndex()}] has not set title tag")
+                assert (resortedTrackDescriptors[2].getTags()['title'] == 'English'
+                ), (f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()}"
+                + f"index={resortedTrackDescriptors[2].getIndex()}"
+                + f"[{resortedTrackDescriptors[2].getType().label()}:"
+                + f"{resortedTrackDescriptors[0].getSubIndex()}] has not set title 'English'")
+
+                assert ('THIS_IS' in resortedTrackDescriptors[2].getTags().keys()
+                and resortedTrackDescriptors[2].getTags()['THIS_IS'] == 'track2'
+                ), (f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()}"
+                + f"index={resortedTrackDescriptors[2].getIndex()}"
+                + f"[{resortedTrackDescriptors[1].getType().label()}:"
+                + f"{resortedTrackDescriptors[2].getSubIndex()}] has not preserved tag THIS_IS")
+
+        else:
+
+            def f(assertObj: dict = {}):
+                
+                if not 'tracks' in assertObj.keys():
+                    raise KeyError("assertObj does not contain key 'tracks'")
+                resortedTrackDescriptors = sorted(assertObj['tracks'], key=lambda d: d.getSourceIndex())
+
+                # source subIndex 0
+                assert ('language' in resortedTrackDescriptors[0].getTags().keys()
+                ), (f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} "
+                + f"index={resortedTrackDescriptors[0].getIndex()} "
+                + f"[{resortedTrackDescriptors[0].getType().label()}:"
+                + f"{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag")
+                assert (resortedTrackDescriptors[0].getTags()['language'] == 'jpn'
+                ), (f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} "
+                + f"index={resortedTrackDescriptors[0].getIndex()} "
+                + f"[{resortedTrackDescriptors[0].getType().label()}:"
+                + f"{resortedTrackDescriptors[0].getSubIndex()}] has not set language tag 'jpn'")
+                assert ('title' in resortedTrackDescriptors[0].getTags().keys()
+                ), (f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} "
+                + f"index={resortedTrackDescriptors[0].getIndex()} "
+                + f"[{resortedTrackDescriptors[0].getType().label()}:"
+                + f"{resortedTrackDescriptors[0].getSubIndex()}] has not set title tag")
+                assert (resortedTrackDescriptors[0].getTags()['title'] == 'Japanisch'
+                ), (f"Stream src_index={resortedTrackDescriptors[0].getSourceIndex()} "
+                + f"index={resortedTrackDescriptors[0].getIndex()} "
+                + f"[{resortedTrackDescriptors[0].getType().label()}:"
+                + f"{resortedTrackDescriptors[0].getSubIndex()}] has not set title 'Japanisch'")
+
+                # source subIndex 1
+                assert ('language' in resortedTrackDescriptors[1].getTags().keys()
+                ), (f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} "
+                + f"index={resortedTrackDescriptors[1].getIndex()} "
+                + f"[{resortedTrackDescriptors[1].getType().label()}:"
+                + f"{resortedTrackDescriptors[1].getSubIndex()}] has not set language tag")
+                assert (resortedTrackDescriptors[1].getTags()['language'] == 'deu'
+                ), (f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} "
+                + f"index={resortedTrackDescriptors[1].getIndex()} "
+                + f"[{resortedTrackDescriptors[1].getType().label()}:"
+                + f"{resortedTrackDescriptors[1].getSubIndex()}] has not set language tag 'deu'")
+                assert ('title' in resortedTrackDescriptors[1].getTags().keys()
+                ), (f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} "
+                + f"index={resortedTrackDescriptors[1].getIndex()} "
+                + f"[{resortedTrackDescriptors[1].getType().label()}:"
+                + f"{resortedTrackDescriptors[1].getSubIndex()}] has not set title tag")
+                assert (resortedTrackDescriptors[1].getTags()['title'] == 'Deutsch'
+                ), (f"Stream src_index={resortedTrackDescriptors[1].getSourceIndex()} "
+                + f"index={resortedTrackDescriptors[1].getIndex()} "
+                + f"[{resortedTrackDescriptors[1].getType().label()}:"
+                + f"{resortedTrackDescriptors[1].getSubIndex()}] has not set title 'Deutsch'")
+
+                # source subIndex 2
+                assert ('language' in resortedTrackDescriptors[2].getTags().keys()
+                ), (f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} "
+                + f"index={resortedTrackDescriptors[2].getIndex()} "
+                + f"[{resortedTrackDescriptors[2].getType().label()}:"
+                + f"{resortedTrackDescriptors[2].getSubIndex()}] has not set language tag")
+                assert (resortedTrackDescriptors[2].getTags()['language'] == 'eng'
+                ), (f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} "
+                + f"index={resortedTrackDescriptors[2].getIndex()} "
+                + f"[{resortedTrackDescriptors[2].getType().label()}:"
+                + f"{resortedTrackDescriptors[2].getSubIndex()}] has not set language tag 'eng'")
+                assert ('title' in resortedTrackDescriptors[2].getTags().keys()
+                ), (f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} "
+                + f"index={resortedTrackDescriptors[2].getIndex()} "
+                + f"[{resortedTrackDescriptors[2].getType().label()}:"
+                + f"{resortedTrackDescriptors[2].getSubIndex()}] has not set title tag")
+                assert (resortedTrackDescriptors[2].getTags()['title'] == 'English'
+                ), (f"Stream src_index={resortedTrackDescriptors[2].getSourceIndex()} "
+                + f"index={resortedTrackDescriptors[2].getIndex()} "
+                + f"[{resortedTrackDescriptors[2].getType().label()}:"
+                + f"{resortedTrackDescriptors[2].getSubIndex()}] has not set title 'English'")
+
+        return f
+
+
+    def shouldFail(self):
+        return False

bin/ffx/tmdb_controller.py

@@ -1,19 +1,56 @@
-import os, click, requests
+import os, click, requests, json, time, logging
+
+class TMDB_REQUEST_EXCEPTION(Exception):
+    def __init__(self, statusCode, statusMessage):
+        errorMessage = f"TMDB query failed with status code {statusCode}: {statusMessage}"
+        super().__init__(errorMessage)
+
+class TMDB_API_KEY_NOT_PRESENT_EXCEPTION(Exception):
+    def __str__(self):
+        return 'TMDB api key is not available, please set environment variable TMDB_API_KEY'
+
+class TMDB_EXCESSIVE_USAGE_EXCEPTION(Exception):
+    def __str__(self):
+        return 'Rate limit was triggered too often'
 
 
 class TmdbController():
 
     DEFAULT_LANGUAGE = 'de-DE'
 
-    def __init__(self):
+    RATE_LIMIT_WAIT_SECONDS = 10
+    RATE_LIMIT_RETRIES = 3
 
-        try:  
-            self.__tmdbApiKey = os.environ['TMDB_API_KEY']
-        except KeyError: 
-            click.ClickException('TMDB api key is not available, please set environment variable TMDB_API_KEY')
+    def __init__(self, context = None):
+        self.__context = context
+        self.__logger = (context['logger'] if context is not None and 'logger' in context.keys()
+                            else logging.getLogger('FFX').addHandler(logging.NullHandler()))
+
+        self.__tmdbApiKey = os.environ.get('TMDB_API_KEY', None)
+        if self.__tmdbApiKey is None:
+            raise TMDB_API_KEY_NOT_PRESENT_EXCEPTION
         
         self.tmdbLanguage = TmdbController.DEFAULT_LANGUAGE
 
+
+    def getTmdbRequest(self, tmdbUrl):
+        retries = TmdbController.RATE_LIMIT_RETRIES
+        while True:
+            response = requests.get(tmdbUrl)
+            if response.status_code == 429:
+                if not retries:
+                    raise TMDB_EXCESSIVE_USAGE_EXCEPTION()
+                self.__logger.warning('TMDB Rate limit (status_code 429)')
+                time.sleep(TmdbController.RATE_LIMIT_WAIT_SECONDS)
+                retries -= 1
+            else:
+                jsonResult = response.json()
+                if ('success' in jsonResult.keys()
+                            and not jsonResult['success']):
+                    raise TMDB_REQUEST_EXCEPTION(jsonResult['status_code'], jsonResult['status_message'])
+                return jsonResult
+
+
     def queryShow(self, showId):
         """
         First level keys in the response object:
@@ -53,13 +90,10 @@ class TmdbController():
         
         urlParams = f"?language={self.tmdbLanguage}&api_key={self.__tmdbApiKey}"
         
-        tmdbUrl = f"https://api.themoviedb.org/3/tv/{showId}W{urlParams}"
+        tmdbUrl = f"https://api.themoviedb.org/3/tv/{showId}{urlParams}"
+
+        return self.getTmdbRequest(tmdbUrl)
 
-        #TODO Check for result
-        try:
-            return requests.get(tmdbUrl).json()
-        except:
-            return {}
 
     def queryEpisode(self, showId, season, episode):
         """
@@ -83,14 +117,11 @@ class TmdbController():
         
         tmdbUrl = f"https://api.themoviedb.org/3/tv/{showId}/season/{season}/episode/{episode}{urlParams}"
 
-        #TODO Check for result
-        try:
-            return requests.get(tmdbUrl).json()
-        except:
-            return {}
+        return self.getTmdbRequest(tmdbUrl)
 
-    def getEpisodeFileBasename(self,
-                            showName,
+
+    @staticmethod
+    def getEpisodeFileBasename(showName,
                                 episodeName,
                                 season,
                                 episode,
@@ -142,3 +173,6 @@ class TmdbController():
             filenameTokens += ['E{num:{fill}{width}}'.format(num=episode, fill='0', width=indicatorEpisodeDigits)]
 
         return ''.join(filenameTokens)
+
+    def importShow(self, showId: int):
+        pass

bin/ffx/track_controller.py

@@ -30,6 +30,7 @@ class TrackController():
             s = self.Session()
             track = Track(pattern_id = patId,
                             track_type = int(trackDescriptor.getType().index()),
+                            codec_name = str(trackDescriptor.getCodec()),
                             index = int(trackDescriptor.getIndex()),
                             source_index = int(trackDescriptor.getSourceIndex()),
                             disposition_flags = int(TrackDisposition.toFlags(trackDescriptor.getDispositionSet())),
@@ -66,6 +67,7 @@ class TrackController():
                 track : Track = q.first()
 
                 track.track_type = int(trackDescriptor.getType().index())
+                track.codec_name = str(trackDescriptor.getCodec())
                 track.audio_layout = int(trackDescriptor.getAudioLayout().index())
 
                 track.disposition_flags = int(TrackDisposition.toFlags(trackDescriptor.getDispositionSet()))

bin/ffx/track_descriptor.py

@@ -1,4 +1,4 @@
-import click
+import logging
 
 from .iso_language import IsoLanguage
 from .track_type import TrackType
@@ -10,6 +10,8 @@ from .helper import dictDiff, setDiff
 
 class TrackDescriptor:
 
+    CONTEXT_KEY = "context"
+
     ID_KEY = "id"
     INDEX_KEY = "index"
     SOURCE_INDEX_KEY = "source_index"
@@ -21,15 +23,30 @@ class TrackDescriptor:
     TAGS_KEY = "tags"
 
     TRACK_TYPE_KEY = "track_type"
+    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_NAME_KEY = "codec_name"
+    
+    CODEC_PGS = 'hdmv_pgs_subtitle'
 
     def __init__(self, **kwargs):
 
+        if TrackDescriptor.CONTEXT_KEY in kwargs.keys():
+            if type(kwargs[TrackDescriptor.CONTEXT_KEY]) is not dict:
+                raise TypeError(
+                    f"TrackDescriptor.__init__(): Argument {TrackDescriptor.CONTEXT_KEY} is required to be of type dict"
+                )
+            self.__context = kwargs[TrackDescriptor.CONTEXT_KEY]
+            self.__logger = self.__context['logger']
+        else:
+            self.__context = {}
+            self.__logger = logging.getLogger('FFX').addHandler(logging.NullHandler())
+
         if TrackDescriptor.ID_KEY in kwargs.keys():
             if type(kwargs[TrackDescriptor.ID_KEY]) is not int:
                 raise TypeError(
@@ -55,7 +72,7 @@ class TrackDescriptor:
                 )
             self.__externalSourceFilePath = kwargs[TrackDescriptor.EXTERNAL_SOURCE_FILE_PATH_KEY]
         else:
-            self.__externalSourceFilePath = None
+            self.__externalSourceFilePath = ''
 
         if TrackDescriptor.INDEX_KEY in kwargs.keys():
             if type(kwargs[TrackDescriptor.INDEX_KEY]) is not int:
@@ -92,6 +109,15 @@ class TrackDescriptor:
         else:
             self.__trackType = TrackType.UNKNOWN
 
+        if TrackDescriptor.CODEC_NAME_KEY in kwargs.keys():
+            if type(kwargs[TrackDescriptor.CODEC_NAME_KEY]) is not str:
+                raise TypeError(
+                    f"TrackDesciptor.__init__(): Argument {TrackDescriptor.CODEC_NAME_KEY} is required to be of type str"
+                )
+            self.__codecName = kwargs[TrackDescriptor.CODEC_NAME_KEY]
+        else:
+            self.__codecName = ''
+
         if TrackDescriptor.TAGS_KEY in kwargs.keys():
             if type(kwargs[TrackDescriptor.TAGS_KEY]) is not dict:
                 raise TypeError(
@@ -187,6 +213,8 @@ 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.DISPOSITION_SET_KEY] = (
                 {
                     t
@@ -226,9 +254,15 @@ class TrackDescriptor:
     def getIndex(self):
         return self.__index
 
+    def setIndex(self, index):
+        self.__index = index
+
     def getSourceIndex(self):
         return self.__sourceIndex
 
+    def setSourceIndex(self, sourceIndex: int):
+        self.__sourceIndex = int(sourceIndex)
+
     def getSubIndex(self):
         return self.__subIndex
 
@@ -238,6 +272,9 @@ class TrackDescriptor:
     def getType(self):
         return self.__trackType
     
+    def getCodec(self):
+        return self.__codecName
+
     def getLanguage(self):
         if "language" in self.__trackTags.keys():
             return IsoLanguage.findThreeLetter(self.__trackTags["language"])

bin/ffx/track_details_screen.py

@@ -268,6 +268,8 @@ class TrackDetailsScreen(Screen):
 
         kwargs = {}
 
+        kwargs[TrackDescriptor.CONTEXT_KEY] = self.context
+
         kwargs[TrackDescriptor.PATTERN_ID_KEY] = int(self.__pattern.getId())
 
         kwargs[TrackDescriptor.INDEX_KEY] = self.__index

bin/ffx/track_disposition.py

@@ -5,25 +5,25 @@ from enum import Enum
 
 class TrackDisposition(Enum):
 
-    DEFAULT             = {"name": "default", "index": 0}
-    FORCED              = {"name": "forced", "index": 1}
+    DEFAULT             = {"name": "default", "index": 0, "indicator": "DEF"}
+    FORCED              = {"name": "forced", "index": 1, "indicator": "FOR"}
 
-    DUB                 = {"name": "dub", "index": 2}
-    ORIGINAL            = {"name": "original", "index": 3}
-    COMMENT             = {"name": "comment", "index": 4}
-    LYRICS              = {"name": "lyrics", "index": 5}
-    KARAOKE             = {"name": "karaoke", "index": 6}
-    HEARING_IMPAIRED    = {"name": "hearing_impaired", "index": 7}
-    VISUAL_IMPAIRED     = {"name": "visual_impaired", "index": 8}
-    CLEAN_EFFECTS       = {"name": "clean_effects", "index": 9}
-    ATTACHED_PIC        = {"name": "attached_pic", "index": 10}
-    TIMED_THUMBNAILS    = {"name": "timed_thumbnails", "index": 11}
-    NON_DIEGETICS       = {"name": "non_diegetic", "index": 12}
-    CAPTIONS            = {"name": "captions", "index": 13}
-    DESCRIPTIONS        = {"name": "descriptions", "index": 14}
-    METADATA            = {"name": "metadata", "index": 15}
-    DEPENDENT           = {"name": "dependent", "index": 16}
-    STILL_IMAGE         = {"name": "still_image", "index": 17}
+    DUB                 = {"name": "dub", "index": 2, "indicator": "DUB"}
+    ORIGINAL            = {"name": "original", "index": 3, "indicator": "ORG"}
+    COMMENT             = {"name": "comment", "index": 4, "indicator": "COM"}
+    LYRICS              = {"name": "lyrics", "index": 5, "indicator": "LYR"}
+    KARAOKE             = {"name": "karaoke", "index": 6, "indicator": "KAR"}
+    HEARING_IMPAIRED    = {"name": "hearing_impaired", "index": 7, "indicator": "HIM"}
+    VISUAL_IMPAIRED     = {"name": "visual_impaired", "index": 8, "indicator": "VIM"}
+    CLEAN_EFFECTS       = {"name": "clean_effects", "index": 9, "indicator": "CLE"}
+    ATTACHED_PIC        = {"name": "attached_pic", "index": 10, "indicator": "ATP"}
+    TIMED_THUMBNAILS    = {"name": "timed_thumbnails", "index": 11, "indicator": "TTH"}
+    NON_DIEGETICS       = {"name": "non_diegetic", "index": 12, "indicator": "NOD"}
+    CAPTIONS            = {"name": "captions", "index": 13, "indicator": "CAP"}
+    DESCRIPTIONS        = {"name": "descriptions", "index": 14, "indicator": "DES"}
+    METADATA            = {"name": "metadata", "index": 15, "indicator": "MED"}
+    DEPENDENT           = {"name": "dependent", "index": 16, "indicator": "DEP"}
+    STILL_IMAGE         = {"name": "still_image", "index": 17, "indicator": "STI"}
 
 
     def label(self):
@@ -32,6 +32,9 @@ class TrackDisposition(Enum):
     def index(self):
         return int(self.value['index'])
 
+    def indicator(self):
+        return str(self.value['indicator'])
+
 
     @staticmethod
     def toFlags(dispositionSet):

bin/ffx/warning_screen.py

@@ -1,11 +0,0 @@
-from textual.app import App, ComposeResult
-from textual.screen import Screen
-from textual.widgets import Header, Footer, Placeholder, Label
-
-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()

bin/ffx_tests.py

@@ -0,0 +1,124 @@
+#! /usr/bin/python3
+
+import os, logging, click
+
+from ffx.configuration_controller import ConfigurationController
+
+from ffx.file_properties import FileProperties
+from ffx.ffx_controller import FfxController
+
+from ffx.database import databaseContext
+
+from ffx.test.helper import createMediaTestFile
+
+from ffx.test.scenario import Scenario
+from ffx.tmdb_controller import TMDB_API_KEY_NOT_PRESENT_EXCEPTION
+
+
+@click.group()
+@click.pass_context
+@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, verbose, dry_run):
+    """FFX"""
+
+    ctx.obj = {}
+
+    ctx.obj['config'] = ConfigurationController()
+
+    ctx.obj['database'] = None
+    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 Tests')
+    ctx.obj['logger'].setLevel(logging.DEBUG)
+
+    ctx.obj['report_logger'] = logging.getLogger('FFX Test Result')
+    ctx.obj['report_logger'].setLevel(logging.INFO)
+
+    ffxFileHandler = logging.FileHandler(ctx.obj['config'].getLogFilePath())
+    ffxFileHandler.setLevel(fileLogVerbosity)
+    ffxConsoleHandler = logging.StreamHandler()
+    ffxConsoleHandler.setLevel(consoleLogVerbosity)
+
+    if os.path.isfile('ffx_test_report.log'):
+        os.unlink('ffx_test_report.log')
+    ffxTestReportFileHandler = logging.FileHandler('ffx_test_report.log')
+
+    fileFormatter = logging.Formatter(
+        '%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+    ffxFileHandler.setFormatter(fileFormatter)
+    consoleFormatter = logging.Formatter(
+        '%(message)s')
+    ffxConsoleHandler.setFormatter(consoleFormatter)
+    reportFormatter = logging.Formatter(
+        '%(message)s')
+    ffxTestReportFileHandler.setFormatter(reportFormatter)
+
+    ctx.obj['logger'].addHandler(ffxConsoleHandler)
+    ctx.obj['logger'].addHandler(ffxFileHandler)
+
+    ctx.obj['report_logger'].addHandler(ffxConsoleHandler)
+    ctx.obj['report_logger'].addHandler(ffxTestReportFileHandler)
+    
+
+# Another subcommand
+@ffx.command()
+@click.pass_context
+@click.option('--scenario', type=str, default='', help='Only run tests from this scenario')
+@click.option('--variant', type=str, default='', help='Only run this test variant')
+def run(ctx, scenario, variant):
+    """Run ffx test sequences"""
+
+    ctx.obj['logger'].info('Starting FFX test runs')
+    ctx.obj['test_passed_counter'] = 0
+    ctx.obj['test_failed_counter'] = 0
+
+    ctx.obj['test_variant'] = variant
+
+    for si in Scenario.list():
+
+        try:
+            SCEN = Scenario.getClassReference(si)
+            scen = SCEN(ctx.obj)
+
+            if scenario and scenario != scen.getScenario():
+                continue
+
+            ctx.obj['logger'].debug(f"Running scenario {si}")
+
+            scen.run()
+
+        except TMDB_API_KEY_NOT_PRESENT_EXCEPTION:
+            ctx.obj['logger'].info(f"TMDB_API_KEY not set: Skipping {SCEN.__class__.__name__}")    
+
+    ctx.obj['logger'].info(f"\n{ctx.obj['test_passed_counter']} tests passed")
+    ctx.obj['logger'].info(f"{ctx.obj['test_failed_counter']} test failed")
+    ctx.obj['logger'].info('\nDone.')
+
+
+@ffx.command()
+@click.pass_context
+@click.argument('paths', nargs=-1)
+def dupe(ctx, paths):
+
+    existingSourcePaths = [p for p in paths if os.path.isfile(p) and p.split('.')[-1] in FfxController.INPUT_FILE_EXTENSIONS]
+
+    for sourcePath in existingSourcePaths:
+
+        sourceFileProperties = FileProperties(ctx.obj, sourcePath)
+        sourceMediaDescriptor = sourceFileProperties.getMediaDescriptor()
+
+        createMediaTestFile(sourceMediaDescriptor, baseName='dupe')
+
+if __name__ == '__main__':
+    ffx()