Ticket #4014: path_match_v1.patch

engines/kyra/gui_v2.cpp

@@ -730 +730 @@
                 Common::String oldName = _vm->getSavegameFilename(*i);
                 Common::String newName = _vm->getSavegameFilename(*i-1);
                 _vm->_saveFileMan->renameSavefile(oldName.c_str(), newName.c_str());
-        }       
+        }
         _saveMenu.menuNameId = _vm->gameFlags().isTalkie ? 9 : 17;
         return 0;
 }

common/archive.cpp

@@ -242 +242 @@
 
 }
 
+namespace {
+
+void setupPathMatch(const Common::String &pattern, StringList &out) {
+        Common::StringTokenizer tokenizer(pattern, "/");
+        while (!tokenizer.empty())
+                out.push_back(tokenizer.nextToken());
+}
+
+bool pathMatch(const Common::String &name, const StringList &matchAgainst) {
+        StringList nameSubs;
+        setupPathMatch(name, nameSubs);
+
+        if (nameSubs.size() != matchAgainst.size())
+                return false;
+
+        for (Common::StringList::const_iterator i = nameSubs.begin(), j = matchAgainst.begin(); i != nameSubs.end(); ++i, ++j)
+                if (!Common::matchString(i->c_str(), j->c_str()))
+                        return false;
+
+        return true;
+}
+
+} // end of namespace
+
 int FSDirectory::listMatchingMembers(ArchiveMemberList &list, const String &pattern) {
         if (!_node.isDirectory())
                 return 0;
@@ -255 +279 @@
         String lowercasePattern(pattern);
         lowercasePattern.toLowercase();
 
+        StringList patternSubs;
+        setupPathMatch(lowercasePattern, patternSubs);
+
         int matches = 0;
         NodeCache::iterator it = _fileCache.begin();
         for ( ; it != _fileCache.end(); it++) {
-                if ((*it)._key.matchString(lowercasePattern)) {
+                if (pathMatch(it->_key, patternSubs)) {
                         list.push_back(FSDirectoryMemberPtr(new FSDirectoryMember((*it)._value)));
                         matches++;
                 }