[Bf-blender-cvs] [5c90bec61e7] functions: simplify socket identifiers

[Jacques Lucke]

Commit: 5c90bec61e728aa40d2b72e28af086fdd214540a
Author: Jacques Lucke
Date:   Wed Dec 18 13:38:51 2019 +0100
Branches: functions
https://developer.blender.org/rB5c90bec61e728aa40d2b72e28af086fdd214540a

simplify socket identifiers

===================================================================

M	release/scripts/startup/nodes/declaration/base_list_variadic.py
M	release/scripts/startup/nodes/declaration/bparticles.py
M	release/scripts/startup/nodes/declaration/vectorized.py

===================================================================

diff --git a/release/scripts/startup/nodes/declaration/base_list_variadic.py b/release/scripts/startup/nodes/declaration/base_list_variadic.py
index 35e74c0e6c4..e1e2cd02ce2 100644
--- a/release/scripts/startup/nodes/declaration/base_list_variadic.py
+++ b/release/scripts/startup/nodes/declaration/base_list_variadic.py
@@ -20,7 +20,7 @@ class BaseListVariadic(SocketDeclBase):
         for _ in range(self.default_amount):
             item = collection.add()
             item.state = "BASE"
-            item.identifier_prefix = str(uuid.uuid4())
+            item.identifier = str(uuid.uuid4())
 
     def build(self, node_sockets):
         return list(self._build(node_sockets))
@@ -32,7 +32,7 @@ class BaseListVariadic(SocketDeclBase):
                 data_type,
                 node_sockets,
                 "",
-                item.identifier_prefix + self.identifier_suffix)
+                item.identifier)
         yield node_sockets.new("fn_OperatorSocket", "Operator")
 
     def validate(self, sockets):
@@ -42,8 +42,7 @@ class BaseListVariadic(SocketDeclBase):
 
         for socket, item in zip(sockets[:-1], collection):
             data_type = self.base_type if item.state == "BASE" else self.list_type
-            identifier = item.identifier_prefix + self.identifier_suffix
-            if not self._data_socket_test(socket, "", data_type, identifier):
+            if not self._data_socket_test(socket, "", data_type, item.identifier):
                 return False
 
         if sockets[-1].bl_idname != "fn_OperatorSocket":
@@ -86,12 +85,11 @@ class BaseListVariadic(SocketDeclBase):
         collection = self.get_collection()
         item = collection.add()
         item.state = state
-        item.identifier_prefix = str(uuid.uuid4())
+        item.identifier = str(uuid.uuid4())
 
         self.node.rebuild()
 
-        identifier = item.identifier_prefix + self.identifier_suffix
-        new_socket = self.node.find_socket(identifier, is_output)
+        new_socket = self.node.find_socket(item.identifier, is_output)
         self.node.tree.new_link(linked_socket, new_socket)
 
     def amount(self):
@@ -112,7 +110,7 @@ class BaseListVariadicPropertyGroup(bpy.types.PropertyGroup):
         items=[
             ("BASE", "Base", "", "NONE", 0),
             ("LIST", "Base", "", "NONE", 1)])
-    identifier_prefix: StringProperty()
+    identifier: StringProperty()
 
 class NewBaseListVariadicInputOperator(bpy.types.Operator):
     bl_idname = "fn.new_base_list_variadic_input"
@@ -130,7 +128,7 @@ class NewBaseListVariadicInputOperator(bpy.types.Operator):
 
         item = collection.add()
         item.state = "BASE"
-        item.identifier_prefix = str(uuid.uuid4())
+        item.identifier = str(uuid.uuid4())
 
         tree.sync()
         return {'FINISHED'}
diff --git a/release/scripts/startup/nodes/declaration/bparticles.py b/release/scripts/startup/nodes/declaration/bparticles.py
index 3095a9d12f3..425569648e8 100644
--- a/release/scripts/startup/nodes/declaration/bparticles.py
+++ b/release/scripts/startup/nodes/declaration/bparticles.py
@@ -85,7 +85,7 @@ class ExecuteInputDecl(SocketDeclBase):
 class ExecuteInputListDecl(SocketDeclBase):
     def __init__(self, node, identifier: str, prop_name: str, display_name: str):
         self.node = node
-        self.identifier_prefix = identifier
+        self.identifier = identifier
         self.display_name = display_name
         self.prop_name = prop_name
 
@@ -103,8 +103,7 @@ class ExecuteInputListDecl(SocketDeclBase):
             yield socket
         socket = node_sockets.new(
             "fn_OperatorSocket",
-            self.display_name,
-            identifier=self.identifier_prefix + "(Operator)")
+            self.display_name)
         socket.display_shape = 'SQUARE'
         yield socket
 
@@ -128,8 +127,6 @@ class ExecuteInputListDecl(SocketDeclBase):
             return False
         if not sockets[-1].name == self.display_name:
             return False
-        if not sockets[-1].identifier == self.identifier_prefix + "(Operator)":
-            return False
 
         return True
 
diff --git a/release/scripts/startup/nodes/declaration/vectorized.py b/release/scripts/startup/nodes/declaration/vectorized.py
index 250d54bf811..27e608ccce8 100644
--- a/release/scripts/startup/nodes/declaration/vectorized.py
+++ b/release/scripts/startup/nodes/declaration/vectorized.py
@@ -7,7 +7,7 @@ from .. utils.generic import getattr_recursive
 class VectorizedDeclBase:
     def build(self, node_sockets):
         data_type, name = self.get_type_and_name()
-        socket =type_infos.build(
+        socket = type_infos.build(
             data_type,
             node_sockets,
             name,