wip

Author: Alxiice

meshroom/core/desc/__init__.py

@@ -47,6 +47,7 @@
     InternalAttributesFactory,
     MrNodeType,
     Node,
+    InlineNode,
     NodeVersionType,
     NodeVersionTypeEnum,
 )

meshroom/core/desc/node.py

@@ -57,6 +57,7 @@ class MrNodeType(enum.Enum):
     NONE = enum.auto()
     BASENODE = enum.auto()
     NODE = enum.auto()
+    INLINE = enum.auto()
     COMMANDLINE = enum.auto()
     INIT = enum.auto()
     BACKDROP = enum.auto()
@@ -527,9 +528,6 @@ class InitNode(BaseNode):
     def __init__(self):
         super(InitNode, self).__init__()
 
-    def getMrNodeType(self):
-        return self._mrNodeType
-
     def processChunk(self, chunk):
         pass
 
@@ -586,6 +584,16 @@ def processChunkInEnvironment(self, chunk):
                                      env=runtimeEnv)
 
 
+class InlineNode(BaseNode):
+    """
+    """
+    parallelization = None
+    _mrNodeType: MrNodeType = MrNodeType.INLINE
+
+    def __init__(self):
+        super(InlineNode, self).__init__()
+
+
 class CommandLineNode(BaseNode):
     """
     """

meshroom/nodes/general/FlattenFiles.py

@@ -3,7 +3,7 @@
 from meshroom.core import desc
 
 
-class FlattenFiles(desc.CommandLineNode):
+class FlattenFiles(desc.InlineNode):
     """
     This node takes a list of lists of files as input and produces a single flat list of
     files as output.
@@ -50,9 +50,9 @@ class FlattenFiles(desc.CommandLineNode):
         ),
     ]
 
-    def processChunk(self, chunk):
+    def process(self, node):
         flatFiles = []
-        for fileList in chunk.node.inputFiles.value:
+        for fileList in node.inputFiles.value:
             for fileAttr in fileList.value:
                 flatFiles.append(fileAttr.value)
-        chunk.node.outputFiles.value = flatFiles
+        node.outputFiles.value = flatFiles

meshroom/nodes/general/GetFileExtension.py

@@ -4,7 +4,7 @@
 from meshroom.core import desc
 
 
-class GetFileExtension(desc.CommandLineNode):
+class GetFileExtension(desc.InlineNode):
     inputs = [
         desc.File(
             name="path",
@@ -20,5 +20,8 @@ class GetFileExtension(desc.CommandLineNode):
         ),
     ]
 
-    def processChunk(self, chunk):
-        chunk.node.extension.value = os.path.splitext(chunk.node.path.value)[1]
+    def process(self, node):
+        if not node.path.value:
+            node.extension.value = ""
+        else:
+            node.extension.value = os.path.splitext(node.path.value)[1]

meshroom/nodes/general/GetParentFolder.py

@@ -5,7 +5,7 @@
 from meshroom.core import desc
 
 
-class GetParentFolder(desc.CommandLineNode):
+class GetParentFolder(desc.InlineNode):
     """ Get the parent folder """
 
     category = "Other"
@@ -29,14 +29,14 @@ class GetParentFolder(desc.CommandLineNode):
         )
     ]
 
-    def processChunk(self, chunk):
-        chunk.node.folder.value = ""
-        path = chunk.node.file.value
+    def process(self, node):
+        node.folder.value = ""
+        path = node.file.value
         if not path:
             return
         # Additional security but it's supposedly handeled by the validator
         path = os.path.normpath(path)
         parent = os.path.dirname(path)
         if not os.path.exists(parent):
             logging.warning(f"Parent path {parent} does not exist")
-        chunk.node.folder.value = parent
+        node.folder.value = parent

meshroom/nodes/general/PathJoin.py

@@ -4,7 +4,7 @@
 from meshroom.core import desc
 
 
-class PathJoin(desc.CommandLineNode):
+class PathJoin(desc.InlineNode):
     """ Join multiple paths """
 
     category = "Other"
@@ -34,15 +34,15 @@ class PathJoin(desc.CommandLineNode):
         )
     ]
 
-    def processChunk(self, chunk):
+    def process(self, node):
         parts = []
-        for item in chunk.node.paths.value:
+        for item in node.paths.value:
             path = item.value
             if path:
                 parts.append(path)
         if parts:
             outputPath = os.path.join(*parts)
-            if not chunk.node.checkIfExists.value or os.path.exists(outputPath):
-                chunk.node.outputPath.value = str(outputPath)
+            if not node.checkIfExists.value or os.path.exists(outputPath):
+                node.outputPath.value = str(outputPath)
                 return
-        chunk.node.folder.value = ""
+        node.folder.value = ""