Skip to content

M
mpd
Commit a0c044df authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

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.
parent cb12eb8e
Hide whitespace changes
Inline Side-by-side
Showing with 214 additions and 116 deletions
src/Makefile.am
View file @ a0c044df
......@@ -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 \
......
src/command.c
View file @ a0c044df
......@@ -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"
......
src/database.c
View file @ a0c044df
......@@ -19,6 +19,7 @@
#include "database.h"
#include "directory.h"
#include "directory_save.h"
#include "song.h"
#include "conf.h"
#include "log.h"
......
src/directory.c
View file @ a0c044df
......@@ -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)
{
......
src/directory.h
View file @ a0c044df
......@@ -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);
......
src/directory_print.c 0 → 100644
View file @ a0c044df
/* 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;
}
src/directory_print.h 0 → 100644
View file @ a0c044df
/* 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
src/directory_save.c 0 → 100644
View file @ a0c044df
/* 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);
}
}
}
src/directory_save.h 0 → 100644
View file @ a0c044df
/* 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment