diretory: moved code to directory_save.c, directory_print.c

Remove clutter from directory.c.  Everything which saves or loads
to/from the hard disk goes to directory_save.c, and code which sends
directory information to the client is moved into directory_print.c.

8 files changed, 226 insertions, 116 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index e4cc17c3f..6a7497286 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,6 +43,8 @@ mpd_headers = \
 	dbUtils.h \
 	decode.h \
 	directory.h \
+	directory_print.h \
+	directory_save.h \
 	update.h \
 	dirvec.h \
 	gcc.h \
@@ -116,6 +118,8 @@ mpd_SOURCES = \
 	dbUtils.c \
 	decode.c \
 	directory.c \
+	directory_print.c \
+	directory_save.c \
 	dirvec.c \
 	update.c \
 	inputPlugin.c \
diff --git a/src/command.c b/src/command.c
index 0f9852592..aafb88418 100644
--- a/src/command.c
+++ b/src/command.c
@@ -21,6 +21,7 @@
 #include "ls.h"
 #include "database.h"
 #include "directory.h"
+#include "directory_print.h"
 #include "update.h"
 #include "volume.h"
 #include "stats.h"
diff --git a/src/database.c b/src/database.c
index 6ed7a445d..11de15bcc 100644
--- a/src/database.c
+++ b/src/database.c
@@ -19,6 +19,7 @@
 
 #include "database.h"
 #include "directory.h"
+#include "directory_save.h"
 #include "song.h"
 #include "conf.h"
 #include "log.h"
diff --git a/src/directory.c b/src/directory.c
index 295fdd09a..305cd5fe3 100644
--- a/src/directory.c
+++ b/src/directory.c
@@ -17,10 +17,7 @@
  */
 
 #include "directory.h"
-#include "database.h"
 
-#include "log.h"
-#include "path.h"
 #include "utils.h"
 #include "ack.h"
 #include "myfprintf.h"
@@ -97,119 +94,6 @@ directory_get_subdir(struct directory * directory, const char *name)
 	return found;
 }
 
-static int dirvec_print(int fd, const struct dirvec *dv)
-{
-	size_t i;
-
-	for (i = 0; i < dv->nr; ++i) {
-		if (fdprintf(fd, DIRECTORY_DIR "%s\n",
-		             directory_get_path(dv->base[i])) < 0)
-			return -1;
-	}
-
-	return 0;
-}
-
-int directory_print(int fd, const struct directory *directory)
-{
-	if (dirvec_print(fd, &directory->children) < 0)
-		return -1;
-	if (songvec_for_each(&directory->songs, song_print_info_x,
-	                     (void *)(size_t)fd) < 0)
-		return -1;
-	return 0;
-}
-
-static int directory_song_write(struct mpd_song *song, void *data)
-{
-	int fd = (int)(size_t)data;
-
-	if (fdprintf(fd, SONG_KEY "%s\n", song->url) < 0)
-		return -1;
-	if (song_print_info(song, fd) < 0)
-		return -1;
-	if (fdprintf(fd, SONG_MTIME "%li\n", (long)song->mtime) < 0)
-		return -1;
-
-	return 0;
-}
-
-/* TODO error checking */
-int directory_save(int fd, struct directory * directory)
-{
-	struct dirvec *children = &directory->children;
-	size_t i;
-
-	if (!isRootDirectory(directory->path) &&
-	    fdprintf(fd, DIRECTORY_BEGIN "%s\n",
-	             directory_get_path(directory)) < 0)
-		return -1;
-
-	for (i = 0; i < children->nr; ++i) {
-		struct directory *cur = children->base[i];
-		const char *base = mpd_basename(cur->path);
-
-		if (fdprintf(fd, DIRECTORY_DIR "%s\n", base) < 0)
-			return -1;
-		if (directory_save(fd, cur) < 0)
-			return -1;
-	}
-
-	if (fdprintf(fd, SONG_BEGIN "\n") < 0)
-		return -1;
-
-	if (songvec_for_each(&directory->songs,
-	                     directory_song_write, (void *)(size_t)fd) < 0)
-		return -1;
-
-	if (fdprintf(fd, SONG_END "\n") < 0)
-		return -1;
-
-	if (!isRootDirectory(directory->path) &&
-	    fdprintf(fd, DIRECTORY_END "%s\n",
-	             directory_get_path(directory)) < 0)
-		return -1;
-	return 0;
-}
-
-void directory_load(FILE * fp, struct directory * directory)
-{
-	char buffer[MPD_PATH_MAX * 2];
-	int bufferSize = MPD_PATH_MAX * 2;
-	char key[MPD_PATH_MAX * 2];
-	char *name;
-
-	while (myFgets(buffer, bufferSize, fp)
-	       && prefixcmp(buffer, DIRECTORY_END)) {
-		if (!prefixcmp(buffer, DIRECTORY_DIR)) {
-			struct directory *subdir;
-
-			strcpy(key, &(buffer[strlen(DIRECTORY_DIR)]));
-			if (!myFgets(buffer, bufferSize, fp))
-				FATAL("Error reading db, fgets\n");
-			/* for compatibility with db's prior to 0.11 */
-			if (!prefixcmp(buffer, DIRECTORY_MTIME)) {
-				if (!myFgets(buffer, bufferSize, fp))
-					FATAL("Error reading db, fgets\n");
-			}
-			if (prefixcmp(buffer, DIRECTORY_BEGIN))
-				FATAL("Error reading db at line: %s\n", buffer);
-			name = &(buffer[strlen(DIRECTORY_BEGIN)]);
-			if ((subdir = db_get_directory(name))) {
-				assert(subdir->parent == directory);
-			} else {
-				subdir = directory_new(name, directory);
-				dirvec_add(&directory->children, subdir);
-			}
-			directory_load(fp, subdir);
-		} else if (!prefixcmp(buffer, SONG_BEGIN)) {
-			readSongInfoIntoList(fp, directory);
-		} else {
-			FATAL("Unknown line in db: %s\n", buffer);
-		}
-	}
-}
-
 void directory_sort(struct directory * directory)
 {
 	int i;
diff --git a/src/directory_print.c b/src/directory_print.c
new file mode 100644
index 000000000..ebf9a472d
--- /dev/null
+++ b/src/directory_print.c
@@ -0,0 +1,47 @@
+/* the Music Player Daemon (MPD)
+ * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
+ * Copyright (C) 2008 Max Kellermann <max@duempel.org>
+ * This project's homepage is: 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "directory_print.h"
+#include "directory.h"
+#include "dirvec.h"
+#include "songvec.h"
+#include "myfprintf.h"
+
+static int dirvec_print(int fd, const struct dirvec *dv)
+{
+	size_t i;
+
+	for (i = 0; i < dv->nr; ++i) {
+		if (fdprintf(fd, DIRECTORY_DIR "%s\n",
+		             directory_get_path(dv->base[i])) < 0)
+			return -1;
+	}
+
+	return 0;
+}
+
+int directory_print(int fd, const struct directory *directory)
+{
+	if (dirvec_print(fd, &directory->children) < 0)
+		return -1;
+	if (songvec_for_each(&directory->songs, song_print_info_x,
+	                     (void *)(size_t)fd) < 0)
+		return -1;
+	return 0;
+}
diff --git a/src/directory_print.h b/src/directory_print.h
new file mode 100644
index 000000000..54089e58d
--- /dev/null
+++ b/src/directory_print.h
@@ -0,0 +1,26 @@
+/* the Music Player Daemon (MPD)
+ * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
+ * This project's homepage is: 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef DIRECTORY_PRINT_H
+#define DIRECTORY_PRINT_H
+
+struct directory;
+
+int directory_print(int fd, const struct directory *directory);
+
+#endif
diff --git a/src/directory_save.c b/src/directory_save.c
new file mode 100644
index 000000000..27f7b14ce
--- /dev/null
+++ b/src/directory_save.c
@@ -0,0 +1,117 @@
+/* the Music Player Daemon (MPD)
+ * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
+ * This project's homepage is: 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "directory_save.h"
+#include "directory.h"
+#include "database.h"
+#include "song.h"
+#include "log.h"
+#include "path.h"
+#include "utils.h"
+#include "dirvec.h"
+#include "myfprintf.h"
+
+static int directory_song_write(struct mpd_song *song, void *data)
+{
+	int fd = (int)(size_t)data;
+
+	if (fdprintf(fd, SONG_KEY "%s\n", song->url) < 0)
+		return -1;
+	if (song_print_info(song, fd) < 0)
+		return -1;
+	if (fdprintf(fd, SONG_MTIME "%li\n", (long)song->mtime) < 0)
+		return -1;
+
+	return 0;
+}
+
+/* TODO error checking */
+int directory_save(int fd, struct directory * directory)
+{
+	struct dirvec *children = &directory->children;
+	size_t i;
+
+	if (!isRootDirectory(directory->path) &&
+	    fdprintf(fd, DIRECTORY_BEGIN "%s\n",
+	             directory_get_path(directory)) < 0)
+		return -1;
+
+	for (i = 0; i < children->nr; ++i) {
+		struct directory *cur = children->base[i];
+		const char *base = mpd_basename(cur->path);
+
+		if (fdprintf(fd, DIRECTORY_DIR "%s\n", base) < 0)
+			return -1;
+		if (directory_save(fd, cur) < 0)
+			return -1;
+	}
+
+	if (fdprintf(fd, SONG_BEGIN "\n") < 0)
+		return -1;
+
+	if (songvec_for_each(&directory->songs,
+	                     directory_song_write, (void *)(size_t)fd) < 0)
+		return -1;
+
+	if (fdprintf(fd, SONG_END "\n") < 0)
+		return -1;
+
+	if (!isRootDirectory(directory->path) &&
+	    fdprintf(fd, DIRECTORY_END "%s\n",
+	             directory_get_path(directory)) < 0)
+		return -1;
+	return 0;
+}
+
+void directory_load(FILE * fp, struct directory * directory)
+{
+	char buffer[MPD_PATH_MAX * 2];
+	int bufferSize = MPD_PATH_MAX * 2;
+	char key[MPD_PATH_MAX * 2];
+	char *name;
+
+	while (myFgets(buffer, bufferSize, fp)
+	       && prefixcmp(buffer, DIRECTORY_END)) {
+		if (!prefixcmp(buffer, DIRECTORY_DIR)) {
+			struct directory *subdir;
+
+			strcpy(key, &(buffer[strlen(DIRECTORY_DIR)]));
+			if (!myFgets(buffer, bufferSize, fp))
+				FATAL("Error reading db, fgets\n");
+			/* for compatibility with db's prior to 0.11 */
+			if (!prefixcmp(buffer, DIRECTORY_MTIME)) {
+				if (!myFgets(buffer, bufferSize, fp))
+					FATAL("Error reading db, fgets\n");
+			}
+			if (prefixcmp(buffer, DIRECTORY_BEGIN))
+				FATAL("Error reading db at line: %s\n", buffer);
+			name = &(buffer[strlen(DIRECTORY_BEGIN)]);
+			if ((subdir = db_get_directory(name))) {
+				assert(subdir->parent == directory);
+			} else {
+				subdir = directory_new(name, directory);
+				dirvec_add(&directory->children, subdir);
+			}
+			directory_load(fp, subdir);
+		} else if (!prefixcmp(buffer, SONG_BEGIN)) {
+			readSongInfoIntoList(fp, directory);
+		} else {
+			FATAL("Unknown line in db: %s\n", buffer);
+		}
+	}
+}
diff --git a/src/directory_save.h b/src/directory_save.h
new file mode 100644
index 000000000..211c73cca
--- /dev/null
+++ b/src/directory_save.h
@@ -0,0 +1,30 @@
+/* the Music Player Daemon (MPD)
+ * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
+ * This project's homepage is: 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef DIRECTORY_SAVE_H
+#define DIRECTORY_SAVE_H
+
+#include "os_compat.h"
+
+struct directory;
+
+int directory_save(int fd, struct directory *directory);
+
+void directory_load(FILE *, struct directory *directory);
+
+#endif /* DIRECTORY_SAVE_H */