From 6b6c7b0920358eb9cceecf52dac919a95f59da7f Mon Sep 17 00:00:00 2001
From: Anthony DeRossi <ajderossi@gmail.com>
Date: Tue, 29 Sep 2015 10:39:07 -0700
Subject: update: apply .mpdignore matches to subdirectories

Wildcard matches are directly applied to all filenames in
subdirectories without any attempt at matching relative paths.

This change is based on the following feature request:

  http://bugs.musicpd.org/view.php?id=3729
---
 src/db/update/ExcludeList.cxx | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/db/update/ExcludeList.cxx')

diff --git a/src/db/update/ExcludeList.cxx b/src/db/update/ExcludeList.cxx
index 3b54d635e..b09f349ac 100644
--- a/src/db/update/ExcludeList.cxx
+++ b/src/db/update/ExcludeList.cxx
@@ -89,6 +89,12 @@ ExcludeList::Check(Path name_fs) const
 	/* XXX include full path name in check */
 
 #ifdef HAVE_CLASS_GLOB
+	if (parent != nullptr) {
+		if (parent->Check(name_fs)) {
+			return true;
+		}
+	}
+
 	for (const auto &i : patterns)
 		if (i.Check(NarrowPath(name_fs).c_str()))
 			return true;
-- 
cgit v1.2.3