From a86f9ef75fdecefd1a55c28a530858fcc16a8b03 Mon Sep 17 00:00:00 2001
From: Ben Fry <ben@fathom.info>
Date: Thu, 24 Nov 2022 16:09:04 -0500
Subject: [PATCH] do exhaustive search to avoid saying "no more" when more are
 available

---
 app/src/processing/app/SketchName.java | 93 +++++++++++++++++++++-----
 1 file changed, 78 insertions(+), 15 deletions(-)

diff --git a/app/src/processing/app/SketchName.java b/app/src/processing/app/SketchName.java
index 01963417a..930b097f7 100644
--- a/app/src/processing/app/SketchName.java
+++ b/app/src/processing/app/SketchName.java
@@ -32,7 +32,9 @@ public class SketchName {
   static File nextFolder(File parentDir) {
     String approach = Preferences.get("sketch.name.approach");
     if (!CLASSIC.equals(approach)) {
-      File folder = wordsFolder(parentDir, approach);
+      WordList wl = getWordLists().get(approach);
+      //File folder = wordsFolder(parentDir, approach);
+      File folder = wl.wordsFolder(parentDir);
       if (folder == null) {
         Messages.showWarning("Out of Options", """
           All possible naming combinations have been used.
@@ -105,6 +107,7 @@ public class SketchName {
     String notes;
     StringList prefixes;
     StringList suffixes;
+    StringList exhaustive;
 
     WordList(JSONObject source) {
       name = source.getString("name");
@@ -114,15 +117,76 @@ public class SketchName {
     }
 
     String getPair() {
-      return (prefixes.random() + " " + suffixes.random()).replace(' ', '_');
+      return (prefixes.choice() + " " + suffixes.choice()).replace(' ', '_');
     }
 
-    int getComboCount() {
-      return prefixes.size() * suffixes.size();
+//    int getComboCount() {
+//      return prefixes.size() * suffixes.size();
+//    }
+
+    /**
+     * For name sets that are especially small, it may be possible
+     * to run out of name pairs. This first builds a (shuffled) list
+     * of all remaining name possibilities and then returns entries
+     * from that list until it has been exhausted.
+     */
+    File wordsFolderExhaust(File parentDir) {
+      // if it doesn't exist already, create a list of all (unused) possibilities
+      if (exhaustive == null) {
+        exhaustive = new StringList();
+        for (String prefix : prefixes) {
+          for (String suffix : suffixes) {
+            String pair = (prefix + " " + suffix).replace(' ', '_');
+            String name = Sketch.sanitizeName(pair);
+            File folder = new File(parentDir, name);
+            if (!folder.exists()) {
+              exhaustive.append(name);
+            }
+          }
+        }
+        exhaustive.shuffle();
+      }
+      // keep trying until we find something or the list is empty
+      while (true) {
+        if (exhaustive.size() == 0) {
+          return null;
+        }
+        String name = exhaustive.removeChoice();
+        if (name == null) {
+          return null;  // no more choices available
+        }
+        File outgoing = new File(parentDir, name);
+        if (!outgoing.exists()) {
+          return outgoing;
+        }
+      }
+    }
+
+    File wordsFolder(File parentDir) {
+      if (exhaustive != null) {
+        return wordsFolderExhaust(parentDir);
+      }
+      // Still may be other possibilities after this, but if we hit
+      // this many attempts, we've pretty much exhausted the list.
+      final int maxAttempts = prefixes.size() * suffixes.size();
+      int attempts = 0;
+      File outgoing;
+      do {
+        // Clean up the name in case a user-supplied word list breaks the rules
+        String name = Sketch.sanitizeName(getPair());
+        outgoing = new File(parentDir, name);
+        attempts++;
+        if (attempts == maxAttempts) {
+          //return null;  // avoid infinite loop
+          return wordsFolderExhaust(parentDir);
+        }
+      } while (outgoing.exists());
+      return outgoing;
     }
   }
 
 
+  /*
   static File wordsFolder(File parentDir, String setName) {
     WordList wl = getWordLists().get(setName);
     File outgoing = null;
@@ -130,19 +194,18 @@ public class SketchName {
     // this many attempts, we've pretty much exhausted the list.
     final int maxAttempts = wl.getComboCount();
     int attempts = 0;
-    if (wl != null) {
-      do {
-        // Clean up the name in case a user-supplied word list breaks the rules
-        String name = Sketch.sanitizeName(wl.getPair());
-        outgoing = new File(parentDir, name);
-        attempts++;
-        if (attempts == maxAttempts) {
-          return null;  // avoid infinite loop
-        }
-      } while (outgoing.exists());
-    }
+    do {
+      // Clean up the name in case a user-supplied word list breaks the rules
+      String name = Sketch.sanitizeName(wl.getPair());
+      outgoing = new File(parentDir, name);
+      attempts++;
+      if (attempts == maxAttempts) {
+        return null;  // avoid infinite loop
+      }
+    } while (outgoing.exists());
     return outgoing;
   }
+  */
 
 
   static private void load(File namingFile) {