Commit 831cf03e authored by Jan Kiene's avatar Jan Kiene
Browse files

fix formatting

parent 17256139

ivas_processing_scripts/constants.py

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
from datetime import datetime

from pathlib import Path



from ivas_processing_scripts.utils import find_binary, get_binary_paths, get_gitsha

from ivas_processing_scripts.utils import get_binary_paths, get_gitsha



LOGGER_SUFFIX = ".log"

LOGGER_FORMAT = (

ivas_processing_scripts/generation/process_ism_items.py

+16 −4
Original line number Diff line number Diff line
@@ -102,9 +102,21 @@ def generate_ism_items( 
        # repeat for all source files

        for i in range(N_sources):

            # parse parameters from the scene description

            source_file = scene["source"][i] if isinstance(scene["source"], list) else scene["source"]   

            source_azi = scene["azimuth"][i] if isinstance(scene["azimuth"], list) else scene["azimuth"]   

            source_ele = scene["elevation"][i] if isinstance(scene["elevation"], list) else scene["elevation"]   

            source_file = (

                scene["source"][i]

                if isinstance(scene["source"], list)

                else scene["source"]

            )

            source_azi = (

                scene["azimuth"][i]

                if isinstance(scene["azimuth"], list)

                else scene["azimuth"]

            )

            source_ele = (

                scene["elevation"][i]

                if isinstance(scene["elevation"], list)

                else scene["elevation"]

            )



            logger.info(

                f"Encoding {source_file} at position(s) {source_azi},{source_ele}"

ivas_processing_scripts/processing/config.py

+16 −6
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ 
#  the United Nations Convention on Contracts on the International Sales of Goods.

#



import platform

from copy import deepcopy

from pathlib import Path



import yaml

import platform



from ivas_processing_scripts.constants import (

    DEFAULT_CONFIG,
@@ -45,7 +45,7 @@ from ivas_processing_scripts.constants import ( 
    REQUIRED_KEYS_MNRU,

    SUPPORTED_CONDITIONS,

)

from ivas_processing_scripts.utils import get_abs_path, find_binary

from ivas_processing_scripts.utils import find_binary, get_abs_path





def merge_dicts(base: dict, other: dict) -> None:
@@ -96,7 +96,9 @@ class TestConfig: 
        file_cfg = self._parse_yaml(filename)



        # validate configuration from file

        use_windows_codec_binaries = file_cfg.get("use_windows_codec_binaries", cfg["use_windows_codec_binaries"])

        use_windows_codec_binaries = file_cfg.get(

            "use_windows_codec_binaries", cfg["use_windows_codec_binaries"]

        )

        self._validate_file_cfg(file_cfg, use_windows_codec_binaries)



        # merge dictionaries, overriding from config file
@@ -186,7 +188,11 @@ class TestConfig: 
                        "Background noise file has to be placed outside the input folder!"

                    )



        codec_bin_extension = ".exe" if platform.system() == "Linux" and use_windows_codec_binaries else ""

        codec_bin_extension = (

            ".exe"

            if platform.system() == "Linux" and use_windows_codec_binaries

            else ""

        )

        for cond_name, cond_cfg in cfg.get("conditions_to_generate").items():

            type = cond_cfg.get("type")

            if not type:
@@ -234,5 +240,9 @@ class TestConfig: 


    def _validate_merged_config(self, cfg: dict):

        # if not on windows, but "use_windows_codec_binaries" is given, assure that wine is there

        if platform.system() == "Linux" and cfg["use_windows_codec_binaries"] and find_binary("wine") is None:

        if (

            platform.system() == "Linux"

            and cfg["use_windows_codec_binaries"]

            and find_binary("wine") is None

        ):

            raise FileNotFoundError("Using windows binaries on Linux requires wine")

ivas_processing_scripts/processing/evs.py

+6 −2
Original line number Diff line number Diff line
@@ -64,12 +64,16 @@ class EVS(Processing): 
        self.name = "evs"

        self.in_fmt = audio.fromtype(self.in_fmt)

        self._validate()

        self._use_wine = platform.system() == "Linux" and self.use_windows_codec_binaries

        self._use_wine = (

            platform.system() == "Linux" and self.use_windows_codec_binaries

        )



    def _validate(

        self,

    ):

        need_exe_suffix = platform.system() == "Windows" or self.use_windows_codec_binaries

        need_exe_suffix = (

            platform.system() == "Windows" or self.use_windows_codec_binaries

        )

        if not self.cod_bin or not Path(self.cod_bin).exists():

            if need_exe_suffix and (

                self.cod_bin and Path(self.cod_bin).with_suffix(".exe").exists()

ivas_processing_scripts/processing/ivas.py

+6 −2
Original line number Diff line number Diff line
@@ -60,10 +60,14 @@ class IVAS(Processing): 
        self.out_fmt = audio.fromtype(self.out_fmt)

        if not hasattr(self, "dec_opts"):

            self.dec_opts = None

        self._use_wine = platform.system() == "Linux" and self.use_windows_codec_binaries

        self._use_wine = (

            platform.system() == "Linux" and self.use_windows_codec_binaries

        )



    def _validate(self):

        need_exe_suffix = platform.system() == "Windows" or self.use_windows_codec_binaries

        need_exe_suffix = (

            platform.system() == "Windows" or self.use_windows_codec_binaries

        )

        if not self.cod_bin or not Path(self.cod_bin).exists():

            if need_exe_suffix and (

                self.cod_bin and Path(self.cod_bin).with_suffix(".exe").exists()