Commit 1ef81898 authored by Jan Kiene's avatar Jan Kiene
Browse files

fix md handling again

parent 79d5e397

scripts/pyivastest/IvasModeRunner.py

+7 −7
Original line number Diff line number Diff line
@@ -635,16 +635,16 @@ class IvasModeRunner(IvasModeCollector.IvasModeCollector): 
            if nummetadata > 0:

                md_files = list()



                is_combined_format = "OMASA" in in_format or "OSBA" in in_format

                if "OMASA" in in_format:

                    nummetadata -= 1



                if "ISM" in in_format:

                    md_files.extend(self.global_ism_metadata)

                    md_files.extend(self.global_ism_metadata[:nummetadata])



                    # if no md files explicitly given, try default pattern from config

                    if len(md_files) == 0:

                        num_ism_metadata = nummetadata - int(is_combined_format)

                    # if not enough md files explicitly given, try default pattern from config

                    if len(md_files) != nummetadata:

                        default = os.path.join(in_dir, enc_dec_cmd["metadatafilenames"][0])

                        for i in range(num_ism_metadata):

                        for i in range(len(md_files), nummetadata):

                            md_f = default.format(item=item_base_name, mdi=i + 1) 

                            md_files.append(md_f)
@@ -653,7 +653,7 @@ class IvasModeRunner(IvasModeCollector.IvasModeCollector): 


                    # if not explicitly given, try default pattern from config

                    if masa_md is None:

                        default = os.path.join(in_dir, enc_dec_cmd["metadatafilenames"][0 + int(is_combined_format)])

                        default = os.path.join(in_dir, enc_dec_cmd["metadatafilenames"][-1])

                        masa_md = default.format(item=item_base_name)



                    md_files.append(masa_md)