Version 2.2.1

Version 2.2.1

Author: RivinHD

__init__.py

@@ -6,7 +6,7 @@
     "name": "Script To Button",
     "author": "RivinHD",
     "blender": (3, 3, 10),
-    "version": (2, 2, 0),
+    "version": (2, 2, 1),
     "location": "View3D",
     "category": "System",
     "doc_url": "https://github.com/RivinHD/ScriptToButton/wiki",

functions.py

@@ -1,6 +1,7 @@
 import os
 import bpy
 import zipfile
+import uuid
 from bpy.props import StringProperty, PointerProperty
 from bpy.types import PropertyGroup, Context, UILayout, Text, AddonPreferences, Scene
 from typing import TYPE_CHECKING, Union
@@ -90,7 +91,7 @@ def load(context: Context) -> tuple[list, list]:
     return btnFails
 
 
-def get_all_button_names(context: Context) -> list:
+def get_all_button_names(context: Context) -> set:
     return set(button.name for button in context.scene.stb)
 
 
@@ -132,6 +133,7 @@ def get_areas(text: str) -> list:
     "Image_Editor": "VIEW",
     "Compositor": "CompositorNodeTree",
     "Texture_Node_Editor": "TextureNodeTree",
+    "Geomerty_Node_Editor": "GeometryNodeTree",
     "Shader_Editor": "ShaderNodeTree",
     "Video_Sequencer": "SEQUENCE_EDITOR",
     "Movie_Clip_Editor": "CLIP_EDITOR",
@@ -152,8 +154,8 @@ def get_props(text: str) -> list:
     lines = text.splitlines()
     props = []
     for i in range(len(lines)):
-        current_line = lines[i]
-        if not current_line.strip().startswith("#STB-"):
+        current_line = lines[i].strip()
+        if not current_line.startswith("#STB-") or current_line.startswith("#STB-Area"):
             continue
         next_line = lines[i + 1]
         if next_line.startswith("#"):
@@ -392,7 +394,7 @@ def remove_button(context: Context, delete_file: bool, delete_text: bool):
             "%s.py" % name
         ))
     if delete_text:
-        if index := bpy.data.texts.find(name) != -1:
+        if (index := bpy.data.texts.find(name)) != -1:
             bpy.data.texts.remove(bpy.data.texts[index])
     delete_vector_props(button)
     delete_list_prop(button)
@@ -527,18 +529,19 @@ def update_vector_property(self, context):
 
 def create_vector_prop(size: int, name: str, type: str, back_address: str):
     property_func = getattr(bpy.props, "%sProperty" % type)
+    vec_id = uuid.uuid5(uuid.NAMESPACE_OID, name).hex
 
     class VectorProp(PropertyGroup):
         prop: property_func(size=size, update=update_vector_property)
         address: StringProperty(default=back_address)
-    VectorProp.__name__ = "VectorProp_%s_%s" % (type, name)
+    VectorProp.__name__ = "VectorProp_%s_%s" % (type, vec_id)
     bpy.utils.register_class(VectorProp)
     setattr(
         bpy.types.Scene,
-        "stb_%sproperty_%s" % (type.lower(), name),
+        "stb_%sproperty_%s" % (type.lower(), vec_id),
         PointerProperty(type=VectorProp)
     )
-    return "bpy.context.scene.stb_%sproperty_%s" % (type.lower(), name)
+    return "bpy.context.scene.stb_%sproperty_%s" % (type.lower(), vec_id)
 
 
 def unregister_vector():
@@ -631,7 +634,6 @@ def export(mode, selections: list, export_path: str) -> None:
 
 
 def import_zip(filepath: str, context: Context) -> tuple[list, list]:
-    STB_pref = get_preferences(context)
     btnFails = ([], [])
     with zipfile.ZipFile(filepath, 'r') as zip_out:
         filepaths = []
@@ -640,31 +642,31 @@ def import_zip(filepath: str, context: Context) -> tuple[list, list]:
                 filepaths.append(i)
         for filepath in filepaths:
             txt = zip_out.read(filepath).decode("utf-8").replace("\r", "")
-            Fail = import_button(filepath, context, STB_pref, txt)
+            Fail = import_button(filepath, context, txt)
             btnFails[0].extend(Fail[0])
             btnFails[1].append(Fail[1])
         return btnFails
 
 
 def import_py(filepath: str, context: Context) -> tuple[list[str], tuple[list, list]]:
-    STB_pref = get_preferences(context)
     with open(filepath, 'r', encoding='utf8') as file:
         txt = file.read()
-        return import_button(filepath, context, STB_pref, txt)
+        return import_button(filepath, context, txt)
 
 
 def import_button(
         filepath: str,
         context: Context,
         txt: str) -> tuple[list[str], tuple[list, list]]:
     STB_pref = get_preferences(context)
+    stb = context.scene.stb
     name = check_for_duplicates(
-        [i.name for i in bpy.data.texts],
+        get_all_button_names(context),
         os.path.splitext(os.path.basename(filepath))[0]
     )
     bpy.data.texts.new(name)
     bpy.data.texts[name].write(txt)
-    button: STB_button_properties = context.scene.stb.add()
+    button: STB_button_properties = stb.add()
     button.name = name
     button.selected = True
 
@@ -708,7 +710,7 @@ def rename(context: Context, name: str):
     old_path = os.path.join(directory, "Storage", "%s.py" %
                             STB_pref.selected_button)
     if name != button.name:
-        name = check_for_duplicates(get_all_button_names(context), name)
+        name = check_for_duplicates(get_all_button_names(context).difference([button.name]), name)
     button.name = name
     button.selected = True
     text.name = name

operators.py

@@ -1,6 +1,6 @@
 import typing
 import bpy
-from bpy.types import Operator, Context, Event, PropertyGroup
+from bpy.types import Operator, Context, Event, PropertyGroup, UILayout
 from bpy.props import StringProperty, EnumProperty, BoolProperty, CollectionProperty
 from bpy_extras.io_utils import ImportHelper, ExportHelper
 from . functions import get_preferences
@@ -423,7 +423,7 @@ def execute(self, context: Context):
                 return {'CANCELLED'}
         functions.export(
             self.mode,
-            map(lambda x: x.use, self.export_buttons),
+            filter(lambda x: x.use, self.export_buttons),
             self.filepath
         )
         return {"FINISHED"}
@@ -493,27 +493,108 @@ class STB_OT_Edit(Operator):
     bl_description = "Edit the selected Button"
     bl_options = {"UNDO"}
 
+    area_items = [  # (identifier, name, description, icon, value)
+        ('', 'General', '', ''),
+        ('3D_Viewport', '3D Viewport', '', 'VIEW3D'),
+        ('Image_Editor', 'Image Editor', '', 'IMAGE'),
+        ('UV_Editor', 'UV Editor', '', 'UV'),
+        ('Compositor', 'Compositor', '', 'NODE_COMPOSITING'),
+        ('Texture_Node_Editor', 'Texture Node Editor', '', 'NODE_TEXTURE'),
+        ('Geomerty_Node_Editor', 'Geomerty Node Editor', '', 'NODETREE'),
+        ('Shader_Editor', 'Shader Editor', '', 'NODE_MATERIAL'),
+        ('Video_Sequencer', 'Video Sequencer', '', 'SEQUENCE'),
+        ('Movie_Clip_Editor', 'Movie Clip Editor', '', 'TRACKER'),
+
+        ('', 'Animation', '', ''),
+        ('Dope_Sheet', 'Dope Sheet', '', 'ACTION'),
+        ('Timeline', 'Timeline', '', 'TIME'),
+        ('Graph_Editor', 'Graph Editor', '', 'GRAPH'),
+        ('Drivers', 'Drivers', '', 'DRIVER'),
+        ('Nonlinear_Animation', 'Nonlinear Animation', '', 'NLA'),
+
+        ('', 'Scripting', '', ''),
+        ('Text_Editor', 'Text Editor', '', 'TEXT')
+    ]
+
     name: StringProperty(name="Name")
     stb_properties: CollectionProperty(type=properties.STB_edit_property_item)
 
+    def items_stb_select_area(self, context: Context):
+        for item in self.stb_areas:
+            if item.delete:
+                self.stb_areas.remove(self.stb_areas.find(item.name))
+        used_areas = set(area.name for area in self.stb_areas)
+        areas = []
+        for i, (identifier, name, description, icon) in enumerate(STB_OT_Edit.area_items):
+            if identifier in used_areas:
+                continue
+            areas.append((
+                identifier,
+                name,
+                description,
+                icon,
+                i * (identifier != '') - 1
+            ))
+        return areas
+    stb_select_area: EnumProperty(items=items_stb_select_area, default=0)
+    stb_areas: CollectionProperty(type=properties.STB_edit_area_item)
+
+    def get_add_area(self):
+        return False
+
+    def set_add_area(self, value):
+        identifier = self.stb_select_area
+        icon = UILayout.enum_item_icon(self, 'stb_select_area', identifier)
+        label = UILayout.enum_item_name(self, 'stb_select_area', identifier)
+        if identifier == '':
+            return
+        new = self.stb_areas.add()
+        new.name = identifier
+        new.label = label
+        new.icon = icon
+        items = STB_OT_Edit.items_stb_select_area(self, bpy.context)
+        for item in items:
+            if item[0] == '':
+                continue
+            self.stb_select_area = item[0]
+            break
+    add_area: BoolProperty(default=False, get=get_add_area, set=set_add_area)
+
     def draw(self, context: Context):
         layout = self.layout
         layout.prop(self, 'name')
 
         layout.separator(factor=0.5)
-        layout.label(text="Properties")
+        layout.label(text="Areas")
+        row = layout.row(align=True)
+        row.prop(self, 'stb_select_area')
+        row.prop(self, 'add_area', icon="ADD", icon_only=True)
         box = layout.box()
-        for prop in filter(lambda x: not x.use_delete, self.stb_properties):
-            row = box.row()
-            row.label(text=f"{prop.name} [Ln {prop.line}]")
-            row.prop(prop, 'use_delete', icon='X', icon_only=True, emboss=False)
+        if len(self.stb_areas):
+            for area in filter(lambda x: not x.delete, self.stb_areas):
+                row = box.row()
+                row.label(text=area.label, icon_value=area.icon)
+                row.prop(area, 'delete', icon='X', icon_only=True, emboss=False)
+        else:
+            box.label(text="All Areas", icon='RESTRICT_COLOR_ON')
+
+        properties = list(filter(lambda x: not x.use_delete, self.stb_properties))
+        if len(properties):
+            layout.separator(factor=0.5)
+            layout.label(text="Properties")
+            box = layout.box()
+            for prop in properties:
+                row = box.row()
+                row.label(text=f"{prop.name} [Ln {prop.line}]")
+                row.prop(prop, 'use_delete', icon='X', icon_only=True, emboss=False)
 
     def invoke(self, context, event):
         STB_pref = get_preferences(context)
         stb = context.scene.stb
         button = stb[STB_pref.selected_button]
         self.name = button.name
         self.stb_properties.clear()
+        self.stb_areas.clear()
         for prop in functions.get_all_properties(button):
             new = self.stb_properties.add()
             new.name = prop.name
@@ -525,9 +606,7 @@ def execute(self, context):
         functions.rename(context, self.name)
 
         STB_pref = get_preferences(context)
-        stb = context.scene.stb
         property_changed = False
-        button = stb[STB_pref.selected_button]
 
         text_index = bpy.data.texts.find(STB_pref.selected_button)
         if text_index == -1:
@@ -537,22 +616,35 @@ def execute(self, context):
             text = bpy.data.texts[text_index]
         lines = [line.body for line in text.lines]
 
+        if len(self.stb_areas):
+            property_changed = True
+            if lines[0].strip().startswith("#STB"):
+                line = lines[0]
+                line += " /// "
+            else:
+                line = ""
+                lines.insert(0, line)
+            line += " /// ".join(map(lambda x: "#STB-Area-%s" % x.name, self.stb_areas))
+            lines[0] = line
+
+        edited_lines = []
         for prop in filter(lambda x: x.use_delete, self.stb_properties):
             property_changed = True
             line: str = lines[prop.line - 1]
             line_start = line.find("#STB")
             if line_start == -1:
                 continue
-            
+
             if (init_start_position := line.find("#STB-InitValue-")) != -1:
                 init_start_position += len("#STB-InitValue-")
                 init_end_position = line.find("-END", init_start_position)
                 init_value = line[init_start_position: init_end_position]
-                lines[prop.line] = "%s= %s" %(prop.linename, init_value)
-                
+                lines[prop.line] = "%s= %s" % (prop.linename, init_value)
+
             and_position = line.find("///", line_start)
             end_position = line.find("#STB", and_position)
-            while (and_next := line.find("///", end_position)) != -1 and (end_next := line.find("#STB", and_next)) != -1:
+            while ((and_next := line.find("///", end_position)) != -1
+                   and (end_next := line.find("#STB", and_next)) != -1):
                 and_position = and_next
                 end_position = end_next
 
@@ -567,8 +659,12 @@ def execute(self, context):
                 line = line[:line_start] + line[line_end:]
 
             lines[prop.line - 1] = line
+            edited_lines.append(prop.line - 1)
+
+        for i in sorted(edited_lines, reverse=True):
+            line = lines[i]
             if line.strip() == "":
-                lines.pop(prop.line - 1)
+                lines.pop(i)
 
         if property_changed:
             text.clear()

properties.py

@@ -6,6 +6,7 @@
 )
 from .functions import update_text
 from . import functions
+from contextlib import suppress
 
 classes = []
 
@@ -248,14 +249,22 @@ class STB_add_property_item(PropertyGroup):
     line: StringProperty()
     value: StringProperty()
     type: StringProperty()
-    
+
+
 class STB_edit_property_item(PropertyGroup):
     name: StringProperty()
     line: IntProperty()
     linename: StringProperty()
     use_delete: BoolProperty(default=False)
 
 
+class STB_edit_area_item(PropertyGroup):
+    name: StringProperty()
+    label: StringProperty()
+    icon: IntProperty()
+    delete: BoolProperty(default=False)
+
+
 classes = [
     STB_property_string,
     STB_property_int,
@@ -273,7 +282,8 @@ class STB_edit_property_item(PropertyGroup):
     STB_text_property,
     STB_export_button,
     STB_add_property_item,
-    STB_edit_property_item
+    STB_edit_property_item,
+    STB_edit_area_item
 ]
 
 
@@ -286,11 +296,14 @@ def register():
 def unregister():
     for ele in bpy.context.scene.stb:
         for intvec in ele.IntVectorProps:
-            exec("del bpy.types.Scene.%s" % intvec.address.split(".")[-1])
+            with suppress(AttributeError):
+                exec("del bpy.types.Scene.%s" % intvec.address.split(".")[-1])
         for floatvec in ele.FloatVectorProps:
-            exec("del bpy.types.Scene.%s" % floatvec.address.split(".")[-1])
+            with suppress(AttributeError):
+                exec("del bpy.types.Scene.%s" % floatvec.address.split(".")[-1])
         for boolvec in ele.BoolVectorProps:
-            exec("del bpy.types.Scene.%s" % boolvec.address.split(".")[-1])
+            with suppress(AttributeError):
+                exec("del bpy.types.Scene.%s" % boolvec.address.split(".")[-1])
     for cls in classes:
         bpy.utils.unregister_class(cls)
     del bpy.types.Scene.stb