diff options
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/command.c | 1 | ||||
| -rw-r--r-- | src/database.c | 1 | ||||
| -rw-r--r-- | src/directory.c | 106 | ||||
| -rw-r--r-- | src/directory.h | 13 | ||||
| -rw-r--r-- | src/directory_print.c | 44 | ||||
| -rw-r--r-- | src/directory_print.h | 28 | ||||
| -rw-r--r-- | src/directory_save.c | 101 | ||||
| -rw-r--r-- | src/directory_save.h | 32 |
9 files changed, 214 insertions, 116 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e2b9f47ec..538e8549e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,6 +54,8 @@ mpd_headers = \ decoder_api.h \ decoder_internal.h \ directory.h \ + directory_save.h \ + directory_print.h \ database.h \ update.h \ dirvec.h \ @@ -134,6 +136,8 @@ mpd_SOURCES = \ decoder_control.c \ decoder_api.c \ directory.c \ + directory_save.c \ + directory_print.c \ database.c \ dirvec.c \ update.c \ diff --git a/src/command.c b/src/command.c index 3490c666f..c98bc20e7 100644 --- a/src/command.c +++ b/src/command.c @@ -21,6 +21,7 @@ #include "playlist.h" #include "ls.h" #include "directory.h" +#include "directory_print.h" #include "database.h" #include "update.h" #include "volume.h" diff --git a/src/database.c b/src/database.c index 539396c41..ff1473820 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 3bafacf7c..7a602c9a9 100644 --- a/src/directory.c +++ b/src/directory.c @@ -17,16 +17,12 @@ */ #include "directory.h" -#include "database.h" -#include "song.h" -#include "log.h" -#include "path.h" #include "utils.h" -#include "client.h" -#include "song_print.h" -#include "song_save.h" #include "dirvec.h" +#include <assert.h> +#include <string.h> + struct directory * directory_new(const char *dirname, struct directory *parent) { @@ -101,102 +97,6 @@ directory_get_directory(struct directory *directory, const char *name) return found; } -static int -dirvec_print(struct client *client, const struct dirvec *dv) -{ - size_t i; - - for (i = 0; i < dv->nr; ++i) { - client_printf(client, DIRECTORY_DIR "%s\n", - directory_get_path(dv->base[i])); - } - - return 0; -} - -int -directory_print(struct client *client, const struct directory *directory) -{ - dirvec_print(client, &directory->children); - songvec_print(client, &directory->songs); - - return 0; -} - -/* 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); - } - } -} - void directory_sort(struct directory *directory) { diff --git a/src/directory.h b/src/directory.h index d5e414efb..534e0be14 100644 --- a/src/directory.h +++ b/src/directory.h @@ -20,10 +20,8 @@ #define DIRECTORY_H #include "songvec.h" -#include "list.h" #include <stdbool.h> -#include <stdio.h> #include <sys/types.h> #define DIRECTORY_DIR "directory: " @@ -35,8 +33,6 @@ #define DIRECTORY_MPD_VERSION "mpd_version: " #define DIRECTORY_FS_CHARSET "fs_charset: " -struct client; - struct dirvec { struct directory **base; size_t nr; @@ -82,15 +78,6 @@ directory_prune_empty(struct directory *directory); struct directory * directory_get_directory(struct directory *directory, const char *name); -int -directory_print(struct client *client, const struct directory *directory); - -int -directory_save(FILE *fp, struct directory *directory); - -void -directory_load(FILE *fp, struct directory *directory); - void directory_sort(struct directory *directory); diff --git a/src/directory_print.c b/src/directory_print.c new file mode 100644 index 000000000..6c5178336 --- /dev/null +++ b/src/directory_print.c @@ -0,0 +1,44 @@ +/* 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_print.h" +#include "directory.h" +#include "client.h" +#include "song_print.h" +#include "dirvec.h" + +static int +dirvec_print(struct client *client, const struct dirvec *dv) +{ + size_t i; + + for (i = 0; i < dv->nr; ++i) + client_printf(client, DIRECTORY_DIR "%s\n", + directory_get_path(dv->base[i])); + + return 0; +} + +int +directory_print(struct client *client, const struct directory *directory) +{ + dirvec_print(client, &directory->children); + songvec_print(client, &directory->songs); + + return 0; +} diff --git a/src/directory_print.h b/src/directory_print.h new file mode 100644 index 000000000..b5dcdd703 --- /dev/null +++ b/src/directory_print.h @@ -0,0 +1,28 @@ +/* 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 client; +struct directory; + +int +directory_print(struct client *client, const struct directory *directory); + +#endif 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); + } + } +} diff --git a/src/directory_save.h b/src/directory_save.h new file mode 100644 index 000000000..c3c56d95d --- /dev/null +++ b/src/directory_save.h @@ -0,0 +1,32 @@ +/* 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 <stdio.h> + +struct directory; + +int +directory_save(FILE *fp, struct directory *directory); + +void +directory_load(FILE *fp, struct directory *directory); + +#endif |