removed heavy operations from Panels + various code cleaning

Author: kosmin

__init__.py

@@ -1,7 +1,7 @@
 bl_info = {
     "name": "Blender Substance Texture Importer",
     "author": "Cosmin Planchon",
-    "version": (0, 2, 3),
+    "version": (0, 2, 4),
     "blender": (2, 82, 0),
     "location": "Properties > Material",
     "description": "Import & autoassign images from Substance Painter or similar 3D painting tools",
@@ -34,7 +34,7 @@
                           BSM_OT_add_map_line, BSM_OT_find_ext,
                           )
 
-from . panels import (  BSM_PT_presets, BSM_PT_importpanel, BSM_PT_linestopanel,
+from . panels import (  BSM_PT_presets, BSM_PT_importpanel, BSM_PT_panel_line,
                         BSM_PT_prefs, BSM_PT_options, BSM_PT_params, BSM_PT_buttons,
                         )
 
@@ -65,7 +65,7 @@
     BSM_OT_import_textures,
     BSM_PT_importpanel,
     BSM_PT_params,
-    BSM_PT_linestopanel,
+    BSM_PT_panel_line,
     BSM_PT_prefs,
     BSM_PT_buttons,
     BSM_PT_options,

nodeshandler.py

@@ -325,22 +325,22 @@ def setup_nodes(self, **params):
         gofile = True
         if not manual:
             # bpy.ops.bsm.name_maker(line_num = index)
-            gofile = (bpy.ops.bsm.name_checker(linen=index, lorigin="plug", called=True) == {'FINISHED'})
-        lefilepath = panel_line.file_name
+            gofile = (bpy.ops.bsm.name_checker(line_number=index, lorigin="plug", called=True) == {'FINISHED'})
+        active_filepath = panel_line.file_name
 
-        imagename = Path(lefilepath).name
+        imagename = Path(active_filepath).name
         lamap = panel_line.map_label
         if manual:
-            lamap = Path(lefilepath).stem
+            lamap = Path(active_filepath).stem
 
         if lematerial.node_tree.nodes.find(lamap) > 0:
 
-            if Path(lefilepath).is_file() and gofile:
+            if Path(active_filepath).is_file() and gofile:
                 bpy.ops.image.open(
-                    filepath=Path(lefilepath).name,
-                    directory=str(Path(lefilepath).parent),
+                    filepath=Path(active_filepath).name,
+                    directory=str(Path(active_filepath).parent),
                     #TODO why declare twice ?
-                    files=[{"name": Path(lefilepath).name, "name": Path(lefilepath).name}],
+                    files=[{"name": Path(active_filepath).name, "name": Path(active_filepath).name}],
                     show_multiview=False
                 )
                 nodestofill = (nod for nod in lematerial.node_tree.nodes if nod.label == lamap)

operators.py

@@ -129,6 +129,8 @@ def execute(self, context):
             supposed = patterns_list[patternselected][1]
 
             panel_line.probable = str(Path(lefolder).joinpath(supposed))
+
+            propper.update_file_is_real(context=panel_line)
             if Path(panel_line.probable).is_file():
                 break
 
@@ -138,22 +140,22 @@ def execute(self, context):
 class BSM_OT_find_ext(sub_poll,Operator):
     bl_idname = "bsm.find_ext"
     bl_label = ""
-    bl_description = "set panel_line{linen}.map_ext according to dir content"
+    bl_description = "set panel_line{line_number}.map_ext according to dir content"
 
     keepat: bpy.props.BoolProperty(default=False)
-    linen: bpy.props.IntProperty()
+    line_number: bpy.props.IntProperty()
     called: bpy.props.BoolProperty(default=True)
 
     def execute(self, context):
         keepat = self.keepat
-        linen = self.linen
+        line_number = self.line_number
         scene = context.scene
-        panel_line = eval(f"scene.panel_line{linen}")
+        panel_line = eval(f"scene.panel_line{line_number}")
         manual = panel_line.manual
         propper = ph()
-        gs_params = {'context': context, 'props':panel_line, 'keep_pattern':keepat}
+        ft_params = {'context': context, 'props':panel_line, 'keep_pattern':keepat}
         currentext = panel_line.map_ext
-        is_in_dir = propper.file_tester(**gs_params)
+        is_in_dir = propper.file_tester(**ft_params)
 
         if not is_in_dir and not manual:
 
@@ -165,7 +167,7 @@ def execute(self, context):
             for ext in filetypes:
                 panel_line.map_ext = ext
 
-                is_in_dir = propper.file_tester(**gs_params)
+                is_in_dir = propper.file_tester(**ft_params)
 
                 if is_in_dir:
                     break
@@ -182,7 +184,7 @@ class BSM_OT_name_checker(sub_poll,Operator):
     bl_label = ""
     bl_description = "Check if a file containing the Map Name keyword matches the Pattern"
 
-    linen: bpy.props.IntProperty(default=0)
+    line_number: bpy.props.IntProperty(default=0)
     lorigin: bpy.props.StringProperty(default="Not Set")
     called: bpy.props.BoolProperty(default=True)
     notfromext: bpy.props.BoolProperty(default=True)
@@ -192,30 +194,30 @@ def execute(self, context):
         keepat = self.keepat
         scene = context.scene
         bsmprops = scene.bsmprops
-        linen = self.linen
+        line_number = self.line_number
         notfromext = self.notfromext
 
-        panel_line = eval(f"scene.panel_line{linen}")
+        panel_line = eval(f"scene.panel_line{line_number}")
         manual = panel_line.manual
         advanced_mode = bsmprops.advanced_mode
         prefix = bsmprops.prefix
         sel = context.object
         mat = sel.active_material
         mat.use_nodes = True
         propper = ph()
-        gs_params = {'context':context, 'props':panel_line, 'keep_pattern':keepat}
+        ft_params = {'context':context, 'props':panel_line, 'keep_pattern':keepat}
         if self.lorigin == "plug" and not manual:
             panel_line.probable = "reseted"
 
         isafile = Path(panel_line.probable).is_file()
 
         if not manual:
 
-            gotafile = propper.file_tester(**gs_params)
+            gotafile = propper.file_tester(**ft_params)
 
             if not gotafile:
-                bpy.ops.bsm.find_ext(linen=linen)
-            isafile = propper.file_tester(**gs_params)
+                bpy.ops.bsm.find_ext(line_number=line_number)
+            isafile = propper.file_tester(**ft_params)
 
             if not isafile and self.called :
                 toreport = panel_line.probable + " not found "
@@ -290,7 +292,7 @@ class BSM_OT_add_map_line(sub_poll, Operator):
     bl_label = ""
     bl_description = "Add a new map line below"
 
-    linen: IntProperty(default=0)
+    line_number: IntProperty(default=0)
 
     def execute(self, context):
         if len(context.scene.shader_links) == 0:

panels.py

@@ -1,5 +1,4 @@
 import bpy
-from pathlib import Path
 
 from bpy.types import Panel
 
@@ -50,8 +49,8 @@ def draw(self, context):
         row.prop(bsmprops, "usr_dir")
 
 
-class BSM_PT_linestopanel(TexImporterPanel, Panel):
-    bl_idname = "BSM_PT_linestopanel"
+class BSM_PT_panel_line(TexImporterPanel, Panel):
+    bl_idname = "BSM_PT_panel_line"
     bl_label = "Texture maps"
     bl_parent_id = "BSM_PT_importpanel"
     bl_options = {'HIDE_HEADER'}
@@ -63,8 +62,6 @@ def draw(self, context):
         bsmprops = scene.bsmprops
         advanced_modemode = bsmprops.advanced_mode
         panel_rows = bsmprops.panel_rows
-        #TODO: no globbing in panel, get it propped
-        dir_content = [x.name for x in Path(bsmprops.usr_dir).glob('*.*') ]
         row = layout.row()
         col = row.column()
         col.alignment = 'RIGHT'
@@ -101,12 +98,6 @@ def draw(self, context):
             panel_line = eval(f"scene.panel_line{k}")
             file_name = panel_line.file_name
             manual = panel_line.manual
-            lefile = Path(panel_line.probable).name
-            
-            if manual:
-                lefile = Path(file_name).name
-                dir_content = bsmprops.dir_content
-
             row = layout.row(align = True)
             row.prop(panel_line, "line_on", text = "")
             row.use_property_split = True
@@ -125,10 +116,10 @@ def draw(self, context):
             col = row.column(align = True)
             col.alignment = 'EXPAND'
             if not advanced_modemode:
-                if lefile in dir_content:
-                    col.operator('BSM_OT_name_checker', icon='CHECKMARK').linen = k
+                if panel_line.file_is_real:
+                    col.operator('BSM_OT_name_checker', icon='CHECKMARK').line_number = k
                 else:
-                    col.operator('BSM_OT_name_checker', icon='QUESTION').linen = k
+                    col.operator('BSM_OT_name_checker', icon='QUESTION').line_number = k
             else :
 
                 col.prop(panel_line, "manual", text="", toggle=1, icon='FILE_TICK')