From bf5d96a2f9c09007bd4dbe578ecd4d985d49a2c2 Mon Sep 17 00:00:00 2001
From: SuperBeastsAI <bradcmasters+superbeasts.ai@gmail.com>
Date: Mon, 13 May 2024 15:01:10 +1000
Subject: [PATCH] Resolved issues with string list

---
 js/superbeasts.js      | 31 +++++++++++++++++++------------
 superbeastsai_nodes.py | 14 ++++++--------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/js/superbeasts.js b/js/superbeasts.js
index 56d33fe..5cc8dfa 100644
--- a/js/superbeasts.js
+++ b/js/superbeasts.js
@@ -32,9 +32,9 @@ app.registerExtension({
       };
 
 
-	  if (nodeData.name === "Image Batch Manager (SuperBeasts.AI)") {
-		nodeType.prototype.onExecutionStart  = function () {
- 
+	if (nodeData.name === "Image Batch Manager (SuperBeasts.AI)") {
+		nodeType.prototype.onExecutionStart = function () {
+
 			// Assume 'this.widgets' contains all the widgets of the node
 			const max_images = getWidgetValueByName(this.widgets, 'max_images');
 			const randomOrderValue = getWidgetValueByName(this.widgets, 'random_order');
@@ -46,6 +46,9 @@ app.registerExtension({
 				// Determine the effective number of indices to consider
 				let effectiveLength = Math.min(imageInputs.length, max_images);
 
+				// Ensure effectiveLength doesn't drop below zero due to the subtraction
+				effectiveLength = Math.max(effectiveLength - 1, 0);
+
 				// Generate an array of indices based on the effective length
 				let indices = Array.from({length: effectiveLength}, (_, i) => i + 1);
 				shuffle(indices); // Shuffle the indices to randomize
@@ -55,10 +58,9 @@ app.registerExtension({
 
 				// Set the 'new_manual_order' widget value
 				setWidgetValueByName(this.widgets, 'new_manual_order', newOrder);
-			} 
-
-		};	
-	  }
+			}
+		};
+	}
 
 
       nodeType.prototype.onConnectionsChange = function(type, index, connected, link_info) {
@@ -133,9 +135,9 @@ app.registerExtension({
 		  if (slot_type === "STRING") {
 			let empty_slot_count = stringInputs.filter(input => input.link === null).length;
 			if (!connected) {
-			  if (link_info.target_slot !== 0) {
-				this.removeInput(link_info.target_slot);
-			  }
+				if (link_info.target_slot !== 0 && this.inputs[link_info.target_slot].name !== 'new_order') {
+					this.removeInput(link_info.target_slot);
+				}
 			} else {
 			  // Connection was added
 			  if (empty_slot_count === 0) {
@@ -144,11 +146,16 @@ app.registerExtension({
 			  }
 			}
 		  }
-	  
+		
+		let indexCounter = 1; // Start counter for naming inputs not 'new_order'
+
 		  // Renumber the string inputs
 		  stringInputs = this.inputs.filter(input => input.type === "STRING");
 		  stringInputs.forEach((input, idx) => {
-			input.name = `string${idx + 1}`;
+			  if (input.name !== 'new_order') {
+				input.name = `string${indexCounter}`;
+				indexCounter++; // Only increment if the input wasn't 'new_order'
+			  }
 		  });
 	  
 		  // Merge and restore order
diff --git a/superbeastsai_nodes.py b/superbeastsai_nodes.py
index e2b2be7..191e57e 100644
--- a/superbeastsai_nodes.py
+++ b/superbeastsai_nodes.py
@@ -507,8 +507,7 @@ class MaskBatchManagement:
         return {
             "required": {
                 "width": ("INT", {"default": 512}),
-                "height": ("INT", {"default": 768}),
-                "reordering_enabled":  ("BOOLEAN", {"default": False})
+                "height": ("INT", {"default": 768})
             },
             "optional": {
                 "new_order": ("STRING", {"default": ""}),
@@ -519,7 +518,7 @@ class MaskBatchManagement:
     FUNCTION = "append"
     CATEGORY = "SuperBeastsAI/Masks"
 
-    def append(self, width, height, reordering_enabled, new_order, **kwargs):
+    def append(self, width, height, new_order, **kwargs):
         masks = [kwargs["mask1"]]  # Start with the required mask1 input
 
         i = 2
@@ -527,7 +526,7 @@ class MaskBatchManagement:
             masks.append(kwargs[f"mask{i}"])
             i += 1
 
-        if reordering_enabled and new_order:
+        if new_order:
             order_indices = [int(idx) - 1 for idx in new_order.split(',') if idx.strip()]
             masks = [masks[idx] for idx in order_indices if idx < len(masks)]
 
@@ -550,8 +549,7 @@ class StringListManager:
     def INPUT_TYPES(s):
         return {
             "required": {
-                "frames_per_image": ("INT", {"default": 1, "min": 1, "step": 1}),
-                "reordering_enabled": ("BOOLEAN", {"default": False})
+                "frames_per_image": ("INT", {"default": 1, "min": 1, "step": 1})
             },
             "optional": {
                 "new_order": ("STRING", {"default": ""}),
@@ -562,7 +560,7 @@ class StringListManager:
     FUNCTION = "reorder_strings"
     CATEGORY = "SuperBeastsAI/Utils"
 
-    def reorder_strings(self, frames_per_image, reordering_enabled, new_order, **kwargs):
+    def reorder_strings(self, frames_per_image, new_order, **kwargs):
         strings = [kwargs["string1"]]  # Start with the required string1 input
 
         i = 2
@@ -570,7 +568,7 @@ class StringListManager:
             strings.append(kwargs[f"string{i}"])
             i += 1
 
-        if reordering_enabled and new_order:
+        if new_order:
             order_indices = [int(idx) - 1 for idx in new_order.split(',') if idx.strip()]
             strings = [strings[idx] for idx in order_indices if idx < len(strings)]