improved wildcard handling (addresses #154)

src/gui/Dialog.cxx

@@ -264,7 +264,7 @@ void Dialog::render()
 
   if(!onTop)
   {
-    cerr << "    shade " << typeid(*this).name() << endl;
+    //cerr << "    shade " << typeid(*this).name() << endl;
 
     _shadeSurface->setDstRect(_surface->dstRect());
     _shadeSurface->render();

src/gui/LauncherDialog.cxx

@@ -352,54 +352,69 @@ size_t LauncherDialog::matchWithJoker(const string& str, const string& pattern)
 {
   if(str.length() >= pattern.length())
   {
-    for(size_t pos = 0; pos < str.length() - pattern.length() + 1; ++pos)
+    // optimize a bit
+    if(pattern.find('?') != string::npos)
     {
-      bool found = true;
+      for(size_t pos = 0; pos < str.length() - pattern.length() + 1; ++pos)
+      {
+        bool found = true;
 
-      for(size_t i = 0; found && i < pattern.length(); ++i)
+        for(size_t i = 0; found && i < pattern.length(); ++i)
-        if(pattern[i] != str[pos + i] && pattern[i] != '?')
+          if(pattern[i] != str[pos + i] && pattern[i] != '?')
-          found = false;
+            found = false;
 
-      if(found)
+        if(found)
-        return pos;
+          return pos;
+      }
     }
+    else
+      return str.find(pattern);
   }
   return string::npos;
 }
 
 bool LauncherDialog::matchWithWildcards(const string& str, const string& pattern)
 {
-  string in = str;
   string pat = pattern;
-  size_t pos = string::npos;
 
-  BSPF::toUpperCase(in);
+  // remove leading and trailing '*'
-  BSPF::toUpperCase(pat);
+  size_t i = 0;
+  while(pat[i++] == '*');
+  pat = pat.substr(i - 1);
 
-  for(size_t i = 0; i < pat.length(); ++i)
+  i = pat.length();
-    if(pat[i] == '*')
+  while(pat[--i] == '*');
-    {
+  pat.erase(i + 1);
-      pos = i;
+
-      break;
+  // Search for first '*'
-    }
+  size_t pos = pat.find('*');
 
   if(pos != string::npos)
   {
     // '*' found, split pattern into left and right part, search recursively
     const string leftPat = pat.substr(0, pos);
     const string rightPat = pat.substr(pos + 1);
-    size_t posLeft = matchWithJoker(in, leftPat);
+    size_t posLeft = matchWithJoker(str, leftPat);
 
     if(posLeft != string::npos)
-      return matchWithWildcards(in.substr(pos + posLeft), rightPat);
+      return matchWithWildcards(str.substr(pos + posLeft), rightPat);
     else
       return false;
   }
-  else
+  // no further '*' found
-  {
+  return matchWithJoker(str, pat) != string::npos;
-    // no further '*' found
+}
-    return matchWithJoker(in, pat) != string::npos;
+
-  }
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+bool LauncherDialog::matchWithWildcardsIgnoreCase(const string& str, const string& pattern)
+{
+  string in = str;
+  string pat = pattern;
+
+  BSPF::toUpperCase(in);
+  BSPF::toUpperCase(pat);
+
+  return matchWithWildcards(in, pat);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -415,7 +430,7 @@ void LauncherDialog::applyFiltering()
 
         // Skip over files that don't match the pattern in the 'pattern' textbox
         if(myPattern && myPattern->getText() != "" &&
-           !matchWithWildcards(node.getName(), myPattern->getText()))
+           !matchWithWildcardsIgnoreCase(node.getName(), myPattern->getText()))
           return false;
       }
       return true;

src/gui/LauncherDialog.hxx

@@ -113,6 +113,28 @@ class LauncherDialog : public Dialog
     void saveConfig() override;
     void updateUI();
 
+    /**
+      Search if string contains pattern including wildcard '*'
+      and '?' as joker, ignoring case.
+
+      @param str      The searched string
+      @param pattern  The pattern to search for
+
+      @return True if pattern was found.
+    */
+    bool matchWithWildcardsIgnoreCase(const string& str, const string& pattern);
+
+    /**
+      Search if string contains pattern including wildcard '*'
+      and '?' as joker.
+
+      @param str      The searched string
+      @param pattern  The pattern to search for
+
+      @return True if pattern was found.
+    */
+    bool matchWithWildcards(const string& str, const string& pattern);
+
     /**
       Search if string contains pattern including '?' as joker.
 
@@ -123,16 +145,6 @@ class LauncherDialog : public Dialog
     */
     size_t matchWithJoker(const string& str, const string& pattern);
 
-    /**
-      Search if string contains pattern including wildcard '*'
-      and '?' as joker, ignoring case.
-
-      @param str      The searched string
-      @param pattern  The pattern to search for
-
-      @return True if pattern was found.
-    */
-    bool matchWithWildcards(const string& str, const string& pattern);
     void applyFiltering();
 
     float getRomInfoZoom(int listHeight) const;