db/update/Container: move MakeDirectoryIfModified() to VirtualDirectory.cxx

3 files changed, 48 insertions, 25 deletions

diff --git a/src/db/meson.build b/src/db/meson.build
index 0741a75b4..73f8bdc57 100644
--- a/src/db/meson.build
+++ b/src/db/meson.build
@@ -30,6 +30,7 @@ db_glue_sources = [
   'update/Playlist.cxx',
   'update/Remove.cxx',
   'update/ExcludeList.cxx',
+  'update/VirtualDirectory.cxx',
   'DatabaseGlue.cxx',
   'Configured.cxx',
   'DatabaseSong.cxx',
diff --git a/src/db/update/Container.cxx b/src/db/update/Container.cxx
index bfb2262a9..d95e0727f 100644
--- a/src/db/update/Container.cxx
+++ b/src/db/update/Container.cxx
@@ -30,31 +30,6 @@
 #include "storage/FileInfo.hxx"
 #include "Log.hxx"
 
-Directory *
-UpdateWalk::MakeDirectoryIfModified(Directory &parent, const char *name,
-				    const StorageFileInfo &info) noexcept
-{
-	Directory *directory = parent.FindChild(name);
-
-	// directory exists already
-	if (directory != nullptr) {
-		if (directory->IsMount())
-			return nullptr;
-
-		if (directory->mtime == info.mtime && !walk_discard) {
-			/* not modified */
-			return nullptr;
-		}
-
-		editor.DeleteDirectory(directory);
-		modified = true;
-	}
-
-	directory = parent.MakeChild(name);
-	directory->mtime = info.mtime;
-	return directory;
-}
-
 bool
 UpdateWalk::UpdateContainerFile(Directory &directory,
 				const char *name, const char *suffix,
diff --git a/src/db/update/VirtualDirectory.cxx b/src/db/update/VirtualDirectory.cxx
new file mode 100644
index 000000000..8b0115e8d
--- /dev/null
+++ b/src/db/update/VirtualDirectory.cxx
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2003-2019 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.
+ */
+
+#include "Walk.hxx"
+#include "db/plugins/simple/Directory.hxx"
+#include "storage/FileInfo.hxx"
+
+Directory *
+UpdateWalk::MakeDirectoryIfModified(Directory &parent, const char *name,
+				    const StorageFileInfo &info) noexcept
+{
+	Directory *directory = parent.FindChild(name);
+
+	// directory exists already
+	if (directory != nullptr) {
+		if (directory->IsMount())
+			return nullptr;
+
+		if (directory->mtime == info.mtime && !walk_discard) {
+			/* not modified */
+			return nullptr;
+		}
+
+		editor.DeleteDirectory(directory);
+		modified = true;
+	}
+
+	directory = parent.MakeChild(name);
+	directory->mtime = info.mtime;
+	return directory;
+}