Merge pull request #260 from Mawu3n4/master

Find cards by prefix

cockatrice/src/carddatabase.cpp

@@ -770,11 +770,30 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml, bool tokens)
     }
 }
 
+CardInfo *CardNameMap::findByPrefix(const std::string &prefix) {
+    int count = 0;
+    CardInfo *found;
+
+    for (CardNameMap::iterator it = this->begin(); it != this->end(); ++it) {
+        if (std::mismatch(prefix.begin(), prefix.end(),
+                          it.key().toStdString().begin()).first == prefix.end()) {
+            count++;
+            found = it.value();
+        }
+    }
+
+    return (count == 1 ? found : NULL);
+}
+
 CardInfo *CardDatabase::getCardFromMap(CardNameMap &cardMap, const QString &cardName, bool createIfNotFound) {
+    CardInfo *foundCard;
+
     if (cardName.isEmpty())
         return noCard;
     else if (cardMap.contains(cardName))
         return cardMap.value(cardName);
+    else if ((foundCard = cardMap.findByPrefix(cardName.toStdString())))
+        return foundCard;
     else if (createIfNotFound) {
         CardInfo *newCard = new CardInfo(this, cardName, true);
         newCard->addToSet(getSet("TK"));

cockatrice/src/carddatabase.h

@@ -180,7 +180,13 @@ signals:
 
 enum LoadStatus { Ok, VersionTooOld, Invalid, NotLoaded, FileError, NoCards };
 
-typedef QHash<QString, CardInfo *> CardNameMap;
+
+class CardNameMap: public QHash<QString, CardInfo *>
+{
+ public:
+  CardInfo *findByPrefix(const std::string &prefix);
+};
+
 typedef QHash<QString, CardSet *> SetNameMap;
 
 class CardDatabase : public QObject {