diff options
author | Eric Wong <normalperson@yhbt.net> | 2008-10-11 23:39:50 -0700 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2008-10-11 23:39:50 -0700 |
commit | 0df62a2c3cb7af88347d40a17cc336b5d1740f62 (patch) | |
tree | 25040833144c3e24f6b4702d9b745cd068b5371a /src/directory_save.c | |
parent | 3456e2de5bf90207d8149a842bb12c3f9bdd218f (diff) | |
parent | 6e2b0ca9edaed200f250ef487701ad161aa4a168 (diff) | |
download | mpd-0df62a2c3cb7af88347d40a17cc336b5d1740f62.tar.gz mpd-0df62a2c3cb7af88347d40a17cc336b5d1740f62.tar.xz mpd-0df62a2c3cb7af88347d40a17cc336b5d1740f62.zip |
Merge branch 'mk/directory'
* mk/directory: (59 commits)
directory: don't use identical struct and variable names
update: replaced update_return with global "modified" flag
update: make the variable "progress" static
update: don't print debug message when song was not modified
update: fix memory leak in directory_update_init()
update: make the job id unsigned
update: job ID must be positive
update: check progress!=IDLE in reap_update_task()
update: fixed stack corruption due to pthread_join() call
updated: always call removeDeletedFromDirectory()
update: eliminated addSubDirectoryToDirectory()
update: make the "song" variable more local
update: do the recursive directory check only once
update: copy stat to new directory
update: avoid duplicate stat() calls
update: rewrote updatePath() using updateInDirectory()
update: don't export updateDirectory()
update: pass const pointer to addSubDirectoryToDirectory()
update: never pass root path to updatePath()
update: merged addDirectoryPathToDB() into addParentPathToDB()
...
Conflicts:
src/song.c
Diffstat (limited to '')
-rw-r--r-- | src/directory_save.c | 120 |
1 files changed, 120 insertions, 0 deletions
diff --git a/src/directory_save.c b/src/directory_save.c new file mode 100644 index 000000000..c39ece58a --- /dev/null +++ b/src/directory_save.c @@ -0,0 +1,120 @@ +/* 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 "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 *dir) +{ + struct dirvec *children = &dir->children; + size_t i; + + if (!isRootDirectory(dir->path) && + fdprintf(fd, DIRECTORY_BEGIN "%s\n", + directory_get_path(dir)) < 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(&dir->songs, + directory_song_write, (void *)(size_t)fd) < 0) + return -1; + + if (fdprintf(fd, SONG_END "\n") < 0) + return -1; + + if (!isRootDirectory(dir->path) && + fdprintf(fd, DIRECTORY_END "%s\n", + directory_get_path(dir)) < 0) + return -1; + return 0; +} + +void directory_load(FILE * fp, struct directory *dir) +{ + 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 (prefixcmp(name, dir->path) != 0) + FATAL("Wrong path in database: '%s' in '%s'\n", + name, dir->path); + + if ((subdir = directory_get_child(dir, name))) { + assert(subdir->parent == dir); + } else { + subdir = directory_new(name, dir); + dirvec_add(&dir->children, subdir); + } + directory_load(fp, subdir); + } else if (!prefixcmp(buffer, SONG_BEGIN)) { + readSongInfoIntoList(fp, dir); + } else { + FATAL("Unknown line in db: %s\n", buffer); + } + } +} |