mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-01-24 05:31:11 -05:00
Add custom wildcard matcher.
This commit is contained in:
parent
9a2aba56fc
commit
4f78c32461
@ -23,6 +23,7 @@ set(keepassx_SOURCES
|
|||||||
autotype/AutoTypeSelectDialog.cpp
|
autotype/AutoTypeSelectDialog.cpp
|
||||||
autotype/AutoTypeSelectView.cpp
|
autotype/AutoTypeSelectView.cpp
|
||||||
autotype/ShortcutWidget.cpp
|
autotype/ShortcutWidget.cpp
|
||||||
|
autotype/WildcardMatcher.cpp
|
||||||
autotype/WindowSelectComboBox.cpp
|
autotype/WindowSelectComboBox.cpp
|
||||||
core/AutoTypeAssociations.cpp
|
core/AutoTypeAssociations.cpp
|
||||||
core/Config.cpp
|
core/Config.cpp
|
||||||
@ -104,6 +105,7 @@ set(keepassx_MOC
|
|||||||
autotype/AutoTypeSelectDialog.h
|
autotype/AutoTypeSelectDialog.h
|
||||||
autotype/AutoTypeSelectView.h
|
autotype/AutoTypeSelectView.h
|
||||||
autotype/ShortcutWidget.h
|
autotype/ShortcutWidget.h
|
||||||
|
autotype/WildcardMatcher.h
|
||||||
autotype/WindowSelectComboBox.h
|
autotype/WindowSelectComboBox.h
|
||||||
core/AutoTypeAssociations.h
|
core/AutoTypeAssociations.h
|
||||||
core/Config.h
|
core/Config.h
|
||||||
|
96
src/autotype/WildcardMatcher.cpp
Normal file
96
src/autotype/WildcardMatcher.cpp
Normal file
@ -0,0 +1,96 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 or (at your option)
|
||||||
|
* version 3 of the License.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "WildcardMatcher.h"
|
||||||
|
|
||||||
|
#include <QtCore/QStringList>
|
||||||
|
|
||||||
|
const QString WildcardMatcher::Wildcard = "*";
|
||||||
|
|
||||||
|
WildcardMatcher::WildcardMatcher(QString text, QObject* parent) :
|
||||||
|
QObject(parent)
|
||||||
|
{
|
||||||
|
m_text = text;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool WildcardMatcher::match(QString pattern)
|
||||||
|
{
|
||||||
|
m_pattern = pattern;
|
||||||
|
|
||||||
|
if (patternContainsWildcard()) {
|
||||||
|
return matchWithWildcards();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return patternEqualsText();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool WildcardMatcher::patternContainsWildcard()
|
||||||
|
{
|
||||||
|
return m_pattern.contains(Wildcard);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool WildcardMatcher::patternEqualsText()
|
||||||
|
{
|
||||||
|
return m_text.compare(m_pattern) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool WildcardMatcher::matchWithWildcards()
|
||||||
|
{
|
||||||
|
QStringList parts = m_pattern.split(Wildcard, QString::KeepEmptyParts);
|
||||||
|
Q_ASSERT(parts.size() >= 2);
|
||||||
|
|
||||||
|
if (startOrEndDoesNotMatch(parts)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return partsMatch(parts);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool WildcardMatcher::startOrEndDoesNotMatch(QStringList parts)
|
||||||
|
{
|
||||||
|
return !m_text.startsWith(parts.first()) || !m_text.endsWith(parts.last());
|
||||||
|
}
|
||||||
|
|
||||||
|
bool WildcardMatcher::partsMatch(QStringList parts)
|
||||||
|
{
|
||||||
|
int index = 0;
|
||||||
|
Q_FOREACH (QString part, parts) {
|
||||||
|
int matchIndex = getMatchIndex(part, index);
|
||||||
|
if (noMatchFound(matchIndex)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
index = calculateNewIndex(matchIndex, part.length());
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
int WildcardMatcher::getMatchIndex(QString part, int startIndex)
|
||||||
|
{
|
||||||
|
return m_text.indexOf(part, startIndex);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool WildcardMatcher::noMatchFound(int index)
|
||||||
|
{
|
||||||
|
return index < 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int WildcardMatcher::calculateNewIndex(int matchIndex, int partLength)
|
||||||
|
{
|
||||||
|
return matchIndex + partLength;
|
||||||
|
}
|
49
src/autotype/WildcardMatcher.h
Normal file
49
src/autotype/WildcardMatcher.h
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 or (at your option)
|
||||||
|
* version 3 of the License.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef KEEPASSX_WILDCARDMATCHER_H
|
||||||
|
#define KEEPASSX_WILDCARDMATCHER_H
|
||||||
|
|
||||||
|
#include <QtCore/QObject>
|
||||||
|
|
||||||
|
#include "core/Global.h"
|
||||||
|
|
||||||
|
class WildcardMatcher : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit WildcardMatcher(QString text, QObject* parent = Q_NULLPTR);
|
||||||
|
|
||||||
|
static const QString Wildcard;
|
||||||
|
|
||||||
|
bool match(QString pattern);
|
||||||
|
|
||||||
|
private:
|
||||||
|
QString m_text;
|
||||||
|
QString m_pattern;
|
||||||
|
bool patternEqualsText();
|
||||||
|
bool patternContainsWildcard();
|
||||||
|
bool matchWithWildcards();
|
||||||
|
bool startOrEndDoesNotMatch(QStringList parts);
|
||||||
|
bool partsMatch(QStringList parts);
|
||||||
|
int getMatchIndex(QString part, int startIndex);
|
||||||
|
bool noMatchFound(int index);
|
||||||
|
int calculateNewIndex(int matchIndex, int partLength);
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // KEEPASSX_WILDCARDMATCHER_H
|
@ -149,6 +149,9 @@ add_unit_test(NAME testkeepass1reader SOURCES TestKeePass1Reader.cpp MOCS TestKe
|
|||||||
add_unit_test(NAME testqsavefile SOURCES TestQSaveFile.cpp MOCS TestQSaveFile.h
|
add_unit_test(NAME testqsavefile SOURCES TestQSaveFile.cpp MOCS TestQSaveFile.h
|
||||||
LIBS ${TEST_LIBRARIES})
|
LIBS ${TEST_LIBRARIES})
|
||||||
|
|
||||||
|
add_unit_test(NAME testwildcardmatcher SOURCES TestWildcardMatcher.cpp MOCS TestWildcardMatcher.h
|
||||||
|
LIBS ${TEST_LIBRARIES})
|
||||||
|
|
||||||
if(WITH_GUI_TESTS)
|
if(WITH_GUI_TESTS)
|
||||||
add_subdirectory(gui)
|
add_subdirectory(gui)
|
||||||
endif(WITH_GUI_TESTS)
|
endif(WITH_GUI_TESTS)
|
||||||
|
129
tests/TestWildcardMatcher.cpp
Normal file
129
tests/TestWildcardMatcher.cpp
Normal file
@ -0,0 +1,129 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 or (at your option)
|
||||||
|
* version 3 of the License.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "TestWildcardMatcher.h"
|
||||||
|
|
||||||
|
#include <QtTest/QTest>
|
||||||
|
|
||||||
|
#include "tests.h"
|
||||||
|
#include "autotype/WildcardMatcher.h"
|
||||||
|
|
||||||
|
const QString TestWildcardMatcher::DefaultText = QString("some text");
|
||||||
|
const QString TestWildcardMatcher::AlternativeText = QString("some other text");
|
||||||
|
|
||||||
|
void TestWildcardMatcher::testMatchWithoutWildcard()
|
||||||
|
{
|
||||||
|
initMatcher(DefaultText);
|
||||||
|
QString pattern = DefaultText;
|
||||||
|
verifyMatch(pattern);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestWildcardMatcher::testNoMatchWithoutWildcard()
|
||||||
|
{
|
||||||
|
initMatcher(DefaultText);
|
||||||
|
QString pattern = QString("no match text");
|
||||||
|
verifyNoMatch(pattern);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestWildcardMatcher::testMatchWithOneWildcardInTheMiddle()
|
||||||
|
{
|
||||||
|
initMatcher(AlternativeText);
|
||||||
|
QString pattern("some*text");
|
||||||
|
verifyMatch(pattern);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestWildcardMatcher::testNoMatchWithOneWildcardInTheMiddle()
|
||||||
|
{
|
||||||
|
initMatcher(AlternativeText);
|
||||||
|
QString pattern("differen*text");
|
||||||
|
verifyNoMatch(pattern);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestWildcardMatcher::testMatchWithOneWildcardAtBegin()
|
||||||
|
{
|
||||||
|
initMatcher(DefaultText);
|
||||||
|
QString pattern("*text");
|
||||||
|
verifyMatch(pattern);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestWildcardMatcher::testNoMatchWithOneWildcardAtBegin()
|
||||||
|
{
|
||||||
|
initMatcher(DefaultText);
|
||||||
|
QString pattern("*text something else");
|
||||||
|
verifyNoMatch(pattern);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestWildcardMatcher::testMatchWithOneWildcardAtEnd()
|
||||||
|
{
|
||||||
|
initMatcher(DefaultText);
|
||||||
|
QString pattern("some*");
|
||||||
|
verifyMatch(pattern);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestWildcardMatcher::testNoMatchWithOneWildcardAtEnd()
|
||||||
|
{
|
||||||
|
initMatcher(DefaultText);
|
||||||
|
QString pattern("some other*");
|
||||||
|
verifyNoMatch(pattern);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestWildcardMatcher::testMatchWithMultipleWildcards()
|
||||||
|
{
|
||||||
|
initMatcher(AlternativeText);
|
||||||
|
QString pattern("some*th*text");
|
||||||
|
verifyMatch(pattern);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestWildcardMatcher::testNoMatchWithMultipleWildcards()
|
||||||
|
{
|
||||||
|
initMatcher(AlternativeText);
|
||||||
|
QString pattern("some*abc*text");
|
||||||
|
verifyNoMatch(pattern);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestWildcardMatcher::testMatchJustWildcard()
|
||||||
|
{
|
||||||
|
initMatcher(AlternativeText);
|
||||||
|
QString pattern("*");
|
||||||
|
verifyMatch(pattern);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestWildcardMatcher::testMatchFollowingWildcards()
|
||||||
|
{
|
||||||
|
initMatcher(DefaultText);
|
||||||
|
QString pattern("some t**t");
|
||||||
|
verifyMatch(pattern);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestWildcardMatcher::initMatcher(QString text)
|
||||||
|
{
|
||||||
|
m_matcher = new WildcardMatcher(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestWildcardMatcher::verifyMatch(QString pattern)
|
||||||
|
{
|
||||||
|
bool matchResult = m_matcher->match(pattern);
|
||||||
|
QVERIFY(matchResult);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestWildcardMatcher::verifyNoMatch(QString pattern)
|
||||||
|
{
|
||||||
|
bool matchResult = m_matcher->match(pattern);
|
||||||
|
QVERIFY(!matchResult);
|
||||||
|
}
|
||||||
|
|
||||||
|
KEEPASSX_QTEST_CORE_MAIN(TestWildcardMatcher)
|
54
tests/TestWildcardMatcher.h
Normal file
54
tests/TestWildcardMatcher.h
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 or (at your option)
|
||||||
|
* version 3 of the License.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef KEEPASSX_TESTWILDCARDMATCHER_H
|
||||||
|
#define KEEPASSX_TESTWILDCARDMATCHER_H
|
||||||
|
|
||||||
|
#include <QtCore/QObject>
|
||||||
|
|
||||||
|
class WildcardMatcher;
|
||||||
|
|
||||||
|
class TestWildcardMatcher : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
private Q_SLOTS:
|
||||||
|
void testMatchWithoutWildcard();
|
||||||
|
void testNoMatchWithoutWildcard();
|
||||||
|
void testMatchWithOneWildcardInTheMiddle();
|
||||||
|
void testNoMatchWithOneWildcardInTheMiddle();
|
||||||
|
void testNoMatchWithOneWildcardAtBegin();
|
||||||
|
void testMatchWithOneWildcardAtBegin();
|
||||||
|
void testNoMatchWithOneWildcardAtEnd();
|
||||||
|
void testMatchWithOneWildcardAtEnd();
|
||||||
|
void testMatchWithMultipleWildcards();
|
||||||
|
void testNoMatchWithMultipleWildcards();
|
||||||
|
void testMatchJustWildcard();
|
||||||
|
void testMatchFollowingWildcards();
|
||||||
|
|
||||||
|
private:
|
||||||
|
static const QString DefaultText;
|
||||||
|
static const QString AlternativeText;
|
||||||
|
|
||||||
|
void initMatcher(QString text);
|
||||||
|
void verifyMatch(QString pattern);
|
||||||
|
void verifyNoMatch(QString pattern);
|
||||||
|
|
||||||
|
WildcardMatcher* m_matcher;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // KEEPASSX_TESTWILDCARDMATCHER_H
|
Loading…
Reference in New Issue
Block a user