oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/update/ExcludeList: move class Pattern to fs/Glob.hxx

Browse Source
This commit is contained in:
Max Kellermann
2015-06-22 21:01:46 +02:00
parent e0405f1781
commit 50eac9b49e
4 changed files with 70 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/db/update/ExcludeList.hxx
View File

@@ -27,40 +27,17 @@
#include "check.h"
#include "Compiler.h"
#include "fs/Glob.hxx"
#ifdef HAVE_CLASS_GLOB
#include <forward_list>
#ifdef HAVE_GLIB
#include <glib.h>
#endif
class Path;
class ExcludeList {
#ifdef HAVE_GLIB
class Pattern {
GPatternSpec *pattern;
public:
Pattern(const char *_pattern)
:pattern(g_pattern_spec_new(_pattern)) {}
Pattern(Pattern &&other)
:pattern(other.pattern) {
other.pattern = nullptr;
}
~Pattern() {
g_pattern_spec_free(pattern);
}
gcc_pure
bool Check(const char *name_fs) const {
return g_pattern_match_string(pattern, name_fs);
}
};
std::forward_list<Pattern> patterns;
#ifdef HAVE_CLASS_GLOB
std::forward_list<Glob> patterns;
#else
// TODO: implement
#endif
@@ -68,7 +45,7 @@ class ExcludeList {
public:
gcc_pure
bool IsEmpty() const {
#ifdef HAVE_GLIB
#ifdef HAVE_CLASS_GLOB
return patterns.empty();
#else
// TODO: implement