ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added support for '?' to FS wildcard handling.

This commit is contained in:
gibbed 2017-01-19 18:13:07 -06:00
parent 17529b063f
commit 69cf40161e
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/xenia/base/filesystem_wildcard.cc
View File

@ -8,19 +8,22 @@
*/ */
#include "xenia/base/filesystem_wildcard.h" #include "xenia/base/filesystem_wildcard.h"
#include "xenia/base/assert.h"
#include <algorithm> #include <algorithm>
namespace xe { namespace xe {
namespace filesystem { namespace filesystem {
WildcardFlags WildcardFlags::FIRST(true, false); WildcardFlags WildcardFlags::FIRST(true, false, false);
WildcardFlags WildcardFlags::LAST(false, true); WildcardFlags WildcardFlags::LAST(false, true, false);
WildcardFlags WildcardFlags::ANY(false, false, true);
WildcardFlags::WildcardFlags() : FromStart(false), ToEnd(false) {} WildcardFlags::WildcardFlags()
: FromStart(false), ToEnd(false), ExactLength(false) {}
WildcardFlags::WildcardFlags(bool start, bool end) WildcardFlags::WildcardFlags(bool start, bool end, bool exact_length)
: FromStart(start), ToEnd(end) {} : FromStart(start), ToEnd(end), ExactLength(exact_length) {}
WildcardRule::WildcardRule(const std::string& str_match, WildcardRule::WildcardRule(const std::string& str_match,
const WildcardFlags& flags) const WildcardFlags& flags)
@ -38,6 +41,11 @@ bool WildcardRule::Check(const std::string& str_lower,
return false; return false;
} }
if (rules.ExactLength) {
*offset += match.size();
return true;
}
std::string::size_type result(str_lower.find(match, *offset)); std::string::size_type result(str_lower.find(match, *offset));
if (result != std::string::npos) { if (result != std::string::npos) {
@ -62,12 +70,22 @@ void WildcardEngine::PreparePattern(const std::string& pattern) {
WildcardFlags flags(WildcardFlags::FIRST); WildcardFlags flags(WildcardFlags::FIRST);
size_t n = 0; size_t n = 0;
size_t last = 0; size_t last = 0;
while ((n = pattern.find_first_of('*', last)) != pattern.npos) { while ((n = pattern.find_first_of("*?", last)) != pattern.npos) {
if (last != n) { if (last != n) {
std::string str_str(pattern.substr(last, n - last)); std::string str_str(pattern.substr(last, n - last));
rules.push_back(WildcardRule(str_str, flags)); rules.push_back(WildcardRule(str_str, flags));
} }
last = n + 1; if (pattern[n] == '?') {
auto end = pattern.find_first_not_of('?', n + 1);
auto count = end == pattern.npos ? (pattern.size() - n) : (end - n);
rules.push_back(
WildcardRule(pattern.substr(n, count), WildcardFlags::ANY));
last = n + count;
} else if (pattern[n] == '*') {
last = n + 1;
} else {
assert_always();
}
flags = WildcardFlags(); flags = WildcardFlags();
} }
if (last != pattern.size()) { if (last != pattern.size()) {

5
src/xenia/base/filesystem_wildcard.h
View File

@ -22,13 +22,14 @@ namespace filesystem {
class WildcardFlags { class WildcardFlags {
public: public:
bool FromStart : 1, ToEnd : 1; bool FromStart : 1, ToEnd : 1, ExactLength : 1;
WildcardFlags(); WildcardFlags();
WildcardFlags(bool start, bool end); WildcardFlags(bool start, bool end, bool exact_length);
static WildcardFlags FIRST; static WildcardFlags FIRST;
static WildcardFlags LAST; static WildcardFlags LAST;
static WildcardFlags ANY;
}; };
class WildcardRule { class WildcardRule {