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.

1 files changed, 101 insertions, 0 deletions

diff --git a/src/directory_save.c b/src/directory_save.c
new file mode 100644
index 000000000..9d1846c2f
--- /dev/null
+++ b/src/directory_save.c
@@ -0,0 +1,101 @@
+/* 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 "song_save.h"
+#include "dirvec.h"
+
+/* TODO error checking */
+int
+directory_save(FILE *fp, struct directory *directory)
+{
+	struct dirvec *children = &directory->children;
+	size_t i;
+	int retv;
+
+	if (!isRootDirectory(directory->path)) {
+		retv = fprintf(fp, "%s%s\n", DIRECTORY_BEGIN,
+			       directory_get_path(directory));
+		if (retv < 0)
+			return -1;
+	}
+
+	for (i = 0; i < children->nr; ++i) {
+		struct directory *cur = children->base[i];
+		const char *base = mpd_basename(cur->path);
+
+		retv = fprintf(fp, DIRECTORY_DIR "%s\n", base);
+		if (retv < 0)
+			return -1;
+		if (directory_save(fp, cur) < 0)
+			return -1;
+	}
+
+	songvec_save(fp, &directory->songs);
+
+	if (!isRootDirectory(directory->path) &&
+	    fprintf(fp, 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->songs, directory);
+		} else {
+			FATAL("Unknown line in db: %s\n", buffer);
+		}
+	}
+}