Ensure unique suggested sprite names

531999dc04c89c21232d6992619075139eec7249

Wolfsblvt <wolfsblvt@gmail.com>

public/scripts/extensions/expressions/index.js+20 -2 Viewed

+}
 /**
+ * Generates a unique sprite name by appending an index to the given expression. *
+ * @param {string} expression - The base expression to be used as the prefix for the sprite name.
+ * @param {ExpressionImage[]} existingFiles - An array of existing file objects, each containing a fileName property.
+ * @returns {string} - A unique sprite name with the format "expression-index".
+ */
+function generateUniqueSpriteName(expression, existingFiles) {
+    let index = existingFiles.length;
+    let newSpriteName;
+    do {
+        newSpriteName = `${expression}-${index++}`;
+    } while (existingFiles.some(file => withoutExtension(file.fileName) === newSpriteName));
+    return newSpriteName;
+}
+/**
  * Slash command callback for /uploadsprite
+ *
  * label= is required

                 const message = await renderExtensionTemplateAsync(MODULE_NAME, 'templates/upload-expression', { expression, clickedFileName });
-                spriteName = null;
+                spriteName = generateUniqueSpriteName(expression, existingFiles);
                 const input = await Popup.show.input(t`Upload Expression Sprite`, message,
-                    `${expression}-${existingFiles.length}`, { customButtons: customButtons });
+                    spriteName, { customButtons: customButtons });
                 if (input) {
                     if (!validateExpressionSpriteName(expression, input)) {

@@ -1735,6 +1751,8 @@ async function onClickExpressionUpload(event) {
1735	return;	1751	return;
1736	}	1752	}
1737	spriteName = input;	1753	spriteName = input;
		1754	} else {
		1755	spriteName = null;
1738	}	1756	}
1739	}	1757	}
1740	} else {	1758	} else {