From a24d3738e35d509aa180fffa127abac8057101cf Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 9 Oct 2008 15:23:37 +0200
Subject: 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.
---
 src/directory.c | 116 --------------------------------------------------------
 1 file changed, 116 deletions(-)

(limited to 'src/directory.c')

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;
-- 
cgit v1.2.3