3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-07-13 23:07:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

[core] plugins: Improve constructors for DirTree/RezProcessEnv

Browse source
This commit is contained in:
Candice Bentéjac 2025-06-12 15:31:57 +02:00
parent 0efc6c3d2f
commit 5b0c1b6719
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
meshroom/core/plugins.py
View file

@ -69,6 +69,7 @@ class ProcessEnv(BaseObject):
super().__init__() super().__init__()
self._folder = folder self._folder = folder
self._processEnvType: ProcessEnvType = envType self._processEnvType: ProcessEnvType = envType
self.uri = ""
def getEnvDict(self) -> dict: def getEnvDict(self) -> dict:
""" Return the environment dictionary if it has been modified, None otherwise. """ """ Return the environment dictionary if it has been modified, None otherwise. """
@ -87,12 +88,13 @@ class DirTreeProcessEnv(ProcessEnv):
""" """
""" """
def __init__(self, folder: str, envType: ProcessEnvType = ProcessEnvType.DEFAULT, uri: str = ""): def __init__(self, folder: str, envType: ProcessEnvType = ProcessEnvType.DEFAULT, uri: str = ""):
super().__init__(folder, envType)
if envType == ProcessEnvType.REZ: if envType == ProcessEnvType.REZ:
raise RuntimeError("Wrong process environment type.") raise RuntimeError("Wrong process environment type.")
if not uri and envType != ProcessEnvType.DEFAULT: if not uri and envType != ProcessEnvType.DEFAULT:
raise RuntimeError("URI should be provided for the process environment.") raise RuntimeError("URI should be provided for the process environment.")
super().__init__(folder, envType)
self.uri = uri self.uri = uri
self.binPaths: list = [str(Path(folder, "bin"))] self.binPaths: list = [str(Path(folder, "bin"))]
self.libPaths: list = [str(Path(folder, "lib")), str(Path(folder, "lib64"))] self.libPaths: list = [str(Path(folder, "lib")), str(Path(folder, "lib64"))]
@ -103,6 +105,9 @@ class DirTreeProcessEnv(ProcessEnv):
env["PYTHONPATH"] = f"{_MESHROOM_ROOT}{os.pathsep}{os.pathsep.join(self.pythonPaths)}{os.pathsep}{os.getenv('PYTHONPATH', '')}" env["PYTHONPATH"] = f"{_MESHROOM_ROOT}{os.pathsep}{os.pathsep.join(self.pythonPaths)}{os.pathsep}{os.getenv('PYTHONPATH', '')}"
env["LD_LIBRARY_PATH"] = f"{os.pathsep.join(self.libPaths)}{os.pathsep}{os.getenv('LD_LIBRARY_PATH', '')}" env["LD_LIBRARY_PATH"] = f"{os.pathsep.join(self.libPaths)}{os.pathsep}{os.getenv('LD_LIBRARY_PATH', '')}"
env["PATH"] = f"{os.pathsep.join(self.binPaths)}{os.pathsep}{os.getenv('PATH', '')}" env["PATH"] = f"{os.pathsep.join(self.binPaths)}{os.pathsep}{os.getenv('PATH', '')}"
# env["PYTHONPATH"] = f"{_MESHROOM_ROOT}{os.pathsep}{os.pathsep.join(self.pythonPaths)}"
# env["LD_LIBRARY_PATH"] = f"{os.pathsep.join(self.libPaths)}"
# env["PATH"] = f"{os.pathsep.join(self.binPaths)}"
return env return env
@ -118,13 +123,13 @@ class RezProcessEnv(ProcessEnv):
""" """
""" """
def __init__(self, folder: str, envType: ProcessEnvType = ProcessEnvType.REZ, uri: str = ""): def __init__(self, folder: str, envType: ProcessEnvType = ProcessEnvType.REZ, uri: str = ""):
super().__init__(folder, envType)
if envType != ProcessEnvType.REZ: if envType != ProcessEnvType.REZ:
raise RuntimeError("Wrong process environment type.") raise RuntimeError("Wrong process environment type.")
if not uri: if not uri:
raise RuntimeError("Wrong URI for Rez environment process.") raise RuntimeError("Wrong URI for Rez environment process.")
super().__init__(folder, envType)
self.uri = uri
def getEnvDict(self): def getEnvDict(self):
env = os.environ.copy() env = os.environ.copy()