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

4 files changed, 70 insertions, 31 deletions

diff --git a/Makefile.am b/Makefile.am
index 213ea7fcc..349fb4c37 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -563,6 +563,7 @@ libfs_a_SOURCES = \
 	src/fs/NarrowPath.hxx \
 	src/fs/FileSystem.cxx src/fs/FileSystem.hxx \
 	src/fs/FileInfo.hxx \
+	src/fs/Glob.hxx \
 	src/fs/StandardDirectory.cxx src/fs/StandardDirectory.hxx \
 	src/fs/CheckFile.cxx src/fs/CheckFile.hxx \
 	src/fs/DirectoryReader.hxx
diff --git a/src/db/update/ExcludeList.cxx b/src/db/update/ExcludeList.cxx
index 631d45206..d20abfd3f 100644
--- a/src/db/update/ExcludeList.cxx
+++ b/src/db/update/ExcludeList.cxx
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <errno.h>
 
-#ifdef HAVE_GLIB
+#ifdef HAVE_CLASS_GLOB
 
 gcc_pure
 static bool
@@ -54,7 +54,7 @@ IsFileNotFound(const Error &error)
 bool
 ExcludeList::LoadFile(Path path_fs)
 {
-#ifdef HAVE_GLIB
+#ifdef HAVE_CLASS_GLOB
 	Error error;
 	TextFile file(path_fs, error);
 	if (file.HasFailed()) {
@@ -88,7 +88,7 @@ ExcludeList::Check(Path name_fs) const
 
 	/* XXX include full path name in check */
 
-#ifdef HAVE_GLIB
+#ifdef HAVE_CLASS_GLOB
 	for (const auto &i : patterns)
 		if (i.Check(NarrowPath(name_fs).c_str()))
 			return true;
diff --git a/src/db/update/ExcludeList.hxx b/src/db/update/ExcludeList.hxx
index ae196a7b2..eae0cac40 100644
--- a/src/db/update/ExcludeList.hxx
+++ b/src/db/update/ExcludeList.hxx
@@ -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
diff --git a/src/fs/Glob.hxx b/src/fs/Glob.hxx
new file mode 100644
index 000000000..67ba22f91
--- /dev/null
+++ b/src/fs/Glob.hxx
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * 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 of the License, or
+ * (at your option) any later version.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_FS_GLOB_XX
+#define MPD_FS_GLOB_XX
+
+#include "check.h"
+
+#ifdef HAVE_GLIB
+#define HAVE_CLASS_GLOB
+#include <glib.h>
+#endif
+
+#ifdef HAVE_CLASS_GLOB
+#include "Compiler.h"
+
+/**
+ * A pattern that matches file names.  It may contain shell wildcards
+ * (asterisk and question mark).
+ */
+class Glob {
+	GPatternSpec *pattern;
+
+public:
+	Glob(const char *_pattern)
+		:pattern(g_pattern_spec_new(_pattern)) {}
+
+	Glob(Glob &&other)
+		:pattern(other.pattern) {
+		other.pattern = nullptr;
+	}
+
+	~Glob() {
+		g_pattern_spec_free(pattern);
+	}
+
+	gcc_pure
+	bool Check(const char *name_fs) const {
+		return g_pattern_match_string(pattern, name_fs);
+	}
+};
+
+#endif
+
+#endif