Fixes to the Mastermind Release

This release fixes a couple of the known misbehaviors with v.20, the
"Mastermind Release":

* Nulti-word pet names are now fully supported and checked in their
  entirety for uniqueness.
* The warning dialog that some pet names have errors, which is shows at
  write-binds time, will only appear if binds are configured that
  require pet names to exist and be unique.  If by-name binds and
  bodyguard mode bind keys are left blank, that dialog will be skipped.

TODO:  still might update the red error display on pet names also only
to appear if unique names are required.

Author: emersonrp

Page/Mastermind.py

@@ -385,15 +385,9 @@ def CheckUndefNames(self):
     def CheckUniqueNames(self):
         if (self.Profile.Archetype() == "Mastermind"):
             names = []
-            wasMultiWord = [False] * 6
             for i in (1,2,3,4,5,6):
                 ctrl = self.Ctrls[f'Pet{i}Name']
-                value = ctrl.GetValue()
-                # if we contain multiple words, use the longest
-                words = value.split()
-                if len(words) > 1:
-                    wasMultiWord[i-1] = True
-                    value = max(words, key = len)
+                value = ctrl.GetValue().strip() # don't allow whitespace at the ends
                 names.append(value)
 
             # we stash this away every time we calculate it so we can
@@ -404,8 +398,7 @@ def CheckUniqueNames(self):
                 if self.uniqueNames[i-1]:
                     ctrl.RemoveError('unique')
                 else:
-                    MWWarning = "  BindControl only uses the longest word of a multi-word name." if wasMultiWord[i-1] else ""
-                    ctrl.AddError('unique', f'This pet name is not different enough to identify it uniquely.{MWWarning}')
+                    ctrl.AddError('unique', f'This pet name is not different enough to identify it uniquely.')
         else:
             for i in (1,2,3,4,5,6):
                 ctrl = self.Ctrls[f'Pet{i}Name']
@@ -562,12 +555,21 @@ def PopulateBindFiles(self):
 
         if not profile.Archetype() == 'Mastermind': return True
 
+        needUniqueNames = False
         for i in (1,2,3,4,5,6):
-            ctrl = self.Ctrls[f'Pet{i}Name']
-            if ctrl.IsEnabled() and ctrl.HasAnyError():
-                result = wx.MessageBox("One or more of your pet names has errors.  You can continue to write these binds but they are likely not to work well in-game.  Continue?", "Name Error", wx.YES_NO)
-                if result == wx.NO: return False
+            if self.Ctrls[f'PetSelect{i}'].GetLabel():
+                needUniqueNames = True
                 break
+        if self.Ctrls['PetBodyguard'].GetLabel():
+            needUniqueNames = True
+
+        if needUniqueNames:
+            for i in (1,2,3,4,5,6):
+                ctrl = self.Ctrls[f'Pet{i}Name']
+                if ctrl.IsEnabled() and ctrl.HasAnyError():
+                    result = wx.MessageBox("One or more of your pet names has errors.  You can continue to write these binds but they are likely not to work well in-game.  Continue?", "Name Error", wx.YES_NO)
+                    if result == wx.NO: return False
+                    break
 
         ### Sandolphan binds
         if self.GetState('PetCmdEnable'):
@@ -778,6 +780,9 @@ def FindSmallestUniqueSubstring(names):
 
                 if not foundMatch:
                     ### This substr works!
+                    # If it contains a space, put "" around it
+                    if re.match(r'\s', substr):
+                        substr = f'"{substr}"'
                     uniqueNames[nameInd] = substr
                     break
             else: