X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=95f6b311bb8597527f894d525f8cdd6c8eed5ca8;hp=17557e5eaa789831f136e758a3a31fe5903e7271;hb=53d503ce;hpb=cc18590c9eeba5caef75e7d7ac495ac3dbf58c69 diff --git a/afs.c b/afs.c index 17557e5e..95f6b311 100644 --- a/afs.c +++ b/afs.c @@ -10,6 +10,7 @@ #include #include "server.cmdline.h" #include "para.h" +#include "string.h" #include "afh.h" #include "server.h" #include "error.h" @@ -19,7 +20,6 @@ #include "net.h" #include "afs.h" #include "ipc.h" -#include "string.h" #include "list.h" #include "sched.h" #include "signal.h" @@ -53,7 +53,15 @@ enum afs_table_num { NUM_AFS_TABLES }; -static struct table_info afs_tables[NUM_AFS_TABLES]; +static struct afs_table afs_tables[NUM_AFS_TABLES] = { + [TBLNUM_AUDIO_FILES] = {.init = aft_init}, + [TBLNUM_ATTRIBUTES] = {.init = attribute_init}, + [TBLNUM_SCORES] = {.init = score_init}, + [TBLNUM_MOODS] = {.init = moods_init}, + [TBLNUM_LYRICS] = {.init = lyrics_init}, + [TBLNUM_IMAGES] = {.init = images_init}, + [TBLNUM_PLAYLIST] = {.init = playlists_init}, +}; struct command_task { /** The file descriptor for the local socket. */ @@ -460,26 +468,29 @@ int close_audio_file(struct audio_file_data *afd) static enum play_mode init_admissible_files(void) { - int ret; - - if (conf.mood_given) { - ret = change_current_mood(conf.mood_arg); - if (ret >= 0) { - if (conf.playlist_given) - PARA_WARNING_LOG("ignoring playlist %s\n", - conf.playlist_arg); - return PLAY_MODE_MOOD; + int ret = 0; + char *arg = conf.afs_initial_mode_arg; + + if (conf.afs_initial_mode_given) { + if (!strncmp(arg, "p:", 2)) { + ret = playlist_open(arg + 2); + if (ret >= 0) + return PLAY_MODE_PLAYLIST; + goto dummy; } + if (!strncmp(arg, "m:", 2)) { + ret = change_current_mood(arg + 2); + if (ret >= 0) + return PLAY_MODE_MOOD; + goto dummy; + } + PARA_ERROR_LOG("bad afs initial mode arg: %s\n", arg); } - if (conf.playlist_given) { - ret = playlist_open(conf.playlist_arg); - if (ret >= 0) - return PLAY_MODE_PLAYLIST; - } - ret = change_current_mood(NULL); /* open first available mood */ - if (ret >= 0) - return PLAY_MODE_MOOD; - change_current_mood(""); /* open dummy mood, always successful */ +dummy: + if (ret < 0) + PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_NOTICE_LOG("defaulting to dummy mood\n"); + change_current_mood(""); /* always successful */ return PLAY_MODE_MOOD; } @@ -505,26 +516,18 @@ static int setup_command_socket_or_die(void) return ret; } -static void close_afs_tables(enum osl_close_flags flags) +static void close_afs_tables(void) { + int i; PARA_NOTICE_LOG("closing afs_tables\n"); - score_shutdown(flags); - attribute_shutdown(flags); - close_current_mood(); - playlist_close(); - moods_shutdown(flags); - playlists_shutdown(flags); - lyrics_shutdown(flags); - images_shutdown(flags); - aft_shutdown(flags); + for (i = 0; i < NUM_AFS_TABLES; i++) + afs_tables[i].close(); } static char *database_dir; -static int make_database_dir(void) +static void get_database_dir(void) { - int ret; - if (!database_dir) { if (conf.afs_database_dir_given) database_dir = para_strdup(conf.afs_database_dir_arg); @@ -536,56 +539,36 @@ static int make_database_dir(void) } } PARA_INFO_LOG("afs_database dir %s\n", database_dir); +} + +static int make_database_dir(void) +{ + int ret; + + get_database_dir(); ret = para_mkdir(database_dir, 0777); if (ret >= 0 || is_errno(-ret, EEXIST)) return 1; - free(database_dir); - database_dir = NULL; return ret; } - static int open_afs_tables(void) { - int ret = make_database_dir(); + int i, ret; - if (ret < 0) - return ret; - ret = attribute_init(&afs_tables[TBLNUM_ATTRIBUTES], database_dir); - if (ret < 0) + get_database_dir(); + for (i = 0; i < NUM_AFS_TABLES; i++) { + ret = afs_tables[i].open(database_dir); + if (ret >= 0) + continue; + PARA_ERROR_LOG("%s init: %s\n", afs_tables[i].name, + PARA_STRERROR(-ret)); + } + if (ret >= 0) return ret; - ret = moods_init(&afs_tables[TBLNUM_MOODS], database_dir); - if (ret < 0) - goto moods_init_error; - ret = playlists_init(&afs_tables[TBLNUM_PLAYLIST], database_dir); - if (ret < 0) - goto playlists_init_error; - ret = lyrics_init(&afs_tables[TBLNUM_LYRICS], database_dir); - if (ret < 0) - goto lyrics_init_error; - ret = images_init(&afs_tables[TBLNUM_IMAGES], database_dir); - if (ret < 0) - goto images_init_error; - ret = score_init(&afs_tables[TBLNUM_SCORES], database_dir); - if (ret < 0) - goto score_init_error; - ret = aft_init(&afs_tables[TBLNUM_AUDIO_FILES], database_dir); - if (ret < 0) - goto aft_init_error; - return 1; - -aft_init_error: - score_shutdown(OSL_MARK_CLEAN); -score_init_error: - images_shutdown(OSL_MARK_CLEAN); -images_init_error: - lyrics_shutdown(OSL_MARK_CLEAN); -lyrics_init_error: - playlists_shutdown(OSL_MARK_CLEAN); -playlists_init_error: - moods_shutdown(OSL_MARK_CLEAN); -moods_init_error: - attribute_shutdown(OSL_MARK_CLEAN); + do + afs_tables[i].close(); + while (i--); return ret; } @@ -617,7 +600,7 @@ static void signal_post_select(struct sched *s, struct task *t) if (st->signum == SIGUSR1) return; /* ignore SIGUSR1 */ if (st->signum == SIGHUP) { - close_afs_tables(OSL_MARK_CLEAN); + close_afs_tables(); t->ret = open_afs_tables(); return; } @@ -818,9 +801,11 @@ __noreturn void afs_init(uint32_t cookie, int socket_fd) { enum play_mode current_play_mode; struct sched s; - int ret; + int i, ret; INIT_LIST_HEAD(&afs_client_list); + for (i = 0; i < NUM_AFS_TABLES; i++) + afs_tables[i].init(&afs_tables[i]); ret = open_afs_tables(); if (ret < 0) { @@ -840,7 +825,7 @@ __noreturn void afs_init(uint32_t cookie, int socket_fd) ret = sched(&s); if (ret < 0) PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret)); - close_afs_tables(OSL_MARK_CLEAN); + close_afs_tables(); exit(EXIT_FAILURE); } @@ -850,15 +835,15 @@ static int create_tables_callback(const struct osl_object *query, uint32_t table_mask = *(uint32_t *)query->data; int i, ret; - close_afs_tables(OSL_MARK_CLEAN); + close_afs_tables(); for (i = 0; i < NUM_AFS_TABLES; i++) { - struct table_info *ti = afs_tables + i; + struct afs_table *t = &afs_tables[i]; - if (ti->flags & TBLFLAG_SKIP_CREATE) - continue; if (!(table_mask & (1 << i))) continue; - ret = osl_create_table(ti->desc); + if (!t->create) + continue; + ret = t->create(database_dir); if (ret < 0) return ret; } @@ -873,15 +858,16 @@ int com_init(int fd, int argc, char * const * const argv) struct osl_object query = {.data = &table_mask, .size = sizeof(table_mask)}; + ret = make_database_dir(); + if (ret < 0) + return ret; if (argc != 1) { table_mask = 0; for (i = 1; i < argc; i++) { for (j = 0; j < NUM_AFS_TABLES; j++) { - struct table_info *ti = afs_tables + j; + struct afs_table *t = &afs_tables[j]; - if (ti->flags & TBLFLAG_SKIP_CREATE) - continue; - if (strcmp(argv[i], ti->desc->name)) + if (strcmp(argv[i], t->name)) continue; table_mask |= (1 << j); break;