Commit 17644dd4 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '62-don-t-run-wine32-on-wsl' into 'main' 

Resolve "Don't run wine32 on WSL"

See merge request !130
parents 08e7afc9 fab0305b

ivas_processing_scripts/processing/config.py

+2 −6
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ from ivas_processing_scripts.constants import ( 
    REQUIRED_KEYS_MNRU,

    SUPPORTED_CONDITIONS,

)

from ivas_processing_scripts.utils import find_binary, get_abs_path

from ivas_processing_scripts.utils import find_binary, get_abs_path, use_wine





def merge_dicts(base: dict, other: dict) -> None:
@@ -263,9 +263,5 @@ 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 use_wine(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

+2 −4
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ from ivas_processing_scripts.audiotools.wrappers.eid_xor import ( 
from ivas_processing_scripts.audiotools.wrappers.dlyerr_2_errpat import validate_evs_jbm

from ivas_processing_scripts.audiotools.wrappers.dlyerr_2_errpat import evs_jbm

from ivas_processing_scripts.processing.processing import Processing

from ivas_processing_scripts.utils import apply_func_parallel, run

from ivas_processing_scripts.utils import apply_func_parallel, run, use_wine





class EVS(Processing):
@@ -62,9 +62,7 @@ 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 = use_wine(self.use_windows_codec_binaries)



    def _validate(

        self,

ivas_processing_scripts/processing/ivas.py

+2 −4
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ from ivas_processing_scripts.audiotools.wrappers.networkSimulator import ( 
    validate_network_simulator,

)

from ivas_processing_scripts.processing.processing import Processing

from ivas_processing_scripts.utils import run

from ivas_processing_scripts.utils import run, use_wine





class IVAS(Processing):
@@ -60,9 +60,7 @@ 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 = use_wine(self.use_windows_codec_binaries)



    def _validate(self):

        need_exe_suffix = (

ivas_processing_scripts/utils.py

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import logging 
import shutil

import subprocess as sp

import sys

import platform

from concurrent.futures import ProcessPoolExecutor, ThreadPoolExecutor

from itertools import cycle, repeat, tee

from os import devnull
@@ -142,6 +143,12 @@ System interaction 
"""





def use_wine(use_windows_codec_binaries: bool):

    linux_system = platform.system() == "Linux"

    wsl = "microsoft" in platform.uname().release.lower()

    return linux_system and not wsl and use_windows_codec_binaries





def find_binary(

    binary: str,

    raise_error: Optional[bool] = True,